Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

* SCSI scanner support
* fixes to qemu-char and net exit
* FreeBSD fixes
* Other small bugfixes

# gpg: Signature made Wed 13 Jul 2016 12:30:11 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  hostmem: detect host backend memory is being used properly
  hostmem: fix QEMU crash by 'info memdev'
  char: do not use atexit cleanup handler
  net: do not use atexit for cleanup
  slirp: use exit notifier for slirp_smb_cleanup
  tap: use an exit notifier to call down_script
  util: Fix MIN_NON_ZERO
  qemu-sockets: use qapi_free_SocketAddress in cleanup
  disas: avoid including everything in headers compiled from C++
  json-streamer: fix double-free on exiting during a parse
  main-loop: check return value before using pointer
  Use "-s" instead of "--quiet" to resolve non-fatal build error on FreeBSD.
  scsi-bus: Use longer sense buffer with scanners
  scsi-bus: Add SCSI scanner support

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --cc include/block/scsi.h
Simple merge

diff --cc include/disas/bfd.h
index 5fbff00,a87b8a1..64c9544
--- 1/include/disas/bfd.h
--- 2/include/disas/bfd.h
+++ b/include/disas/bfd.h
@@@ -6,10 -6,10 +6,10 @@@
     interface, for making instruction-processing programs more independent
     of the instruction set being processed.  */
  
 -#ifndef DIS_ASM_H
 -#define DIS_ASM_H
 +#ifndef DISAS_BFD_H
 +#define DISAS_BFD_H
  
- #include "qemu-common.h"
+ #include "qemu/fprintf-fn.h"
  
  typedef void *PTR;
  typedef uint64_t bfd_vma;

diff --cc include/qemu/osdep.h
Simple merge

diff --cc include/sysemu/hostmem.h
Simple merge