[Qemu-commits] [qemu/qemu] 297b04: scsi-bus: Add SCSI scanner support

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 297b044a7fccd1571cf94713a7caf2fc1a980841
      
https://github.com/qemu/qemu/commit/297b044a7fccd1571cf94713a7caf2fc1a980841
  Author: Jarkko Lavinen <address@hidden>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M hw/scsi/scsi-bus.c
    M include/block/scsi.h

  Log Message:
  -----------
  scsi-bus: Add SCSI scanner support

Add support for missing scanner specific SCSI commands and their xfer
lenghts as per ANSI spec section 15.

Signed-off-by: Jarkko Lavinen <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 6959e508c6de656015e0cd4fd21da34d6f08e8ac
      
https://github.com/qemu/qemu/commit/6959e508c6de656015e0cd4fd21da34d6f08e8ac
  Author: Jarkko Lavinen <address@hidden>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M hw/scsi/scsi-bus.c
    M include/hw/scsi/scsi.h

  Log Message:
  -----------
  scsi-bus: Use longer sense buffer with scanners

Scanners can provide additional sense bytes beyond 18 bytes.
VueScan uses 32 bytes alloc length with Request Sense command.

Signed-off-by: Jarkko Lavinen <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 540aecd0991d1fcbb2204a06fcdbda32c87e788a
      
https://github.com/qemu/qemu/commit/540aecd0991d1fcbb2204a06fcdbda32c87e788a
  Author: Sean Bruno <address@hidden>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Use "-s" instead of "--quiet" to resolve non-fatal build error on FreeBSD.

The --quiet argument is not available on all operating systems.  Use -s
instead to match the rest of the Makefile uses.  This fixes a non-fatal
error seen on FreeBSD.

Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Sean Bruno <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 28ba61e7ff2a824e79a477192aee8ee20b95f194
      
https://github.com/qemu/qemu/commit/28ba61e7ff2a824e79a477192aee8ee20b95f194
  Author: Cao jin <address@hidden>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M main-loop.c

  Log Message:
  -----------
  main-loop: check return value before using pointer

pointer 'qemu_aio_context' should be checked first before it is used.
qemu_bh_new() will use it.

Signed-off-by: Cao jin <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: a942d8fa01f65279cdc135f4294db611bbc088ef
      
https://github.com/qemu/qemu/commit/a942d8fa01f65279cdc135f4294db611bbc088ef
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M qobject/json-streamer.c

  Log Message:
  -----------
  json-streamer: fix double-free on exiting during a parse

Now that json-streamer tries not to leak tokens on incomplete parse,
the tokens can be freed twice if QEMU destroys the json-streamer
object during the parser->emit call.  To fix this, create the new
empty GQueue earlier, so that it is already in place when the old
one is passed to parser->emit.

Reported-by: Changlong Xie <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 1e13c01d2a4eadb9c498caa809a21e3b5672b411
      
https://github.com/qemu/qemu/commit/1e13c01d2a4eadb9c498caa809a21e3b5672b411
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M include/disas/bfd.h

  Log Message:
  -----------
  disas: avoid including everything in headers compiled from C++

disas/arm-a64.cc is careful to include only the bare minimum that
it needs---qemu/osdep.h and disas/bfd.h.  Unfortunately, disas/bfd.h
then includes qemu-common.h, which brings in qemu/option.h and from
there we get the kitchen sink.

This causes problems because for example QEMU's atomic macros
conflict with C++ atomic types.  But really all that bfd.h needs
is the fprintf_function typedef, so replace the inclusion of
qemu-common.h with qemu/fprintf-fn.h.

Reported-by: Sean Bruno <address@hidden>
Tested-by: Sean Bruno <address@hidden>
Cc: Peter Maydell <address@hidden>
Cc: Markus Armbruster <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 73f40c1895980dc705b6b0594ace6580b3f68537
      
https://github.com/qemu/qemu/commit/73f40c1895980dc705b6b0594ace6580b3f68537
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M util/qemu-sockets.c

  Log Message:
  -----------
  qemu-sockets: use qapi_free_SocketAddress in cleanup

Commit 74b6ce43e3 uses the wrong free API for a SocketAddress, that
may leak some linked data.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: d27ba624aa1dfe5c07cc01200d95967ffce905d9
      
https://github.com/qemu/qemu/commit/d27ba624aa1dfe5c07cc01200d95967ffce905d9
  Author: Fam Zheng <address@hidden>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M include/qemu/osdep.h

  Log Message:
  -----------
  util: Fix MIN_NON_ZERO

MIN_NON_ZERO(1, 0) is evaluated to 0. Rewrite the macro to fix it.

Reported-by: Miroslav Rezanina <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 9e32ff32995f8c18f85f20e28ef09bae4ff2e48a
      
https://github.com/qemu/qemu/commit/9e32ff32995f8c18f85f20e28ef09bae4ff2e48a
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M net/tap.c

  Log Message:
  -----------
  tap: use an exit notifier to call down_script

We would like to move back net_cleanup() at the end of main function,
like it used to be until f30dbae63a46f23116715dff8d130c, but minimum
tap cleanup is necessary regarless at exit() time. Use an exit notifier
to call TAP down_script. If net_cleanup() is called first, then remove
the exit notifier as it will become a dangling pointer otherwise.

Signed-off-by: Marc-André Lureau <address@hidden>
Suggested-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Jason Wang <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: f6c2e66ae8c8a03d3044dc9054aa7c16e7f817ee
      
https://github.com/qemu/qemu/commit/f6c2e66ae8c8a03d3044dc9054aa7c16e7f817ee
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M net/slirp.c

  Log Message:
  -----------
  slirp: use exit notifier for slirp_smb_cleanup

We would like to move back net_cleanup() at the end of main function,
like it used to be until f30dbae63a46f23116715dff8d130c, but minimum
cleanup is needed regardless at exit() time for slirp's SMB
functionality.  Use an exit notifier to call slirp_smb_cleanup.
If net_cleanup() is called first, then remove the exit notifier as it
will become a dangling pointer otherwise.

Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Jason Wang <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 8caf911d3316b6eccc503cff0d9a68cf922950f1
      
https://github.com/qemu/qemu/commit/8caf911d3316b6eccc503cff0d9a68cf922950f1
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  net: do not use atexit for cleanup

This will be necessary in the next patch, which stops using atexit for
character devices; without it, vhost-user and the redirector filter
will cause a use-after-free.  Relying on the ordering of atexit calls
is also brittle, even now that both the network and chardev
subsystems are using atexit.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: aa5cb7f5e8bf2e6737d0cb36c118332ca26e7797
      
https://github.com/qemu/qemu/commit/aa5cb7f5e8bf2e6737d0cb36c118332ca26e7797
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M include/sysemu/char.h
    M qemu-char.c
    M vl.c

  Log Message:
  -----------
  char: do not use atexit cleanup handler

It turns out qemu is calling exit() in various places from various
threads without taking much care of resources state. The atexit()
cleanup handlers cannot easily destroy resources that are in use (by
the same thread or other).

Since c1111a24a3, TCG arm guests run into the following abort() when
running tests, the chardev mutex is locked during the write, so
qemu_mutex_destroy() returns an error:

 #0  0x00007fffdbb806f5 in raise () at /lib64/libc.so.6
 #1  0x00007fffdbb822fa in abort () at /lib64/libc.so.6
 #2  0x00005555557616fe in error_exit (err=<optimized out>, address@hidden 
<__func__.14622> "qemu_mutex_destroy")
     at /home/drjones/code/qemu/util/qemu-thread-posix.c:39
 #3  0x0000555555b0be20 in qemu_mutex_destroy (address@hidden) at 
/home/drjones/code/qemu/util/qemu-thread-posix.c:57
 #4  0x00005555558aab00 in qemu_chr_free_common (chr=0x5555566aa0e0) at 
/home/drjones/code/qemu/qemu-char.c:4029
 #5  0x00005555558b05f9 in qemu_chr_delete (chr=<optimized out>) at 
/home/drjones/code/qemu/qemu-char.c:4038
 #6  0x00005555558b05f9 in qemu_chr_delete (chr=<optimized out>) at 
/home/drjones/code/qemu/qemu-char.c:4044
 #7  0x00005555558b062c in qemu_chr_cleanup () at 
/home/drjones/code/qemu/qemu-char.c:4557
 #8  0x00007fffdbb851e8 in __run_exit_handlers () at /lib64/libc.so.6
 #9  0x00007fffdbb85235 in  () at /lib64/libc.so.6
 #10 0x00005555558d1b39 in testdev_write (testdev=0x5555566aa0a0) at 
/home/drjones/code/qemu/backends/testdev.c:71
 #11 0x00005555558d1b39 in testdev_write (chr=<optimized out>, 
buf=0x7fffc343fd9a "", len=0) at /home/drjones/code/qemu/backends/testdev.c:95
 #12 0x00005555558adced in qemu_chr_fe_write (s=0x5555566aa0e0, address@hidden 
"0q", address@hidden) at /home/drjones/code/qemu/qemu-char.c:282

Instead of using a atexit() handler, only run the chardev cleanup as
initially proposed at the end of main(), where there are less chances
(hic) of conflicts or other races.

Signed-off-by: Marc-André Lureau <address@hidden>
Reported-by: Andrew Jones <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 1454d33f0507cb54d62ed80f494884157c9e7130
      
https://github.com/qemu/qemu/commit/1454d33f0507cb54d62ed80f494884157c9e7130
  Author: Xiao Guangrong <address@hidden>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M backends/hostmem.c

  Log Message:
  -----------
  hostmem: fix QEMU crash by 'info memdev'

'info memdev' crashes QEMU:
   (qemu) info memdev
   Unexpected error in parse_str() at qapi/string-input-visitor.c:111:
   Parameter 'null' expects an int64 value or range
It is caused by null uint16List is returned if 'host-nodes' is the default
value

Return MAX_NODES under this case to fix this bug

Signed-off-by: Xiao Guangrong <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 2aece63c8a9d2c3a8ff41d2febc4cdeff2633331
      
https://github.com/qemu/qemu/commit/2aece63c8a9d2c3a8ff41d2febc4cdeff2633331
  Author: Xiao Guangrong <address@hidden>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M backends/hostmem.c
    M hw/mem/pc-dimm.c
    M hw/misc/ivshmem.c
    M include/sysemu/hostmem.h

  Log Message:
  -----------
  hostmem: detect host backend memory is being used properly

Currently, we use memory_region_is_mapped() to detect if the host
backend memory is being used. This works if the memory is directly
mapped into guest's address space, however, it is not true for
nvdimm as it uses aliased memory region to map the memory. This is
why this bug can happen:
   https://bugzilla.redhat.com/show_bug.cgi?id=1352769

Fix it by introduce a new filed, is_mapped, to HostMemoryBackend,
we set/clear this filed accordingly when the device link/unlink to
host backend memory

Signed-off-by: Xiao Guangrong <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 190c93c98283e75e1a9e01babd1ec14624cb6204
      
https://github.com/qemu/qemu/commit/190c93c98283e75e1a9e01babd1ec14624cb6204
  Author: Peter Maydell <address@hidden>
  Date:   2016-07-14 (Thu, 14 Jul 2016)

  Changed paths:
    M Makefile
    M backends/hostmem.c
    M hw/mem/pc-dimm.c
    M hw/misc/ivshmem.c
    M hw/scsi/scsi-bus.c
    M include/block/scsi.h
    M include/disas/bfd.h
    M include/hw/scsi/scsi.h
    M include/qemu/osdep.h
    M include/sysemu/char.h
    M include/sysemu/hostmem.h
    M main-loop.c
    M net/slirp.c
    M net/tap.c
    M qemu-char.c
    M qobject/json-streamer.c
    M util/qemu-sockets.c
    M vl.c

  Log Message:
  -----------
  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 <address@hidden>"
# gpg:                 aka "Paolo Bonzini <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/9358450e98ed...190c93c98283