• P
    Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · 3180aadb
    Peter Maydell 提交于
    - more config options
    - bootdevice, iscsi, virtio-scsi fixes
    - build system patches for MinGW and config-devices.mak
    - qemu_mutex_lock_iothread deadlock fixes
    - another tiny patch from the record/replay series
    
    # gpg: Signature made Mon Mar  2 09:59:14 2015 GMT using RSA key ID 78C7AE83
    # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
    # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # 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:
      cpus: be more paranoid in avoiding deadlocks
      cpus: fix deadlock and segfault in qemu_mutex_lock_iothread
      virtio-scsi: Allocate op blocker reason before blocking
      Makefile.target: binary depends on config-devices
      Makefile: don't silence mak file test with V=1
      Makefile: fix up parallel building under MSYS+MinGW
      iscsi: Handle write protected case in reopen
      Give ivshmem its own config option
      Create specific config option for "platform-bus"
      Add specific config options for PCI-E bridges
      bootdevice: fix segment fault when booting guest with '-kernel' and '-initrd'
      timer: replace time() with QEMU_CLOCK_HOST
      virtio-scsi-dataplane: Call blk_set_aio_context within BQL
      block: Forbid bdrv_set_aio_context outside BQL
      scsi: give device a parent before setting properties
    Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
    3180aadb
vl.c 124.3 KB