Merge branch 'master' of git://git.sv.gnu.org/qemu into next

Merge branch 'master' of git://git.sv.gnu.org/qemu into next

* 'master' of git://git.sv.gnu.org/qemu:
  vnc: use bswapNN() rather than bswap_NN()
  vnc: tight: remove unused variable
  Fix ivshmem build on 32-bit hosts
  virtio-9p: Make sure -virtfs option works correctly
  hw/ivshmem.c don't check for negative values on unsigned data types
  load_multiboot(): get_image_size() returns int
  Change DPRINTF() to do{}while(0) to avoid compiler warning
  size_t is unsigned, change to ssize_t to handle errors from tight_compress_data()
  Fix repeated typo: was "end if list" instead of "end of list"
  Respect return value from nbd_client()
  Remove unused argument for nbd_client()
  Fix OpenBSD linker warning
  acpi: fix file size check with -acpitable.
  isapc: fix segfault.
  Fix segfault in mmio subpage handling code.

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