Skip to content
  • Peter Maydell's avatar
    1010af54
    Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · 1010af54
    Peter Maydell authored
    
    
    Block layer patches:
    
    - qemu-img: fix info --backing-chain --image-opts
    - Error out on image creation with conflicting size options
    - Fix external snapshot with VM state
    - hmp: Allow using qdev ID for qemu-io command
    - Misc code cleanup
    - Many iotests improvements
    
    # gpg: Signature made Thu 19 Dec 2019 17:23:11 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: (30 commits)
      iotests: Test external snapshot with VM state
      hmp: Allow using qdev ID for qemu-io command
      block: Activate recursively even for already active nodes
      iotests: 211: Remove duplication with VM.blockdev_create()
      iotests: 207: Remove duplication with VM.blockdev_create()
      iotests: 266: Convert to VM.blockdev_create()
      iotests: 237: Convert to VM.blockdev_create()
      iotests: 213: Convert to VM.blockdev_create()
      iotests: 212: Convert to VM.blockdev_create()
      iotests: 210: Convert to VM.blockdev_create()
      iotests: 206: Convert to VM.blockdev_create()
      iotests: 255: Drop blockdev_create()
      iotests: Create VM.blockdev_create()
      qcow2: Move error check of local_err near its assignment
      iotests: Fix IMGOPTSSYNTAX for nbd
      iotests/273: Filter format-specific information
      iotests: Add more "_require_drivers" checks to the shell-based tests
      MAINTAINERS: fix qcow2-bitmap.c under Dirty Bitmaps header
      qcow2: Use offset_into_cluster()
      iotests: Support job-complete in run_job()
      ...
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    1010af54
    Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
    Peter Maydell authored
    
    
    Block layer patches:
    
    - qemu-img: fix info --backing-chain --image-opts
    - Error out on image creation with conflicting size options
    - Fix external snapshot with VM state
    - hmp: Allow using qdev ID for qemu-io command
    - Misc code cleanup
    - Many iotests improvements
    
    # gpg: Signature made Thu 19 Dec 2019 17:23:11 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: (30 commits)
      iotests: Test external snapshot with VM state
      hmp: Allow using qdev ID for qemu-io command
      block: Activate recursively even for already active nodes
      iotests: 211: Remove duplication with VM.blockdev_create()
      iotests: 207: Remove duplication with VM.blockdev_create()
      iotests: 266: Convert to VM.blockdev_create()
      iotests: 237: Convert to VM.blockdev_create()
      iotests: 213: Convert to VM.blockdev_create()
      iotests: 212: Convert to VM.blockdev_create()
      iotests: 210: Convert to VM.blockdev_create()
      iotests: 206: Convert to VM.blockdev_create()
      iotests: 255: Drop blockdev_create()
      iotests: Create VM.blockdev_create()
      qcow2: Move error check of local_err near its assignment
      iotests: Fix IMGOPTSSYNTAX for nbd
      iotests/273: Filter format-specific information
      iotests: Add more "_require_drivers" checks to the shell-based tests
      MAINTAINERS: fix qcow2-bitmap.c under Dirty Bitmaps header
      qcow2: Use offset_into_cluster()
      iotests: Support job-complete in run_job()
      ...
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Loading