1. 20 3月, 2019 1 次提交
    • P
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · e0991e26
      Peter Maydell 提交于
      Block layer patches:
      
      - mirror: Fix early return from drain (could cause deadlocks)
      - vmdk: Fixed probing for version 3 images
      - vl: Fix to create migration object before block backends again (fixes
        segfault for block drivers that set migration blockers)
      - Several minor fixes, documentation and test case improvements
      
      # gpg: Signature made Tue 19 Mar 2019 14:59:17 GMT
      # gpg:                using RSA key 7F09B272C88F2FD6
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
      # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6
      
      * remotes/kevin/tags/for-upstream:
        qemu-iotests: Treat custom TEST_DIR in 051
        blockdev: Check @replaces in blockdev_mirror_common
        block: Make bdrv_{copy_on_read,crypto_luks,replication} static
        blockjob: fix user pause in block_job_error_action
        qemu-iotests: Fix 232 for non-qcow2
        vl: Fix to create migration object before block backends again
        iotests: 153: Wait for an answer to QMP commands
        block: Silence Coverity in bdrv_drop_intermediate()
        vmdk: Support version=3 in VMDK descriptor files
        qapi: fix block-latency-histogram-set description and examples
        qcow2: Fix data file error condition in qcow2_co_create()
        mirror: Confirm we're quiesced only if the job is paused or cancelled
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      e0991e26
  2. 19 3月, 2019 39 次提交