The following changes since commit a91a4e7d8cfe6ece610aacf7c52738188f5b5cb5:
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (2016-07-11 15:08:47 +0100) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 2aece63c8a9d2c3a8ff41d2febc4cdeff2633331: hostmem: detect host backend memory is being used properly (2016-07-13 13:30:04 +0200) ---------------------------------------------------------------- * SCSI scanner support * fixes to qemu-char and net exit * FreeBSD fixes * Other small bugfixes ---------------------------------------------------------------- Cao jin (1): main-loop: check return value before using pointer Fam Zheng (1): util: Fix MIN_NON_ZERO Jarkko Lavinen (2): scsi-bus: Add SCSI scanner support scsi-bus: Use longer sense buffer with scanners Marc-André Lureau (3): qemu-sockets: use qapi_free_SocketAddress in cleanup tap: use an exit notifier to call down_script char: do not use atexit cleanup handler Paolo Bonzini (4): json-streamer: fix double-free on exiting during a parse disas: avoid including everything in headers compiled from C++ slirp: use exit notifier for slirp_smb_cleanup net: do not use atexit for cleanup Sean Bruno (1): Use "-s" instead of "--quiet" to resolve non-fatal build error on FreeBSD. Xiao Guangrong (2): hostmem: fix QEMU crash by 'info memdev' hostmem: detect host backend memory is being used properly Makefile | 2 +- backends/hostmem.c | 37 +++++++++++++++++++++++++------------ hw/mem/pc-dimm.c | 18 +++++++++++------- hw/misc/ivshmem.c | 14 ++++++++++---- hw/scsi/scsi-bus.c | 41 ++++++++++++++++++++++++++++++++++++++++- include/block/scsi.h | 6 ++++++ include/disas/bfd.h | 2 +- include/hw/scsi/scsi.h | 7 ++++--- include/qemu/osdep.h | 3 ++- include/sysemu/char.h | 7 +++++++ include/sysemu/hostmem.h | 4 +++- main-loop.c | 2 +- net/slirp.c | 11 +++++++++++ net/tap.c | 27 ++++++++++++++++++++------- qemu-char.c | 4 +--- qobject/json-streamer.c | 8 ++++++-- util/qemu-sockets.c | 2 +- vl.c | 7 ++++--- 18 files changed, 154 insertions(+), 48 deletions(-) -- 1.8.3.1