Merge commit '9a3e12c8a48ef96bf0f3effc21a4ce98d35992f9' into upstream-merge

Merge commit '9a3e12c8a48ef96bf0f3effc21a4ce98d35992f9' into upstream-merge

* commit '9a3e12c8a48ef96bf0f3effc21a4ce98d35992f9':
  fix segfault in msix_save
  Unregister savevm callback in eeprom93xx_free()
  Don't leak VLANClientState on PCI hot remove
  Don't abort if TUNSETSNDBUF fails where no sndbuf= arg is supplied
  Substitute O_DSYNC with O_SYNC or O_FSYNC when needed.
  Allow adjustment of http block device's readahead size, via a new
  consolidate user cpu_{in, out}[bwl] into ioport-user.c
  ioport: consolidate duplicated logic in register_ioport_{read, write}().
  use constant IOPORTS_MASK instead of 0xffff.
  split out ioport related stuffs from vl.c into ioport.c.
  Replace signrom with shell script v3
  Revert "support colon in filenames"
  Fix build for ESD audio
  qcow2: Make cache=writethrough default
  net: set a default value for sndbuf=
  configure: detect xen with --extra-cflags / --extra-ldflags

Conflicts:
	hw/msix.c

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