Merge commit '6dbe553fe9ffdee008c1bbbe1af2d030e0f04aab' into upstream-merge

Merge commit '6dbe553fe9ffdee008c1bbbe1af2d030e0f04aab' into upstream-merge

* commit '6dbe553fe9ffdee008c1bbbe1af2d030e0f04aab': (26 commits)
  slirp: Add info usernet for dumping connection states
  slirp: Mark sockets of incoming TCP connections
  slirp: Do not allow to remove non-hostfwd sockets
  slirp: Explicitely mark host-forwarding sockets
  slirp: Prepare for persistent socket state flags
  slirp: Bind support for host forwarding rules
  slirp: Rework monitor commands for host forwarding
  slirp: Fix port comparision in slirp_remove_hostfwd
  slirp: Rework external configuration interface
  slirp: Rework internal configuration
  slirp: Move smb, redir, tftp and bootp parameters and -net channel
  Introduce get_next_param_value
  Revert "User networking: Show active connections"
  slirp: Refactor tcp_ctl
  slirp: Drop redundant lines from udp_input
  sdl zooming
  Fix QCOW2 debugging code to compile again
  Add serial number support for virtio_blk
  Remove unused gen_bx_T0 function.
  Make sure to zero out memory before calling madvise to increase robustness
  ...

Conflicts:
	net.h

Signed-off-by: Avi Kivity <avi@redhat.com>