Series comparison

-[PULL 00/30] Block layer patches
+[PULL 0/7] Block layer patches
-The following changes since commit aceeaa69d28e6f08a24395d0aa6915b687d0a681:
+The following changes since commit 60205b71421cbc529ca60b12c79e0eeace007319:
-  Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-12-17' into staging (2019-12-17 15:55:20 +0000)
+  Merge tag 'pull-aspeed-20220801' of https://github.com/legoater/qemu into staging (2022-08-01 13:55:11 -0700)
 are available in the Git repository at:
   git://repo.or.cz/qemu/kevin.git tags/for-upstream
-for you to fetch changes up to f62f08ab7a9d902da70078992248ec5c98f652ad:
+for you to fetch changes up to 21b1d974595b3986c68fe80a1f7e9b87886d4bae:
-  iotests: Test external snapshot with VM state (2019-12-19 18:04:25 +0100)
+  main loop: add missing documentation links to GS/IO macros (2022-08-02 12:02:17 +0200)
 ----------------------------------------------------------------
-Block layer patches:
+Block layer patches
-- qemu-img: fix info --backing-chain --image-opts
+- libvduse: Coverity fixes
-- Error out on image creation with conflicting size options
+- hd-geometry: Fix ignored bios-chs-trans setting
-- Fix external snapshot with VM state
+- io_uring: Fix compiler warning (missing #include)
-- hmp: Allow using qdev ID for qemu-io command
+- main loop: add missing documentation links to GS/IO macros
-- Misc code cleanup
+- qemu-iotests: Discard stderr when probing devices
 - Many iotests improvements
 ----------------------------------------------------------------
-Alberto Garcia (1):
+Cole Robinson (1):
-      qcow2: Use offset_into_cluster()
+      qemu-iotests: Discard stderr when probing devices
-Daniel P. Berrangé (1):
+Emanuele Giuseppe Esposito (1):
-      qapi: better document NVMe blockdev @device parameter
+      main loop: add missing documentation links to GS/IO macros
-Kevin Wolf (19):
+Jinhao Fan (1):
-      block: Error out on image creation with conflicting size options
+      block/io_uring: add missing include file
       blockjob: Fix error message for negative speed
       qcow2: Declare BDRV_REQ_NO_FALLBACK supported
       iotests: Add qemu_io_log()
       iotests: Fix timeout in run_job()
       iotests: Support job-complete in run_job()
       iotests: Create VM.blockdev_create()
       iotests: 255: Drop blockdev_create()
       iotests: 206: Convert to VM.blockdev_create()
       iotests: 210: Convert to VM.blockdev_create()
       iotests: 212: Convert to VM.blockdev_create()
       iotests: 213: Convert to VM.blockdev_create()
       iotests: 237: Convert to VM.blockdev_create()
       iotests: 266: Convert to VM.blockdev_create()
       iotests: 207: Remove duplication with VM.blockdev_create()
       iotests: 211: Remove duplication with VM.blockdev_create()
       block: Activate recursively even for already active nodes
       hmp: Allow using qdev ID for qemu-io command
       iotests: Test external snapshot with VM state
-Max Reitz (2):
+Lev Kujawski (1):
-      iotests/273: Filter format-specific information
+      hw/block/hd-geometry: Do not override specified bios-chs-trans
       iotests: Fix IMGOPTSSYNTAX for nbd
-Stefan Hajnoczi (1):
+Xie Yongji (3):
-      qemu-img: fix info --backing-chain --image-opts
+      libvduse: Fix the incorrect function name
       libvduse: Replace strcpy() with strncpy()
       libvduse: Pass positive value to strerror()
-Thomas Huth (4):
+ include/qemu/main-loop.h        | 18 +++++++++++++++---
-      iotests: Provide a function for checking the creation of huge files
+ block/io_uring.c                |  1 +
-      iotests: Skip test 060 if it is not possible to create large files
+ hw/block/hd-geometry.c          |  7 ++++++-
-      iotests: Skip test 079 if it is not possible to create large files
+ subprojects/libvduse/libvduse.c | 13 +++++++------
-      iotests: Add more "_require_drivers" checks to the shell-based tests
+ tests/qemu-iotests/common.rc    |  4 ++--
+files changed, 31 insertions(+), 12 deletions(-)
 Tuguoyi (1):
       qcow2: Move error check of local_err near its assignment
 Vladimir Sementsov-Ogievskiy (1):
       MAINTAINERS: fix qcow2-bitmap.c under Dirty Bitmaps header
  qapi/block-core.json          |   6 +-
  block.c                       |  60 ++++++-----
  block/qcow2.c                 |  21 ++--
  blockjob.c                    |   3 +-
  monitor/hmp-cmds.c            |  28 +++--
  qemu-img.c                    |   3 +
  MAINTAINERS                   |   6 +-
  hmp-commands.hx               |   8 +-
  tests/qemu-iotests/005        |   5 +-
  tests/qemu-iotests/030        |   4 +-
  tests/qemu-iotests/049        |   5 +
  tests/qemu-iotests/049.out    |   5 +
  tests/qemu-iotests/051        |   1 +
  tests/qemu-iotests/060        |   3 +
  tests/qemu-iotests/079        |   3 +
  tests/qemu-iotests/206        | 232 ++++++++++++++++++++----------------------
  tests/qemu-iotests/207        |   8 +-
  tests/qemu-iotests/210        |  81 +++++++--------
  tests/qemu-iotests/211        |  12 +--
  tests/qemu-iotests/212        | 101 +++++++++---------
  tests/qemu-iotests/213        | 113 ++++++++++----------
  tests/qemu-iotests/220        |   6 +-
  tests/qemu-iotests/237        | 139 ++++++++++++-------------
  tests/qemu-iotests/255        |  10 --
  tests/qemu-iotests/266        |  69 ++++++-------
  tests/qemu-iotests/266.out    |  14 +++
  tests/qemu-iotests/267        |   1 +
  tests/qemu-iotests/273        |   3 +-
  tests/qemu-iotests/273.out    |  27 -----
  tests/qemu-iotests/279        |  57 +++++++++++
  tests/qemu-iotests/279.out    |  35 +++++++
  tests/qemu-iotests/280        |  83 +++++++++++++++
  tests/qemu-iotests/280.out    |  50 +++++++++
  tests/qemu-iotests/common.rc  |  13 ++-
  tests/qemu-iotests/group      |   2 +
  tests/qemu-iotests/iotests.py |  25 ++++-
 files changed, 724 insertions(+), 518 deletions(-)
  create mode 100755 tests/qemu-iotests/279
  create mode 100644 tests/qemu-iotests/279.out
  create mode 100755 tests/qemu-iotests/280
  create mode 100644 tests/qemu-iotests/280.out

-[PULL 30/30] iotests: Test external snapshot with VM state
+[PULL 1/7] block/io_uring: add missing include file
-This tests creating an external snapshot with VM state (which results in
+From: Jinhao Fan <fanjinhao21s@ict.ac.cn>
 an active overlay over an inactive backing file, which is also the root
 node of an inactive BlockBackend), re-activating the images and
 performing some operations to test that the re-activation worked as
 intended.
+The commit "Use io_uring_register_ring_fd() to skip fd operations" uses
+warn_report but did not include the header file "qemu/error-report.h".
+This causes "error: implicit declaration of function ‘warn_report’".
+Include this header file.
+Fixes: e2848bc574 ("Use io_uring_register_ring_fd() to skip fd operations")
+Signed-off-by: Jinhao Fan <fanjinhao21s@ict.ac.cn>
+Message-Id: <20220721065645.577404-1-fanjinhao21s@ict.ac.cn>
+Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- tests/qemu-iotests/280     | 83 ++++++++++++++++++++++++++++++++++++++
+ block/io_uring.c | 1 +
- tests/qemu-iotests/280.out | 50 +++++++++++++++++++++++
+file changed, 1 insertion(+)
  tests/qemu-iotests/group   |  1 +
 files changed, 134 insertions(+)
  create mode 100755 tests/qemu-iotests/280
  create mode 100644 tests/qemu-iotests/280.out
-diff --git a/tests/qemu-iotests/280 b/tests/qemu-iotests/280
+diff --git a/block/io_uring.c b/block/io_uring.c
-new file mode 100755
+index XXXXXXX..XXXXXXX 100644
-index XXXXXXX..XXXXXXX
+--- a/block/io_uring.c
---- /dev/null
++++ b/block/io_uring.c
 +++ b/tests/qemu-iotests/280
 @@ -XXX,XX +XXX,XX @@
-+#!/usr/bin/env python
+ #include "qemu/osdep.h"
-+#
+ #include <liburing.h>
-+# Copyright (C) 2019 Red Hat, Inc.
+ #include "block/aio.h"
-+#
++#include "qemu/error-report.h"
-+# This program is free software; you can redistribute it and/or modify
+ #include "qemu/queue.h"
-+# it under the terms of the GNU General Public License as published by
+ #include "block/block.h"
-+# the Free Software Foundation; either version 2 of the License, or
+ #include "block/raw-aio.h"
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +#
 +# Creator/Owner: Kevin Wolf <kwolf@redhat.com>
 +#
 +# Test migration to file for taking an external snapshot with VM state.
 +
 +import iotests
 +import os
 +
 +iotests.verify_image_format(supported_fmts=['qcow2'])
 +iotests.verify_protocol(supported=['file'])
 +iotests.verify_platform(['linux'])
 +
 +with iotests.FilePath('base') as base_path , \
 +     iotests.FilePath('top') as top_path, \
 +     iotests.VM() as vm:
 +
 +    iotests.qemu_img_log('create', '-f', iotests.imgfmt, base_path, '64M')
 +
 +    iotests.log('=== Launch VM ===')
 +    vm.add_object('iothread,id=iothread0')
 +    vm.add_blockdev('file,filename=%s,node-name=base-file' % (base_path))
 +    vm.add_blockdev('%s,file=base-file,node-name=base-fmt' % (iotests.imgfmt))
 +    vm.add_device('virtio-blk,drive=base-fmt,iothread=iothread0,id=vda')
 +    vm.launch()
 +
 +    vm.enable_migration_events('VM')
 +
 +    iotests.log('\n=== Migrate to file ===')
 +    vm.qmp_log('migrate', uri='exec:cat > /dev/null')
 +
 +    with iotests.Timeout(3, 'Migration does not complete'):
 +        vm.wait_migration()
 +
 +    iotests.log('\nVM is now stopped:')
 +    iotests.log(vm.qmp('query-migrate')['return']['status'])
 +    vm.qmp_log('query-status')
 +
 +    iotests.log('\n=== Create a snapshot of the disk image ===')
 +    vm.blockdev_create({
 +        'driver': 'file',
 +        'filename': top_path,
 +        'size': 0,
 +    })
 +    vm.qmp_log('blockdev-add', node_name='top-file',
 +               driver='file', filename=top_path,
 +               filters=[iotests.filter_qmp_testfiles])
 +
 +    vm.blockdev_create({
 +        'driver': iotests.imgfmt,
 +        'file': 'top-file',
 +        'size': 1024 * 1024,
 +    })
 +    vm.qmp_log('blockdev-add', node_name='top-fmt',
 +               driver=iotests.imgfmt, file='top-file')
 +
 +    vm.qmp_log('blockdev-snapshot', node='base-fmt', overlay='top-fmt')
 +
 +    iotests.log('\n=== Resume the VM and simulate a write request ===')
 +    vm.qmp_log('cont')
 +    iotests.log(vm.hmp_qemu_io('-d vda/virtio-backend', 'write 4k 4k'))
 +
 +    iotests.log('\n=== Commit it to the backing file ===')
 +    result = vm.qmp_log('block-commit', job_id='job0', auto_dismiss=False,
 +                        device='top-fmt', top_node='top-fmt',
 +                        filters=[iotests.filter_qmp_testfiles])
 +    if 'return' in result:
 +        vm.run_job('job0')
 diff --git a/tests/qemu-iotests/280.out b/tests/qemu-iotests/280.out
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/tests/qemu-iotests/280.out
@@ -XXX,XX +XXX,XX @@
 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=67108864 cluster_size=65536 lazy_refcounts=off refcount_bits=16
 +
 +=== Launch VM ===
 +Enabling migration QMP events on VM...
 +{"return": {}}
 +
 +=== Migrate to file ===
 +{"execute": "migrate", "arguments": {"uri": "exec:cat > /dev/null"}}
 +{"return": {}}
 +{"data": {"status": "setup"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 +{"data": {"status": "active"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 +{"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 +
 +VM is now stopped:
 +completed
 +{"execute": "query-status", "arguments": {}}
 +{"return": {"running": false, "singlestep": false, "status": "postmigrate"}}
 +
 +=== Create a snapshot of the disk image ===
 +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "file", "filename": "TEST_DIR/PID-top", "size": 0}}}
 +{"return": {}}
 +{"execute": "job-dismiss", "arguments": {"id": "job0"}}
 +{"return": {}}
 +
 +{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-top", "node-name": "top-file"}}
 +{"return": {}}
 +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "qcow2", "file": "top-file", "size": 1048576}}}
 +{"return": {}}
 +{"execute": "job-dismiss", "arguments": {"id": "job0"}}
 +{"return": {}}
 +
 +{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": "top-file", "node-name": "top-fmt"}}
 +{"return": {}}
 +{"execute": "blockdev-snapshot", "arguments": {"node": "base-fmt", "overlay": "top-fmt"}}
 +{"return": {}}
 +
 +=== Resume the VM and simulate a write request ===
 +{"execute": "cont", "arguments": {}}
 +{"return": {}}
 +{"return": ""}
 +
 +=== Commit it to the backing file ===
 +{"execute": "block-commit", "arguments": {"auto-dismiss": false, "device": "top-fmt", "job-id": "job0", "top-node": "top-fmt"}}
 +{"return": {}}
 +{"execute": "job-complete", "arguments": {"id": "job0"}}
 +{"return": {}}
 +{"data": {"device": "job0", "len": 65536, "offset": 65536, "speed": 0, "type": "commit"}, "event": "BLOCK_JOB_READY", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 +{"data": {"device": "job0", "len": 65536, "offset": 65536, "speed": 0, "type": "commit"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 +{"execute": "job-dismiss", "arguments": {"id": "job0"}}
 +{"return": {}}
 diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/group
 +++ b/tests/qemu-iotests/group
@@ -XXX,XX +XXX,XX @@
 backing quick
 rw quick
 rw backing quick
 +280 rw migration quick
 --
-.20.1
+.35.3

-[PULL 01/30] iotests: Provide a function for checking the creation of huge files
+[PULL 2/7] libvduse: Fix the incorrect function name
-From: Thomas Huth <thuth@redhat.com>
+From: Xie Yongji <xieyongji@bytedance.com>
-Some tests create huge (but sparse) files, and to be able to run those
+In vduse_name_is_valid(), we actually check whether
-tests in certain limited environments (like CI containers), we have to
+the name is invalid or not. So let's change the
-check for the possibility to create such files first. Thus let's introduce
+function name to vduse_name_is_invalid() to match
-a common function to check for large files, and replace the already
+the behavior.
 existing checks in the iotests 005 and 220 with this function.
-Signed-off-by: Thomas Huth <thuth@redhat.com>
+Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Reviewed-by: Markus Armbruster <armbru@redhat.com>
 Message-Id: <20220706095624.328-2-xieyongji@bytedance.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- tests/qemu-iotests/005       |  5 +----
+ subprojects/libvduse/libvduse.c | 6 +++---
- tests/qemu-iotests/220       |  6 ++----
+file changed, 3 insertions(+), 3 deletions(-)
  tests/qemu-iotests/common.rc | 10 ++++++++++
 files changed, 13 insertions(+), 8 deletions(-)
-diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
+diff --git a/subprojects/libvduse/libvduse.c b/subprojects/libvduse/libvduse.c
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/005
 +++ b/tests/qemu-iotests/005
@@ -XXX,XX +XXX,XX @@ fi
  # Sanity check: For raw, we require a file system that permits the creation
  # of a HUGE (but very sparse) file. Check we can create it before continuing.
  if [ "$IMGFMT" = "raw" ]; then
 -    if ! truncate --size=5T "$TEST_IMG"; then
 -        _notrun "file system on $TEST_DIR does not support large enough files"
 -    fi
 -    rm "$TEST_IMG"
 +    _require_large_file 5T
  fi
  echo
 diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/220
 +++ b/tests/qemu-iotests/220
@@ -XXX,XX +XXX,XX @@ echo "== Creating huge file =="
  # Sanity check: We require a file system that permits the creation
  # of a HUGE (but very sparse) file.  tmpfs works, ext4 does not.
 -if ! truncate --size=513T "$TEST_IMG"; then
 -    _notrun "file system on $TEST_DIR does not support large enough files"
 -fi
 -rm "$TEST_IMG"
 +_require_large_file 513T
 +
  IMGOPTS='cluster_size=2M,refcount_bits=1' _make_test_img 513T
  echo "== Populating refcounts =="
 diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common.rc
+--- a/subprojects/libvduse/libvduse.c
-+++ b/tests/qemu-iotests/common.rc
++++ b/subprojects/libvduse/libvduse.c
-@@ -XXX,XX +XXX,XX @@ _require_drivers()
+@@ -XXX,XX +XXX,XX @@ static int vduse_dev_init(VduseDev *dev, const char *name,
-     done
+     return 0;
  }
-+# Check that we have a file system that allows huge (but very sparse) files
+-static inline bool vduse_name_is_valid(const char *name)
-+#
++static inline bool vduse_name_is_invalid(const char *name)
-+_require_large_file()
+ {
-+{
+     return strlen(name) >= VDUSE_NAME_MAX || strstr(name, "..");
-+    if ! truncate --size="$1" "$TEST_IMG"; then
+ }
-+        _notrun "file system on $TEST_DIR does not support large enough files"
+@@ -XXX,XX +XXX,XX @@ VduseDev *vduse_dev_create_by_name(const char *name, uint16_t num_queues,
-+    fi
+     VduseDev *dev;
-+    rm "$TEST_IMG"
+     int ret;
-+}
-+
+-    if (!name || vduse_name_is_valid(name) || !ops ||
- # make sure this script returns success
++    if (!name || vduse_name_is_invalid(name) || !ops ||
- true
+         !ops->enable_queue || !ops->disable_queue) {
          fprintf(stderr, "Invalid parameter for vduse\n");
          return NULL;
@@ -XXX,XX +XXX,XX @@ VduseDev *vduse_dev_create(const char *name, uint32_t device_id,
      struct vduse_dev_config *dev_config;
      size_t size = offsetof(struct vduse_dev_config, config);
 -    if (!name || vduse_name_is_valid(name) ||
 +    if (!name || vduse_name_is_invalid(name) ||
          !has_feature(features,  VIRTIO_F_VERSION_1) || !config ||
          !config_size || !ops || !ops->enable_queue || !ops->disable_queue) {
          fprintf(stderr, "Invalid parameter for vduse\n");
 --
-.20.1
+.35.3

-[PULL 02/30] iotests: Skip test 060 if it is not possible to create large files
+Deleted patch
-From: Thomas Huth <thuth@redhat.com>
-Test 060 fails in the arm64, s390x and ppc64le LXD containers on Travis
-(which we will hopefully enable in our CI soon). These containers
-apparently do not allow large files to be created. The repair process
-in test 060 creates a file of 64 GiB, so test first whether such large
-files are possible and skip the test if that's not the case.
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/060 | 3 +++
-file changed, 3 insertions(+)
-diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/060
-+++ b/tests/qemu-iotests/060
-@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# The repair process will create a large file - so check for availability first
-+_require_large_file 64G
-+
- rt_offset=65536  # 0x10000 (XXX: just an assumption)
- rb_offset=131072 # 0x20000 (XXX: just an assumption)
- l1_offset=196608 # 0x30000 (XXX: just an assumption)
---
-.20.1

-[PULL 03/30] iotests: Skip test 079 if it is not possible to create large files
+Deleted patch
-From: Thomas Huth <thuth@redhat.com>
-Test 079 fails in the arm64, s390x and ppc64le LXD containers on Travis
-(which we will hopefully enable in our CI soon). These containers
-apparently do not allow large files to be created. Test 079 tries to
-create a 4G sparse file, which is apparently already too big for these
-containers, so check first whether we can really create such files before
-executing the test.
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/079 | 3 +++
-file changed, 3 insertions(+)
-diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/079
-+++ b/tests/qemu-iotests/079
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file nfs
-+# Some containers (e.g. non-x86 on Travis) do not allow large files
-+_require_large_file 4G
-+
- echo "=== Check option preallocation and cluster_size ==="
- echo
- cluster_sizes="16384 32768 65536 131072 262144 524288 1048576 2097152 4194304"
---
-.20.1

-[PULL 04/30] qapi: better document NVMe blockdev @device parameter
+Deleted patch
-From: Daniel P. Berrangé <berrange@redhat.com>
-Mention that this is a PCI device address & give the format it is
-expected in. Also mention that it must be first unbound from any
-host kernel driver.
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- qapi/block-core.json | 6 +++++-
-file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
-+++ b/qapi/block-core.json
-@@ -XXX,XX +XXX,XX @@
- #
- # Driver specific block device options for the NVMe backend.
- #
--# @device:    controller address of the NVMe device.
-+# @device:    PCI controller address of the NVMe device in
-+#             format hhhh:bb:ss.f (host:bus:slot.function)
- # @namespace: namespace number of the device, starting from 1.
- #
-+# Note that the PCI @device must have been unbound from any host
-+# kernel driver before instructing QEMU to add the blockdev.
-+#
- # Since: 2.12
- ##
- { 'struct': 'BlockdevOptionsNVMe',
---
-.20.1

-[PULL 05/30] qemu-img: fix info --backing-chain --image-opts
+Deleted patch
-From: Stefan Hajnoczi <stefanha@redhat.com>
-Only apply --image-opts to the topmost image when listing an entire
-backing chain.  It is incorrect to treat backing filenames as image
-options.  Assuming we have the backing chain t.IMGFMT.base <-
-t.IMGFMT.mid <- t.IMGFMT, qemu-img info fails as follows:
-  $ qemu-img info --backing-chain --image-opts \
-      driver=qcow2,file.driver=file,file.filename=t.IMGFMT
-  qemu-img: Could not open 'TEST_DIR/t.IMGFMT.mid': Cannot find device=TEST_DIR/t.IMGFMT.mid nor node_name=TEST_DIR/t.IMGFMT.mid
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- qemu-img.c                 |  3 ++
- tests/qemu-iotests/279     | 57 ++++++++++++++++++++++++++++++++++++++
- tests/qemu-iotests/279.out | 35 +++++++++++++++++++++++
- tests/qemu-iotests/group   |  1 +
-files changed, 96 insertions(+)
- create mode 100755 tests/qemu-iotests/279
- create mode 100644 tests/qemu-iotests/279.out
-diff --git a/qemu-img.c b/qemu-img.c
-index XXXXXXX..XXXXXXX 100644
---- a/qemu-img.c
-+++ b/qemu-img.c
-@@ -XXX,XX +XXX,XX @@ static ImageInfoList *collect_image_info_list(bool image_opts,
-         blk_unref(blk);
-+        /* Clear parameters that only apply to the topmost image */
-         filename = fmt = NULL;
-+        image_opts = false;
-+
-         if (chain) {
-             if (info->has_full_backing_filename) {
-                 filename = info->full_backing_filename;
-diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279
-new file mode 100755
-index XXXXXXX..XXXXXXX
---- /dev/null
-+++ b/tests/qemu-iotests/279
-@@ -XXX,XX +XXX,XX @@
-+#!/usr/bin/env bash
-+#
-+# Test qemu-img --backing-chain --image-opts
-+#
-+# Copyright (C) 2019 Red Hat, Inc.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+#
-+
-+seq=$(basename "$0")
-+echo "QA output created by $seq"
-+
-+status=1    # failure is the default!
-+
-+_cleanup()
-+{
-+    _cleanup_test_img
-+    rm -f "$TEST_IMG.mid"
-+}
-+trap "_cleanup; exit \$status" 0 1 2 3 15
-+
-+# get standard environment, filters and checks
-+. ./common.rc
-+. ./common.filter
-+
-+# Backing files are required...
-+_supported_fmt qcow qcow2 vmdk qed
-+_supported_proto file
-+_supported_os Linux
-+
-+TEST_IMG="$TEST_IMG.base" _make_test_img 64M
-+TEST_IMG="$TEST_IMG.mid" _make_test_img -b "$TEST_IMG.base"
-+_make_test_img -b "$TEST_IMG.mid"
-+
-+echo
-+echo '== qemu-img info --backing-chain =='
-+_img_info --backing-chain | _filter_img_info
-+
-+echo
-+echo '== qemu-img info --backing-chain --image-opts =='
-+TEST_IMG="driver=qcow2,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts | _filter_img_info
-+
-+# success, all done
-+echo "*** done"
-+rm -f $seq.full
-+status=0
-diff --git a/tests/qemu-iotests/279.out b/tests/qemu-iotests/279.out
-new file mode 100644
-index XXXXXXX..XXXXXXX
---- /dev/null
-+++ b/tests/qemu-iotests/279.out
-@@ -XXX,XX +XXX,XX @@
-+QA output created by 279
-+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
-+Formatting 'TEST_DIR/t.IMGFMT.mid', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.mid
-+
-+== qemu-img info --backing-chain ==
-+image: TEST_DIR/t.IMGFMT
-+file format: IMGFMT
-+virtual size: 64 MiB (67108864 bytes)
-+backing file: TEST_DIR/t.IMGFMT.mid
-+
-+image: TEST_DIR/t.IMGFMT.mid
-+file format: IMGFMT
-+virtual size: 64 MiB (67108864 bytes)
-+backing file: TEST_DIR/t.IMGFMT.base
-+
-+image: TEST_DIR/t.IMGFMT.base
-+file format: IMGFMT
-+virtual size: 64 MiB (67108864 bytes)
-+
-+== qemu-img info --backing-chain --image-opts ==
-+image: TEST_DIR/t.IMGFMT
-+file format: IMGFMT
-+virtual size: 64 MiB (67108864 bytes)
-+backing file: TEST_DIR/t.IMGFMT.mid
-+
-+image: TEST_DIR/t.IMGFMT.mid
-+file format: IMGFMT
-+virtual size: 64 MiB (67108864 bytes)
-+backing file: TEST_DIR/t.IMGFMT.base
-+
-+image: TEST_DIR/t.IMGFMT.base
-+file format: IMGFMT
-+virtual size: 64 MiB (67108864 bytes)
-+*** done
-diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/group
-+++ b/tests/qemu-iotests/group
-@@ -XXX,XX +XXX,XX @@
-rw
-backing quick
-rw quick
-+279 rw backing quick
---
-.20.1

-[PULL 06/30] block: Error out on image creation with conflicting size options
+Deleted patch
-If both the create options (qemu-img create -o ...) and the size
-parameter were given, the size parameter was silently ignored. Instead,
-make specifying two sizes an error.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- block.c                    | 10 ++++++++--
- tests/qemu-iotests/049     |  5 +++++
- tests/qemu-iotests/049.out |  5 +++++
-files changed, 18 insertions(+), 2 deletions(-)
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ void bdrv_img_create(const char *filename, const char *fmt,
-         return;
-     }
-+    /* Create parameter list */
-     create_opts = qemu_opts_append(create_opts, drv->create_opts);
-     create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
--    /* Create parameter list with default values */
-     opts = qemu_opts_create(create_opts, NULL, 0, &error_abort);
--    qemu_opt_set_number(opts, BLOCK_OPT_SIZE, img_size, &error_abort);
-     /* Parse -o options */
-     if (options) {
-@@ -XXX,XX +XXX,XX @@ void bdrv_img_create(const char *filename, const char *fmt,
-         }
-     }
-+    if (!qemu_opt_get(opts, BLOCK_OPT_SIZE)) {
-+        qemu_opt_set_number(opts, BLOCK_OPT_SIZE, img_size, &error_abort);
-+    } else if (img_size != UINT64_C(-1)) {
-+        error_setg(errp, "The image size must be specified only once");
-+        goto out;
-+    }
-+
-     if (base_filename) {
-         qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, base_filename, &local_err);
-         if (local_err) {
-diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/049
-+++ b/tests/qemu-iotests/049
-@@ -XXX,XX +XXX,XX @@ for s in $sizes; do
-     test_qemu_img create -f $IMGFMT -o size=$s "$TEST_IMG"
- done
-+echo "== 4. Specify size twice (-o and traditional parameter) =="
-+echo
-+
-+test_qemu_img create -f $IMGFMT -o size=10M "$TEST_IMG" 20M
-+
- echo "== Check correct interpretation of suffixes for cluster size =="
- echo
- sizes="1024 1024b 1k 1K 1M "
-diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/049.out
-+++ b/tests/qemu-iotests/049.out
-@@ -XXX,XX +XXX,XX @@ qemu-img: TEST_DIR/t.qcow2: Parameter 'size' expects a non-negative number below
- Optional suffix k, M, G, T, P or E means kilo-, mega-, giga-, tera-, peta-
- and exabytes, respectively.
-+== 4. Specify size twice (-o and traditional parameter) ==
-+
-+qemu-img create -f qcow2 -o size=10M TEST_DIR/t.qcow2 20M
-+qemu-img: TEST_DIR/t.qcow2: The image size must be specified only once
-+
- == Check correct interpretation of suffixes for cluster size ==
- qemu-img create -f qcow2 -o cluster_size=1024 TEST_DIR/t.qcow2 64M
---
-.20.1

-[PULL 07/30] blockjob: Fix error message for negative speed
+Deleted patch
-The error message for a negative speed uses QERR_INVALID_PARAMETER,
-which implies that the 'speed' option doesn't even exist:
-    {"error": {"class": "GenericError", "desc": "Invalid parameter 'speed'"}}
-Make it use QERR_INVALID_PARAMETER_VALUE instead:
-    {"error": {"class": "GenericError", "desc": "Parameter 'speed' expects a non-negative value"}}
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
----
- blockjob.c             | 3 ++-
- tests/qemu-iotests/030 | 4 ++--
-files changed, 4 insertions(+), 3 deletions(-)
-diff --git a/blockjob.c b/blockjob.c
-index XXXXXXX..XXXXXXX 100644
---- a/blockjob.c
-+++ b/blockjob.c
-@@ -XXX,XX +XXX,XX @@ void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)
-         return;
-     }
-     if (speed < 0) {
--        error_setg(errp, QERR_INVALID_PARAMETER, "speed");
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "speed",
-+                   "a non-negative value");
-         return;
-     }
-diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/030
-+++ b/tests/qemu-iotests/030
-@@ -XXX,XX +XXX,XX @@ class TestSetSpeed(iotests.QMPTestCase):
-         self.assert_no_active_block_jobs()
-         result = self.vm.qmp('block-stream', device='drive0', speed=-1)
--        self.assert_qmp(result, 'error/desc', "Invalid parameter 'speed'")
-+        self.assert_qmp(result, 'error/desc', "Parameter 'speed' expects a non-negative value")
-         self.assert_no_active_block_jobs()
-@@ -XXX,XX +XXX,XX @@ class TestSetSpeed(iotests.QMPTestCase):
-         self.assert_qmp(result, 'return', {})
-         result = self.vm.qmp('block-job-set-speed', device='drive0', speed=-1)
--        self.assert_qmp(result, 'error/desc', "Invalid parameter 'speed'")
-+        self.assert_qmp(result, 'error/desc', "Parameter 'speed' expects a non-negative value")
-         self.cancel_and_wait(resume=True)
---
-.20.1

-[PULL 08/30] qcow2: Declare BDRV_REQ_NO_FALLBACK supported
+[PULL 3/7] libvduse: Replace strcpy() with strncpy()
-In the common case, qcow2_co_pwrite_zeroes() already only modifies
+From: Xie Yongji <xieyongji@bytedance.com>
 metadata case, so we're fine with or without BDRV_REQ_NO_FALLBACK set.
-The only exception is when using an external data file, where the
+Coverity reported a string overflow issue since we copied
-request is passed down to the block driver of the external data file. We
+"name" to "dev_config->name" without checking the length.
-are forwarding the BDRV_REQ_NO_FALLBACK flag there, though, so this is
+This should be a false positive since we already checked
-fine, too.
+the length of "name" in vduse_name_is_invalid(). But anyway,
 let's replace strcpy() with strncpy() (as a general library,
 we'd like to minimize dependencies on other libraries, so we
 didn't use g_strlcpy() here) to fix the coverity complaint.
-Declare the flag supported therefore.
+Fixes: Coverity CID 1490224
+Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
 Reviewed-by: Markus Armbruster <armbru@redhat.com>
 Message-Id: <20220706095624.328-3-xieyongji@bytedance.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
 ---
- block/qcow2.c | 3 ++-
+ subprojects/libvduse/libvduse.c | 3 ++-
 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/block/qcow2.c b/block/qcow2.c
+diff --git a/subprojects/libvduse/libvduse.c b/subprojects/libvduse/libvduse.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
+--- a/subprojects/libvduse/libvduse.c
-+++ b/block/qcow2.c
++++ b/subprojects/libvduse/libvduse.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
+@@ -XXX,XX +XXX,XX @@ VduseDev *vduse_dev_create(const char *name, uint32_t device_id,
-         }
+         goto err_dev;
      }
--    bs->supported_zero_flags = header.version >= 3 ? BDRV_REQ_MAY_UNMAP : 0;
+-    strcpy(dev_config->name, name);
-+    bs->supported_zero_flags = header.version >= 3 ?
++    strncpy(dev_config->name, name, VDUSE_NAME_MAX);
-+                               BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK : 0;
++    dev_config->name[VDUSE_NAME_MAX - 1] = '\0';
+     dev_config->device_id = device_id;
-     /* Repair image if dirty */
+     dev_config->vendor_id = vendor_id;
-     if (!(flags & (BDRV_O_CHECK | BDRV_O_INACTIVE)) && !bs->read_only &&
+     dev_config->features = features;
 --
-.20.1
+.35.3

-[PULL 09/30] iotests: Add qemu_io_log()
+Deleted patch
-Add a function that runs qemu-io and logs the output with the
-appropriate filters applied.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- tests/qemu-iotests/iotests.py | 5 +++++
-file changed, 5 insertions(+)
-diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/iotests.py
-+++ b/tests/qemu-iotests/iotests.py
-@@ -XXX,XX +XXX,XX @@ def qemu_io(*args):
-         sys.stderr.write('qemu-io received signal %i: %s\n' % (-exitcode, ' '.join(args)))
-     return subp.communicate()[0]
-+def qemu_io_log(*args):
-+    result = qemu_io(*args)
-+    log(result, filters=[filter_testfiles, filter_qemu_io])
-+    return result
-+
- def qemu_io_silent(*args):
-     '''Run qemu-io and return the exit code, suppressing stdout'''
-     args = qemu_io_args + list(args)
---
-.20.1

-[PULL 10/30] iotests: Fix timeout in run_job()
+Deleted patch
-run_job() accepts a wait parameter for a timeout, but it doesn't
-actually use it. The only thing that is missing is passing it to
-events_wait(), so do that now.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- tests/qemu-iotests/iotests.py | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/iotests.py
-+++ b/tests/qemu-iotests/iotests.py
-@@ -XXX,XX +XXX,XX @@ class VM(qtest.QEMUQtestMachine):
-         ]
-         error = None
-         while True:
--            ev = filter_qmp_event(self.events_wait(events))
-+            ev = filter_qmp_event(self.events_wait(events, timeout=wait))
-             if ev['event'] != 'JOB_STATUS_CHANGE':
-                 if use_log:
-                     log(ev)
---
-.20.1

-[PULL 11/30] iotests: Support job-complete in run_job()
+Deleted patch
-Automatically complete jobs that have a 'ready' state and need an
-explicit job-complete. Without this, run_job() would hang for such
-jobs.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- tests/qemu-iotests/iotests.py | 2 ++
-file changed, 2 insertions(+)
-diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/iotests.py
-+++ b/tests/qemu-iotests/iotests.py
-@@ -XXX,XX +XXX,XX @@ class VM(qtest.QEMUQtestMachine):
-                         error = j['error']
-                         if use_log:
-                             log('Job failed: %s' % (j['error']))
-+            elif status == 'ready':
-+                self.qmp_log('job-complete', id=job)
-             elif status == 'pending' and not auto_finalize:
-                 if pre_finalize:
-                     pre_finalize()
---
-.20.1

-[PULL 12/30] qcow2: Use offset_into_cluster()
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-There's a couple of places left in the qcow2 code that still do the
-calculation manually, so let's replace them.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow2.c | 8 +++-----
-file changed, 3 insertions(+), 5 deletions(-)
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
-                 return -EINVAL;
-             }
--            if (bitmaps_ext.bitmap_directory_offset & (s->cluster_size - 1)) {
-+            if (offset_into_cluster(s, bitmaps_ext.bitmap_directory_offset)) {
-                 error_setg(errp, "bitmaps_ext: "
-                                  "invalid bitmap directory offset");
-                 return -EINVAL;
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_block_status(BlockDriverState *bs,
- {
-     BDRVQcow2State *s = bs->opaque;
-     uint64_t cluster_offset;
--    int index_in_cluster, ret;
-     unsigned int bytes;
--    int status = 0;
-+    int ret, status = 0;
-     qemu_co_mutex_lock(&s->lock);
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_block_status(BlockDriverState *bs,
-     if ((ret == QCOW2_CLUSTER_NORMAL || ret == QCOW2_CLUSTER_ZERO_ALLOC) &&
-         !s->crypto) {
--        index_in_cluster = offset & (s->cluster_size - 1);
--        *map = cluster_offset | index_in_cluster;
-+        *map = cluster_offset | offset_into_cluster(s, offset);
-         *file = s->data_file->bs;
-         status |= BDRV_BLOCK_OFFSET_VALID;
-     }
---
-.20.1

-[PULL 13/30] MAINTAINERS: fix qcow2-bitmap.c under Dirty Bitmaps header
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Somehow I wrote not full path to the file. Fix that.
-Also, while being here, rearrange entries, so that includes go first,
-then block, than migration, than util.
-Fixes: 052db8e71444d
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- MAINTAINERS | 6 +++---
-file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/MAINTAINERS b/MAINTAINERS
-index XXXXXXX..XXXXXXX 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ M: John Snow <jsnow@redhat.com>
- R: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
- L: qemu-block@nongnu.org
- S: Supported
--F: util/hbitmap.c
--F: block/dirty-bitmap.c
- F: include/qemu/hbitmap.h
- F: include/block/dirty-bitmap.h
--F: qcow2-bitmap.c
-+F: block/dirty-bitmap.c
-+F: block/qcow2-bitmap.c
- F: migration/block-dirty-bitmap.c
-+F: util/hbitmap.c
- F: tests/test-hbitmap.c
- F: docs/interop/bitmaps.rst
- T: git https://github.com/jnsnow/qemu.git bitmaps
---
-.20.1

-[PULL 14/30] iotests: Add more "_require_drivers" checks to the shell-based tests
+Deleted patch
-From: Thomas Huth <thuth@redhat.com>
-Test 051 should be skipped if nbd is not available, and 267 should
-be skipped if copy-on-read is not enabled.
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/051 | 1 +
- tests/qemu-iotests/267 | 1 +
-files changed, 2 insertions(+)
-diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/051
-+++ b/tests/qemu-iotests/051
-@@ -XXX,XX +XXX,XX @@ _supported_proto file
- # A compat=0.10 image is created in this test which does not support anything
- # other than refcount_bits=16
- _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
-+_require_drivers nbd
- do_run_qemu()
- {
-diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/267
-+++ b/tests/qemu-iotests/267
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+_require_drivers copy-on-read
- # Internal snapshots are (currently) impossible with refcount_bits=1
- _unsupported_imgopts 'refcount_bits=1[^0-9]'
---
-.20.1

-[PULL 15/30] iotests/273: Filter format-specific information
+Deleted patch
-From: Max Reitz <mreitz@redhat.com>
-Doing this allows running this test with e.g. -o compat=0.10 or
--o compat=refcount_bits=1.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/273     |  3 ++-
- tests/qemu-iotests/273.out | 27 ---------------------------
-files changed, 2 insertions(+), 28 deletions(-)
-diff --git a/tests/qemu-iotests/273 b/tests/qemu-iotests/273
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/273
-+++ b/tests/qemu-iotests/273
-@@ -XXX,XX +XXX,XX @@ do_run_qemu()
- run_qemu()
- {
-     do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp |
--        _filter_generated_node_ids | _filter_imgfmt | _filter_actual_image_size
-+        _filter_generated_node_ids | _filter_imgfmt |
-+        _filter_actual_image_size | _filter_img_info
- }
- TEST_IMG="$TEST_IMG.base" _make_test_img 64M
-diff --git a/tests/qemu-iotests/273.out b/tests/qemu-iotests/273.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/273.out
-+++ b/tests/qemu-iotests/273.out
-@@ -XXX,XX +XXX,XX @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
-                     "cluster-size": 65536,
-                     "format": "IMGFMT",
-                     "actual-size": SIZE,
--                    "format-specific": {
--                        "type": "IMGFMT",
--                        "data": {
--                            "compat": "1.1",
--                            "lazy-refcounts": false,
--                            "refcount-bits": 16,
--                            "corrupt": false
--                        }
--                    },
-                     "full-backing-filename": "TEST_DIR/t.IMGFMT.base",
-                     "backing-filename": "TEST_DIR/t.IMGFMT.base",
-                     "dirty-flag": false
-@@ -XXX,XX +XXX,XX @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
-                 "cluster-size": 65536,
-                 "format": "IMGFMT",
-                 "actual-size": SIZE,
--                "format-specific": {
--                    "type": "IMGFMT",
--                    "data": {
--                        "compat": "1.1",
--                        "lazy-refcounts": false,
--                        "refcount-bits": 16,
--                        "corrupt": false
--                    }
--                },
-                 "full-backing-filename": "TEST_DIR/t.IMGFMT.mid",
-                 "backing-filename": "TEST_DIR/t.IMGFMT.mid",
-                 "dirty-flag": false
-@@ -XXX,XX +XXX,XX @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
-                 "cluster-size": 65536,
-                 "format": "IMGFMT",
-                 "actual-size": SIZE,
--                "format-specific": {
--                    "type": "IMGFMT",
--                    "data": {
--                        "compat": "1.1",
--                        "lazy-refcounts": false,
--                        "refcount-bits": 16,
--                        "corrupt": false
--                    }
--                },
-                 "full-backing-filename": "TEST_DIR/t.IMGFMT.base",
-                 "backing-filename": "TEST_DIR/t.IMGFMT.base",
-                 "dirty-flag": false
---
-.20.1

-[PULL 29/30] hmp: Allow using qdev ID for qemu-io command
+[PULL 4/7] libvduse: Pass positive value to strerror()
-In order to issue requests on an existing BlockBackend with the
+From: Xie Yongji <xieyongji@bytedance.com>
 'qemu-io' HMP command, allow specifying the BlockBackend not only with a
 BlockBackend name, but also with a qdev ID/QOM path for a device that
 owns the (possibly anonymous) BlockBackend.
-Because qdev names could be conflicting with BlockBackend and node
+The value passed to strerror() should be positive.
-names, introduce a -d option to explicitly address a device. If the
+So let's fix it.
 option is not given, a BlockBackend or a node is addressed.
+Fixes: Coverity CID 1490226, 1490223
+Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
+Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
+Reviewed-by: Markus Armbruster <armbru@redhat.com>
+Message-Id: <20220706095624.328-4-xieyongji@bytedance.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- monitor/hmp-cmds.c | 28 ++++++++++++++++++----------
+ subprojects/libvduse/libvduse.c | 4 ++--
- hmp-commands.hx    |  8 +++++---
+file changed, 2 insertions(+), 2 deletions(-)
 files changed, 23 insertions(+), 13 deletions(-)
-diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
+diff --git a/subprojects/libvduse/libvduse.c b/subprojects/libvduse/libvduse.c
 index XXXXXXX..XXXXXXX 100644
---- a/monitor/hmp-cmds.c
+--- a/subprojects/libvduse/libvduse.c
-+++ b/monitor/hmp-cmds.c
++++ b/subprojects/libvduse/libvduse.c
-@@ -XXX,XX +XXX,XX @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict)
+@@ -XXX,XX +XXX,XX @@ VduseDev *vduse_dev_create_by_name(const char *name, uint16_t num_queues,
- {
+     ret = vduse_dev_init(dev, name, num_queues, ops, priv);
-     BlockBackend *blk;
+     if (ret < 0) {
-     BlockBackend *local_blk = NULL;
+         fprintf(stderr, "Failed to init vduse device %s: %s\n",
-+    bool qdev = qdict_get_try_bool(qdict, "qdev", false);
+-                name, strerror(ret));
-     const char* device = qdict_get_str(qdict, "device");
++                name, strerror(-ret));
-     const char* command = qdict_get_str(qdict, "command");
+         free(dev);
-     Error *err = NULL;
+         return NULL;
      int ret;
 -    blk = blk_by_name(device);
 -    if (!blk) {
 -        BlockDriverState *bs = bdrv_lookup_bs(NULL, device, &err);
 -        if (bs) {
 -            blk = local_blk = blk_new(bdrv_get_aio_context(bs),
 -                                      0, BLK_PERM_ALL);
 -            ret = blk_insert_bs(blk, bs, &err);
 -            if (ret < 0) {
 +    if (qdev) {
 +        blk = blk_by_qdev_id(device, &err);
 +        if (!blk) {
 +            goto fail;
 +        }
 +    } else {
 +        blk = blk_by_name(device);
 +        if (!blk) {
 +            BlockDriverState *bs = bdrv_lookup_bs(NULL, device, &err);
 +            if (bs) {
 +                blk = local_blk = blk_new(bdrv_get_aio_context(bs),
 +                                          0, BLK_PERM_ALL);
 +                ret = blk_insert_bs(blk, bs, &err);
 +                if (ret < 0) {
 +                    goto fail;
 +                }
 +            } else {
                  goto fail;
              }
 -        } else {
 -            goto fail;
          }
      }
+@@ -XXX,XX +XXX,XX @@ VduseDev *vduse_dev_create(const char *name, uint32_t device_id,
-diff --git a/hmp-commands.hx b/hmp-commands.hx
+     ret = vduse_dev_init(dev, name, num_queues, ops, priv);
-index XXXXXXX..XXXXXXX 100644
+     if (ret < 0) {
---- a/hmp-commands.hx
+         fprintf(stderr, "Failed to init vduse device %s: %s\n",
-+++ b/hmp-commands.hx
+-                name, strerror(ret));
-@@ -XXX,XX +XXX,XX @@ ETEXI
++                name, strerror(-ret));
+         goto err;
-     {
+     }
          .name       = "qemu-io",
 -        .args_type  = "device:B,command:s",
 -        .params     = "[device] \"[command]\"",
 -        .help       = "run a qemu-io command on a block device",
 +        .args_type  = "qdev:-d,device:B,command:s",
 +        .params     = "[-d] [device] \"[command]\"",
 +        .help       = "run a qemu-io command on a block device\n\t\t\t"
 +                      "-d: [device] is a device ID rather than a "
 +                      "drive ID or node name",
          .cmd        = hmp_qemu_io,
      },
 --
-.20.1
+.35.3

-[PULL 28/30] block: Activate recursively even for already active nodes
+[PULL 5/7] hw/block/hd-geometry: Do not override specified bios-chs-trans
-bdrv_invalidate_cache_all() assumes that all nodes in a given subtree
+From: Lev Kujawski <lkujaw@member.fsf.org>
 are either active or inactive when it starts. Therefore, as soon as it
 arrives at an already active node, it stops.
-However, this assumption is wrong. For example, it's possible to take a
+For small disk images (<4 GiB), QEMU and SeaBIOS default to the
-snapshot of an inactive node, which results in an active overlay over an
+LARGE/ECHS disk translation method, but it is not uncommon for other
-inactive backing file. The active overlay is probably also the root node
+BIOS software to use LBA in these cases as well.  Some operating
-of an inactive BlockBackend (blk->disable_perm == true).
+system boot loaders (e.g., NT 4) do not handle LARGE translations
 outside of fixed configurations.  See, e.g., Q154052:
-In this case, bdrv_invalidate_cache_all() does not need to do anything
+"When starting an x86 based computer, Ntdetect.com retrieves and
-to activate the overlay node, but it still needs to recurse into the
+stores Interrupt 13 information. . . If the disk controller is using a
-children and the parents to make sure that after returning success,
+sector/64 head translation scheme, this boundary will be 1 GB. If
-really everything is activated.
+the controller uses 63 sector/255 head translation [AUTHOR: i.e.,
 LBA], the limit will be 4 GB."
-Cc: qemu-stable@nongnu.org
+To accommodate these situations, hd_geometry_guess() now follows the
 disk translation specified by the user even when the ATA disk geometry
 is guessed.
 hd_geometry_guess():
 * Only set the disk translation when translation is AUTO.
 * Show the soon-to-be active translation (*ptrans) in the trace rather
   than what was guessed.
 Resolves: https://gitlab.com/qemu-project/qemu/-/issues/56
 Buglink: https://bugs.launchpad.net/qemu/+bug/1745312
 Signed-off-by: Lev Kujawski <lkujaw@member.fsf.org>
 Message-Id: <20220707204045.999544-1-lkujaw@member.fsf.org>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
 ---
- block.c | 50 ++++++++++++++++++++++++--------------------------
+ hw/block/hd-geometry.c | 7 ++++++-
-file changed, 24 insertions(+), 26 deletions(-)
+file changed, 6 insertions(+), 1 deletion(-)
-diff --git a/block.c b/block.c
+diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c
 index XXXXXXX..XXXXXXX 100644
---- a/block.c
+--- a/hw/block/hd-geometry.c
-+++ b/block.c
++++ b/hw/block/hd-geometry.c
-@@ -XXX,XX +XXX,XX @@ static void coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs,
+@@ -XXX,XX +XXX,XX @@ void hd_geometry_guess(BlockBackend *blk,
-         return;
+         translation = BIOS_ATA_TRANSLATION_NONE;
      }
+     if (ptrans) {
--    if (!(bs->open_flags & BDRV_O_INACTIVE)) {
+-        *ptrans = translation;
--        return;
++        if (*ptrans == BIOS_ATA_TRANSLATION_AUTO) {
--    }
++            *ptrans = translation;
--
++        } else {
-     QLIST_FOREACH(child, &bs->children, next) {
++            /* Defer to the translation specified by the user.  */
-         bdrv_co_invalidate_cache(child->bs, &local_err);
++            translation = *ptrans;
          if (local_err) {
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs,
       * just keep the extended permissions for the next time that an activation
       * of the image is tried.
       */
 -    bs->open_flags &= ~BDRV_O_INACTIVE;
 -    bdrv_get_cumulative_perm(bs, &perm, &shared_perm);
 -    ret = bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, NULL, &local_err);
 -    if (ret < 0) {
 -        bs->open_flags |= BDRV_O_INACTIVE;
 -        error_propagate(errp, local_err);
 -        return;
 -    }
 -    bdrv_set_perm(bs, perm, shared_perm);
 -
 -    if (bs->drv->bdrv_co_invalidate_cache) {
 -        bs->drv->bdrv_co_invalidate_cache(bs, &local_err);
 -        if (local_err) {
 +    if (bs->open_flags & BDRV_O_INACTIVE) {
 +        bs->open_flags &= ~BDRV_O_INACTIVE;
 +        bdrv_get_cumulative_perm(bs, &perm, &shared_perm);
 +        ret = bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, NULL, &local_err);
 +        if (ret < 0) {
              bs->open_flags |= BDRV_O_INACTIVE;
              error_propagate(errp, local_err);
              return;
          }
 -    }
 +        bdrv_set_perm(bs, perm, shared_perm);
 -    FOR_EACH_DIRTY_BITMAP(bs, bm) {
 -        bdrv_dirty_bitmap_skip_store(bm, false);
 -    }
 +        if (bs->drv->bdrv_co_invalidate_cache) {
 +            bs->drv->bdrv_co_invalidate_cache(bs, &local_err);
 +            if (local_err) {
 +                bs->open_flags |= BDRV_O_INACTIVE;
 +                error_propagate(errp, local_err);
 +                return;
 +            }
 +        }
 -    ret = refresh_total_sectors(bs, bs->total_sectors);
 -    if (ret < 0) {
 -        bs->open_flags |= BDRV_O_INACTIVE;
 -        error_setg_errno(errp, -ret, "Could not refresh total sector count");
 -        return;
 +        FOR_EACH_DIRTY_BITMAP(bs, bm) {
 +            bdrv_dirty_bitmap_skip_store(bm, false);
 +        }
 +
 +        ret = refresh_total_sectors(bs, bs->total_sectors);
 +        if (ret < 0) {
 +            bs->open_flags |= BDRV_O_INACTIVE;
 +            error_setg_errno(errp, -ret, "Could not refresh total sector count");
 +            return;
 +        }
      }
+     trace_hd_geometry_guess(blk, *pcyls, *pheads, *psecs, translation);
-     QLIST_FOREACH(parent, &bs->parents, next_parent) {
+ }
 --
-.20.1
+.35.3

-[PULL 16/30] iotests: Fix IMGOPTSSYNTAX for nbd
+[PULL 6/7] qemu-iotests: Discard stderr when probing devices
-From: Max Reitz <mreitz@redhat.com>
+From: Cole Robinson <crobinso@redhat.com>
-There is no $SOCKDIR, only $SOCK_DIR.
+qemu-iotests fails in the following setup:
-Fixes: f3923a72f199b2c63747a7032db74730546f55c6
+  ./configure --enable-modules --enable-smartcard \
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+      --target-list=x86_64-softmmu,s390x-softmmu
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+  make
   cd build
   QEMU_PROG=`pwd`/s390x-softmmu/qemu-system-s390x \
       ../tests/check-block.sh qcow2
   ...
   --- /home/crobinso/src/qemu/tests/qemu-iotests/127.out
   +++ /home/crobinso/src/qemu/build/tests/qemu-iotests/scratch/127.out.bad
@@ -1,4 +1,18 @@
    QA output created by 127
   +Failed to open module: /home/crobinso/src/qemu/build/hw-usb-smartcard.so: undefined symbol: ccid_card_ccid_attach
   ...
   --- /home/crobinso/src/qemu/tests/qemu-iotests/267.out
   +++ /home/crobinso/src/qemu/build/tests/qemu-iotests/scratch/267.out.bad
@@ -1,4 +1,11 @@
    QA output created by 267
   +Failed to open module: /home/crobinso/src/qemu/build/hw-usb-smartcard.so: undefined symbol: ccid_card_ccid_attach
 The stderr spew is its own known issue, but seems like iotests should
 be discarding stderr in this case.
 Signed-off-by: Cole Robinson <crobinso@redhat.com>
 Reviewed-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- tests/qemu-iotests/common.rc | 3 ++-
+ tests/qemu-iotests/common.rc | 4 ++--
-file changed, 2 insertions(+), 1 deletion(-)
+file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/common.rc
 +++ b/tests/qemu-iotests/common.rc
-@@ -XXX,XX +XXX,XX @@ if [ "$IMGOPTSSYNTAX" = "true" ]; then
+@@ -XXX,XX +XXX,XX @@ _require_large_file()
-         TEST_IMG="$DRIVER,file.filename=$TEST_DIR/t.$IMGFMT"
+ #
-     elif [ "$IMGPROTO" = "nbd" ]; then
+ _require_devices()
-         TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
+ {
--        TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix,file.path=$SOCKDIR/nbd"
+-    available=$($QEMU -M none -device help | \
-+        TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix"
++    available=$($QEMU -M none -device help 2> /dev/null | \
-+        TEST_IMG="$TEST_IMG,file.path=$SOCK_DIR/nbd"
+                 grep ^name | sed -e 's/^name "//' -e 's/".*$//')
-     elif [ "$IMGPROTO" = "ssh" ]; then
+     for device
-         TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
+     do
-         TEST_IMG="$DRIVER,file.driver=ssh,file.host=127.0.0.1,file.path=$TEST_IMG_FILE"
+@@ -XXX,XX +XXX,XX @@ _require_devices()
  _require_one_device_of()
  {
 -    available=$($QEMU -M none -device help | \
 +    available=$($QEMU -M none -device help 2> /dev/null | \
                  grep ^name | sed -e 's/^name "//' -e 's/".*$//')
      for device
      do
 --
-.20.1
+.35.3

-[PULL 17/30] qcow2: Move error check of local_err near its assignment
+Deleted patch
-From: Tuguoyi <tu.guoyi@h3c.com>
-The local_err check outside of the if block was necessary
-when it was introduced in commit d1258dd0c87 because it needed to be
-executed even if qcow2_load_autoloading_dirty_bitmaps() returned false.
-After some modifications that all required the error check to remain
-where it is, commit 9c98f145dfb finally moved the
-qcow2_load_dirty_bitmaps() call into the if block, so now the error
-check should be there, too.
-Signed-off-by: Guoyi Tu <tu.guoyi@h3c.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow2.c | 10 +++++-----
-file changed, 5 insertions(+), 5 deletions(-)
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
-     if (!(bdrv_get_flags(bs) & BDRV_O_INACTIVE)) {
-         /* It's case 1, 2 or 3.2. Or 3.1 which is BUG in management layer. */
-         bool header_updated = qcow2_load_dirty_bitmaps(bs, &local_err);
-+        if (local_err != NULL) {
-+            error_propagate(errp, local_err);
-+            ret = -EINVAL;
-+            goto fail;
-+        }
-         update_header = update_header && !header_updated;
-     }
--    if (local_err != NULL) {
--        error_propagate(errp, local_err);
--        ret = -EINVAL;
--        goto fail;
--    }
-     if (update_header) {
-         ret = qcow2_update_header(bs);
---
-.20.1

-[PULL 18/30] iotests: Create VM.blockdev_create()
+Deleted patch
-We have several almost identical copies of a blockdev_create() function
-in different test cases. Time to create one unified function in
-iotests.py.
-To keep the diff managable, this patch only creates the function and
-follow-up patches will convert the individual test cases.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/iotests.py | 16 ++++++++++++++++
-file changed, 16 insertions(+)
-diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/iotests.py
-+++ b/tests/qemu-iotests/iotests.py
-@@ -XXX,XX +XXX,XX @@ class VM(qtest.QEMUQtestMachine):
-             elif status == 'null':
-                 return error
-+    # Returns None on success, and an error string on failure
-+    def blockdev_create(self, options, job_id='job0', filters=None):
-+        if filters is None:
-+            filters = [filter_qmp_testfiles]
-+        result = self.qmp_log('blockdev-create', filters=filters,
-+                              job_id=job_id, options=options)
-+
-+        if 'return' in result:
-+            assert result['return'] == {}
-+            job_result = self.run_job(job_id)
-+        else:
-+            job_result = result['error']
-+
-+        log("")
-+        return job_result
-+
-     def enable_migration_events(self, name):
-         log('Enabling migration QMP events on %s...' % name)
-         log(self.qmp('migrate-set-capabilities', capabilities=[
---
-.20.1

-[PULL 19/30] iotests: 255: Drop blockdev_create()
+Deleted patch
-blockdev_create() is completely unused in this test case, so we can just
-drop it.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/255 | 10 ----------
-file changed, 10 deletions(-)
-diff --git a/tests/qemu-iotests/255 b/tests/qemu-iotests/255
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/255
-+++ b/tests/qemu-iotests/255
-@@ -XXX,XX +XXX,XX @@ from iotests import imgfmt
- iotests.verify_image_format(supported_fmts=['qcow2'])
--def blockdev_create(vm, options):
--    result = vm.qmp_log('blockdev-create',
--                        filters=[iotests.filter_qmp_testfiles],
--                        job_id='job0', options=options)
--
--    if 'return' in result:
--        assert result['return'] == {}
--        vm.run_job('job0')
--    iotests.log("")
--
- iotests.log('Finishing a commit job with background reads')
- iotests.log('============================================')
- iotests.log('')
---
-.20.1

-[PULL 20/30] iotests: 206: Convert to VM.blockdev_create()
+Deleted patch
-Instead of having a separate blockdev_create() function, make use of the
-VM.blockdev_create() offered by iotests.py.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/206 | 232 ++++++++++++++++++++---------------------
-file changed, 111 insertions(+), 121 deletions(-)
-diff --git a/tests/qemu-iotests/206 b/tests/qemu-iotests/206
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/206
-+++ b/tests/qemu-iotests/206
-@@ -XXX,XX +XXX,XX @@ from iotests import imgfmt
- iotests.verify_image_format(supported_fmts=['qcow2'])
--def blockdev_create(vm, options):
--    result = vm.qmp_log('blockdev-create',
--                        filters=[iotests.filter_qmp_testfiles],
--                        job_id='job0', options=options)
--
--    if 'return' in result:
--        assert result['return'] == {}
--        vm.run_job('job0')
--    iotests.log("")
--
- with iotests.FilePath('t.qcow2') as disk_path, \
-      iotests.FilePath('t.qcow2.base') as backing_path, \
-      iotests.VM() as vm:
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
-     size = 128 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0 })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0 })
-     vm.qmp_log('blockdev-add',
-                filters=[iotests.filter_qmp_testfiles],
-                driver='file', filename=disk_path,
-                node_name='imgfile')
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'imgfile',
--                          'size': size })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'imgfile',
-+                         'size': size })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
-     size = 64 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0,
--                          'preallocation': 'off',
--                          'nocow': False })
--
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': {
--                              'driver': 'file',
--                              'filename': disk_path,
--                          },
--                          'size': size,
--                          'version': 'v3',
--                          'cluster-size': 65536,
--                          'preallocation': 'off',
--                          'lazy-refcounts': False,
--                          'refcount-bits': 16 })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0,
-+                         'preallocation': 'off',
-+                         'nocow': False })
-+
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': {
-+                             'driver': 'file',
-+                             'filename': disk_path,
-+                         },
-+                         'size': size,
-+                         'version': 'v3',
-+                         'cluster-size': 65536,
-+                         'preallocation': 'off',
-+                         'lazy-refcounts': False,
-+                         'refcount-bits': 16 })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
-     size = 32 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0,
--                          'preallocation': 'falloc',
--                          'nocow': True })
--
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': {
--                              'driver': 'file',
--                              'filename': disk_path,
--                          },
--                          'size': size,
--                          'version': 'v3',
--                          'cluster-size': 2097152,
--                          'preallocation': 'metadata',
--                          'lazy-refcounts': True,
--                          'refcount-bits': 1 })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0,
-+                         'preallocation': 'falloc',
-+                         'nocow': True })
-+
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': {
-+                             'driver': 'file',
-+                             'filename': disk_path,
-+                         },
-+                         'size': size,
-+                         'version': 'v3',
-+                         'cluster-size': 2097152,
-+                         'preallocation': 'metadata',
-+                         'lazy-refcounts': True,
-+                         'refcount-bits': 1 })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
-     iotests.log("")
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0 })
--
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': {
--                              'driver': 'file',
--                              'filename': disk_path,
--                          },
--                          'size': size,
--                          'backing-file': backing_path,
--                          'backing-fmt': 'qcow2',
--                          'version': 'v2',
--                          'cluster-size': 512 })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0 })
-+
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': {
-+                             'driver': 'file',
-+                             'filename': disk_path,
-+                         },
-+                         'size': size,
-+                         'backing-file': backing_path,
-+                         'backing-fmt': 'qcow2',
-+                         'version': 'v2',
-+                         'cluster-size': 512 })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
-     iotests.log("")
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': {
--                              'driver': 'file',
--                              'filename': disk_path,
--                          },
--                          'size': size,
--                          'encrypt': {
--                              'format': 'luks',
--                              'key-secret': 'keysec0',
--                              'cipher-alg': 'twofish-128',
--                              'cipher-mode': 'ctr',
--                              'ivgen-alg': 'plain64',
--                              'ivgen-hash-alg': 'md5',
--                              'hash-alg': 'sha1',
--                              'iter-time': 10,
--                          }})
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': {
-+                             'driver': 'file',
-+                             'filename': disk_path,
-+                         },
-+                         'size': size,
-+                         'encrypt': {
-+                             'format': 'luks',
-+                             'key-secret': 'keysec0',
-+                             'cipher-alg': 'twofish-128',
-+                             'cipher-mode': 'ctr',
-+                             'ivgen-alg': 'plain64',
-+                             'ivgen-hash-alg': 'md5',
-+                             'hash-alg': 'sha1',
-+                             'iter-time': 10,
-+                         }})
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
-     iotests.log("")
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': "this doesn't exist",
--                          'size': size })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': "this doesn't exist",
-+                         'size': size })
-     vm.shutdown()
-     #
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
-     vm.launch()
-     for size in [ 1234, 18446744073709551104, 9223372036854775808,
-                   9223372036854775296 ]:
--        blockdev_create(vm, { 'driver': imgfmt,
--                              'file': 'node0',
--                              'size': size })
-+        vm.blockdev_create({ 'driver': imgfmt,
-+                             'file': 'node0',
-+                             'size': size })
-     vm.shutdown()
-     #
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
-     iotests.log("=== Invalid version ===")
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': 67108864,
--                          'version': 'v1' })
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': 67108864,
--                          'version': 'v2',
--                          'lazy-refcounts': True })
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': 67108864,
--                          'version': 'v2',
--                          'refcount-bits': 8 })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': 67108864,
-+                         'version': 'v1' })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': 67108864,
-+                         'version': 'v2',
-+                         'lazy-refcounts': True })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': 67108864,
-+                         'version': 'v2',
-+                         'refcount-bits': 8 })
-     vm.shutdown()
-     #
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
-     iotests.log("=== Invalid backing file options ===")
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': 67108864,
--                          'backing-file': '/dev/null',
--                          'preallocation': 'full' })
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': 67108864,
--                          'backing-fmt': imgfmt })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': 67108864,
-+                         'backing-file': '/dev/null',
-+                         'preallocation': 'full' })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': 67108864,
-+                         'backing-fmt': imgfmt })
-     vm.shutdown()
-     #
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
-     vm.launch()
-     for csize in [ 1234, 128, 4194304, 0 ]:
--        blockdev_create(vm, { 'driver': imgfmt,
--                              'file': 'node0',
--                              'size': 67108864,
--                              'cluster-size': csize })
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': 281474976710656,
--                          'cluster-size': 512 })
-+        vm.blockdev_create({ 'driver': imgfmt,
-+                             'file': 'node0',
-+                             'size': 67108864,
-+                             'cluster-size': csize })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': 281474976710656,
-+                         'cluster-size': 512 })
-     vm.shutdown()
-     #
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
-     vm.launch()
-     for refcount_bits in [ 128, 0, 7 ]:
--        blockdev_create(vm, { 'driver': imgfmt,
--                              'file': 'node0',
--                              'size': 67108864,
--                              'refcount-bits': refcount_bits })
-+        vm.blockdev_create({ 'driver': imgfmt,
-+                             'file': 'node0',
-+                             'size': 67108864,
-+                             'refcount-bits': refcount_bits })
-     vm.shutdown()
---
-.20.1

-[PULL 21/30] iotests: 210: Convert to VM.blockdev_create()
+Deleted patch
-Instead of having a separate blockdev_create() function, make use of the
-VM.blockdev_create() offered by iotests.py.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/210 | 81 +++++++++++++++++++-----------------------
-file changed, 36 insertions(+), 45 deletions(-)
-diff --git a/tests/qemu-iotests/210 b/tests/qemu-iotests/210
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/210
-+++ b/tests/qemu-iotests/210
-@@ -XXX,XX +XXX,XX @@ from iotests import imgfmt
- iotests.verify_image_format(supported_fmts=['luks'])
- iotests.verify_protocol(supported=['file'])
--def blockdev_create(vm, options):
--    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
--                        filters=[iotests.filter_qmp_testfiles])
--
--    if 'return' in result:
--        assert result['return'] == {}
--        vm.run_job('job0')
--    iotests.log("")
--
- with iotests.FilePath('t.luks') as disk_path, \
-      iotests.VM() as vm:
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \
-     size = 128 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0 })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0 })
-     vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
-                node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'imgfile',
--                          'key-secret': 'keysec0',
--                          'size': size,
--                          'iter-time': 10 })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'imgfile',
-+                         'key-secret': 'keysec0',
-+                         'size': size,
-+                         'iter-time': 10 })
-     vm.shutdown()
-     # TODO Proper support for images to be used with imgopts and/or protocols
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \
-     size = 64 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0 })
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': {
--                              'driver': 'file',
--                              'filename': disk_path,
--                          },
--                          'size': size,
--                          'key-secret': 'keysec0',
--                          'cipher-alg': 'twofish-128',
--                          'cipher-mode': 'ctr',
--                          'ivgen-alg': 'plain64',
--                          'ivgen-hash-alg': 'md5',
--                          'hash-alg': 'sha1',
--                          'iter-time': 10 })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0 })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': {
-+                             'driver': 'file',
-+                             'filename': disk_path,
-+                         },
-+                         'size': size,
-+                         'key-secret': 'keysec0',
-+                         'cipher-alg': 'twofish-128',
-+                         'cipher-mode': 'ctr',
-+                         'ivgen-alg': 'plain64',
-+                         'ivgen-hash-alg': 'md5',
-+                         'hash-alg': 'sha1',
-+                         'iter-time': 10 })
-     vm.shutdown()
-     # TODO Proper support for images to be used with imgopts and/or protocols
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \
-     size = 64 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': "this doesn't exist",
--                          'size': size })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': "this doesn't exist",
-+                         'size': size })
-     vm.shutdown()
-     #
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \
-     vm.add_blockdev('driver=file,filename=%s,node-name=node0' % (disk_path))
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'key-secret': 'keysec0',
--                          'size': 0,
--                          'iter-time': 10 })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'key-secret': 'keysec0',
-+                         'size': 0,
-+                         'iter-time': 10 })
-     vm.shutdown()
-     # TODO Proper support for images to be used with imgopts and/or protocols
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \
-     vm.launch()
-     for size in [ 18446744073709551104, 9223372036854775808, 9223372036854775296 ]:
--        blockdev_create(vm, { 'driver': imgfmt,
--                              'file': 'node0',
--                              'key-secret': 'keysec0',
--                              'size': size })
-+        vm.blockdev_create({ 'driver': imgfmt,
-+                             'file': 'node0',
-+                             'key-secret': 'keysec0',
-+                             'size': size })
-     vm.shutdown()
-     #
---
-.20.1

-[PULL 22/30] iotests: 212: Convert to VM.blockdev_create()
+Deleted patch
-Instead of having a separate blockdev_create() function, make use of the
-VM.blockdev_create() offered by iotests.py.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/212 | 101 +++++++++++++++++++----------------------
-file changed, 46 insertions(+), 55 deletions(-)
-diff --git a/tests/qemu-iotests/212 b/tests/qemu-iotests/212
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/212
-+++ b/tests/qemu-iotests/212
-@@ -XXX,XX +XXX,XX @@ from iotests import imgfmt
- iotests.verify_image_format(supported_fmts=['parallels'])
- iotests.verify_protocol(supported=['file'])
--def blockdev_create(vm, options):
--    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
--                        filters=[iotests.filter_qmp_testfiles])
--
--    if 'return' in result:
--        assert result['return'] == {}
--        vm.run_job('job0')
--    iotests.log("")
--
- with iotests.FilePath('t.parallels') as disk_path, \
-      iotests.VM() as vm:
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
-     size = 128 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0 })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0 })
-     vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
-                node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'imgfile',
--                          'size': size })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'imgfile',
-+                         'size': size })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
-     size = 64 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0 })
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': {
--                              'driver': 'file',
--                              'filename': disk_path,
--                          },
--                          'size': size,
--                          'cluster-size': 1048576 })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0 })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': {
-+                             'driver': 'file',
-+                             'filename': disk_path,
-+                         },
-+                         'size': size,
-+                         'cluster-size': 1048576 })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
-     size = 32 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0 })
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': {
--                              'driver': 'file',
--                              'filename': disk_path,
--                          },
--                          'size': size,
--                          'cluster-size': 65536 })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0 })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': {
-+                             'driver': 'file',
-+                             'filename': disk_path,
-+                         },
-+                         'size': size,
-+                         'cluster-size': 65536 })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
-     iotests.log("")
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': "this doesn't exist",
--                          'size': size })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': "this doesn't exist",
-+                         'size': size })
-     vm.shutdown()
-     #
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
-     vm.add_blockdev('driver=file,filename=%s,node-name=node0' % (disk_path))
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': 0 })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': 0 })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
-     iotests.log("")
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': 4503599627369984})
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': 4503599627369984})
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
-     vm.launch()
-     for size in [ 1234, 18446744073709551104, 9223372036854775808,
-                   9223372036854775296, 4503599627370497 ]:
--        blockdev_create(vm, { 'driver': imgfmt,
--                              'file': 'node0',
--                              'size': size })
-+        vm.blockdev_create({ 'driver': imgfmt,
-+                             'file': 'node0',
-+                             'size': size })
-     vm.shutdown()
-     #
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
-     vm.launch()
-     for csize in [ 1234, 128, 4294967296, 9223372036854775808,
-                    18446744073709551104, 0 ]:
--        blockdev_create(vm, { 'driver': imgfmt,
--                              'file': 'node0',
--                              'size': 67108864,
--                              'cluster-size': csize })
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': 281474976710656,
--                          'cluster-size': 512 })
-+        vm.blockdev_create({ 'driver': imgfmt,
-+                             'file': 'node0',
-+                             'size': 67108864,
-+                             'cluster-size': csize })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': 281474976710656,
-+                         'cluster-size': 512 })
-     vm.shutdown()
---
-.20.1

-[PULL 23/30] iotests: 213: Convert to VM.blockdev_create()
+Deleted patch
-Instead of having a separate blockdev_create() function, make use of the
-VM.blockdev_create() offered by iotests.py.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/213 | 113 +++++++++++++++++++----------------------
-file changed, 52 insertions(+), 61 deletions(-)
-diff --git a/tests/qemu-iotests/213 b/tests/qemu-iotests/213
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/213
-+++ b/tests/qemu-iotests/213
-@@ -XXX,XX +XXX,XX @@ from iotests import imgfmt
- iotests.verify_image_format(supported_fmts=['vhdx'])
- iotests.verify_protocol(supported=['file'])
--def blockdev_create(vm, options):
--    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
--                        filters=[iotests.filter_qmp_testfiles])
--
--    if 'return' in result:
--        assert result['return'] == {}
--        vm.run_job('job0')
--    iotests.log("")
--
- with iotests.FilePath('t.vhdx') as disk_path, \
-      iotests.VM() as vm:
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
-     size = 128 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0 })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0 })
-     vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
-                node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'imgfile',
--                          'size': size })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'imgfile',
-+                         'size': size })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
-     size = 64 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0 })
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': {
--                              'driver': 'file',
--                              'filename': disk_path,
--                          },
--                          'size': size,
--                          'log-size': 1048576,
--                          'block-size': 8388608,
--                          'subformat': 'dynamic',
--                          'block-state-zero': True })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0 })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': {
-+                             'driver': 'file',
-+                             'filename': disk_path,
-+                         },
-+                         'size': size,
-+                         'log-size': 1048576,
-+                         'block-size': 8388608,
-+                         'subformat': 'dynamic',
-+                         'block-state-zero': True })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
-     size = 32 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0 })
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': {
--                              'driver': 'file',
--                              'filename': disk_path,
--                          },
--                          'size': size,
--                          'log-size': 8388608,
--                          'block-size': 268435456,
--                          'subformat': 'fixed',
--                          'block-state-zero': False })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0 })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': {
-+                             'driver': 'file',
-+                             'filename': disk_path,
-+                         },
-+                         'size': size,
-+                         'log-size': 8388608,
-+                         'block-size': 268435456,
-+                         'subformat': 'fixed',
-+                         'block-state-zero': False })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
-     iotests.log("")
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': "this doesn't exist",
--                          'size': size })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': "this doesn't exist",
-+                         'size': size })
-     vm.shutdown()
-     #
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
-     vm.add_blockdev('driver=file,filename=%s,node-name=node0' % (disk_path))
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': 0 })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': 0 })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
-     iotests.log("")
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': 70368744177664 })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': 70368744177664 })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
-     vm.launch()
-     for size in [ 18446744073709551104, 9223372036854775808,
-                   9223372036854775296, 70368744177665 ]:
--        blockdev_create(vm, { 'driver': imgfmt,
--                              'file': 'node0',
--                              'size': size })
-+        vm.blockdev_create({ 'driver': imgfmt,
-+                             'file': 'node0',
-+                             'size': size })
-     vm.shutdown()
-     #
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
-     vm.launch()
-     for bsize in [ 1234567, 128, 3145728, 536870912, 0 ]:
--        blockdev_create(vm, { 'driver': imgfmt,
--                              'file': 'node0',
--                              'size': 67108864,
--                              'block-size': bsize })
-+        vm.blockdev_create({ 'driver': imgfmt,
-+                             'file': 'node0',
-+                             'size': 67108864,
-+                             'block-size': bsize })
-     vm.shutdown()
-     #
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
-     vm.launch()
-     for lsize in [ 1234567, 128, 4294967296, 0 ]:
--        blockdev_create(vm, { 'driver': imgfmt,
--                              'file': 'node0',
--                              'size': 67108864,
--                              'log-size': lsize })
-+        vm.blockdev_create({ 'driver': imgfmt,
-+                             'file': 'node0',
-+                             'size': 67108864,
-+                             'log-size': lsize })
-     vm.shutdown()
---
-.20.1

-[PULL 24/30] iotests: 237: Convert to VM.blockdev_create()
+Deleted patch
-Instead of having a separate blockdev_create() function, make use of the
-VM.blockdev_create() offered by iotests.py.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/237 | 139 +++++++++++++++++++----------------------
-file changed, 65 insertions(+), 74 deletions(-)
-diff --git a/tests/qemu-iotests/237 b/tests/qemu-iotests/237
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/237
-+++ b/tests/qemu-iotests/237
-@@ -XXX,XX +XXX,XX @@ from iotests import imgfmt
- iotests.verify_image_format(supported_fmts=['vmdk'])
--def blockdev_create(vm, options):
--    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
--                        filters=[iotests.filter_qmp_testfiles])
--
--    if 'return' in result:
--        assert result['return'] == {}
--        vm.run_job('job0')
--    iotests.log("")
--
- with iotests.FilePath('t.vmdk') as disk_path, \
-      iotests.FilePath('t.vmdk.1') as extent1_path, \
-      iotests.FilePath('t.vmdk.2') as extent2_path, \
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
-     size = 5 * 1024 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0 })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0 })
-     vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
-                node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'imgfile',
--                          'size': size })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'imgfile',
-+                         'size': size })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
-     size = 64 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0 })
--
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': {
--                              'driver': 'file',
--                              'filename': disk_path,
--                          },
--                          'size': size,
--                          'extents': [],
--                          'subformat': 'monolithicSparse',
--                          'adapter-type': 'ide',
--                          'hwversion': '4',
--                          'zeroed-grain': False })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0 })
-+
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': {
-+                             'driver': 'file',
-+                             'filename': disk_path,
-+                         },
-+                         'size': size,
-+                         'extents': [],
-+                         'subformat': 'monolithicSparse',
-+                         'adapter-type': 'ide',
-+                         'hwversion': '4',
-+                         'zeroed-grain': False })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
-     size = 32 * 1024 * 1024
-     vm.launch()
--    blockdev_create(vm, { 'driver': 'file',
--                          'filename': disk_path,
--                          'size': 0 })
--
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': {
--                              'driver': 'file',
--                              'filename': disk_path,
--                          },
--                          'size': size,
--                          'extents': [],
--                          'subformat': 'monolithicSparse',
--                          'adapter-type': 'buslogic',
--                          'zeroed-grain': True })
-+    vm.blockdev_create({ 'driver': 'file',
-+                         'filename': disk_path,
-+                         'size': 0 })
-+
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': {
-+                             'driver': 'file',
-+                             'filename': disk_path,
-+                         },
-+                         'size': size,
-+                         'extents': [],
-+                         'subformat': 'monolithicSparse',
-+                         'adapter-type': 'buslogic',
-+                         'zeroed-grain': True })
-     vm.shutdown()
-     iotests.img_info_log(disk_path)
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
-     iotests.log("")
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': "this doesn't exist",
--                          'size': size })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': "this doesn't exist",
-+                         'size': size })
-     vm.shutdown()
-     #
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
-     vm.launch()
-     for adapter_type in [ 'ide', 'buslogic', 'lsilogic', 'legacyESX' ]:
--        blockdev_create(vm, { 'driver': imgfmt,
--                              'file': 'node0',
--                              'size': size,
--                              'adapter-type': adapter_type })
-+        vm.blockdev_create({ 'driver': imgfmt,
-+                             'file': 'node0',
-+                             'size': size,
-+                             'adapter-type': adapter_type })
-     vm.shutdown()
-     # Invalid
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
-     vm.launch()
-     for adapter_type in [ 'foo', 'IDE', 'legacyesx', 1 ]:
--        blockdev_create(vm, { 'driver': imgfmt,
--                              'file': 'node0',
--                              'size': size,
--                              'adapter-type': adapter_type })
-+        vm.blockdev_create({ 'driver': imgfmt,
-+                             'file': 'node0',
-+                             'size': size,
-+                             'adapter-type': adapter_type })
-     vm.shutdown()
-     #
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
-     iotests.log("")
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': size,
--                          'subformat': 'monolithicFlat' })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': size,
-+                         'subformat': 'monolithicFlat' })
-     vm.shutdown()
-     # Correct extent
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
-     iotests.log("")
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': size,
--                          'subformat': 'monolithicFlat',
--                          'extents': ['ext1'] })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': size,
-+                         'subformat': 'monolithicFlat',
-+                         'extents': ['ext1'] })
-     vm.shutdown()
-     # Extra extent
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
-     iotests.log("")
-     vm.launch()
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'node0',
--                          'size': 512,
--                          'subformat': 'monolithicFlat',
--                          'extents': ['ext1', 'ext2', 'ext3'] })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'node0',
-+                         'size': 512,
-+                         'subformat': 'monolithicFlat',
-+                         'extents': ['ext1', 'ext2', 'ext3'] })
-     vm.shutdown()
-     # Split formats
-@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
-             extents = [ "ext%d" % (i) for i in range(1, num_extents + 1) ]
-             vm.launch()
--            blockdev_create(vm, { 'driver': imgfmt,
--                                  'file': 'node0',
--                                  'size': size,
--                                  'subformat': subfmt,
--                                  'extents': extents })
-+            vm.blockdev_create({ 'driver': imgfmt,
-+                                 'file': 'node0',
-+                                 'size': size,
-+                                 'subformat': subfmt,
-+                                 'extents': extents })
-             vm.shutdown()
-             iotests.img_info_log(disk_path)
---
-.20.1

-[PULL 25/30] iotests: 266: Convert to VM.blockdev_create()
+Deleted patch
-Instead of having a separate blockdev_create() function, make use of the
-VM.blockdev_create() offered by iotests.py.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/266     | 69 +++++++++++++++++---------------------
- tests/qemu-iotests/266.out | 14 ++++++++
-files changed, 44 insertions(+), 39 deletions(-)
-diff --git a/tests/qemu-iotests/266 b/tests/qemu-iotests/266
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/266
-+++ b/tests/qemu-iotests/266
-@@ -XXX,XX +XXX,XX @@ import iotests
- from iotests import imgfmt
--def blockdev_create(vm, options):
--    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
--                        filters=[iotests.filter_qmp_testfiles])
--
--    if 'return' in result:
--        assert result['return'] == {}
--        vm.run_job('job0')
--
--
- # Successful image creation (defaults)
- def implicit_defaults(vm, file_path):
-     iotests.log("=== Successful image creation (defaults) ===")
-@@ -XXX,XX +XXX,XX @@ def implicit_defaults(vm, file_path):
-     # (Close to 64 MB)
-     size = 8 * 964 * 17 * 512
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'protocol-node',
--                          'size': size })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'protocol-node',
-+                         'size': size })
- # Successful image creation (explicit defaults)
-@@ -XXX,XX +XXX,XX @@ def explicit_defaults(vm, file_path):
-     # (Close to 128 MB)
-     size = 16 * 964 * 17 * 512
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'protocol-node',
--                          'size': size,
--                          'subformat': 'dynamic',
--                          'force-size': False })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'protocol-node',
-+                         'size': size,
-+                         'subformat': 'dynamic',
-+                         'force-size': False })
- # Successful image creation (non-default options)
-@@ -XXX,XX +XXX,XX @@ def non_defaults(vm, file_path):
-     # Not representable in CHS (fine with force-size=True)
-     size = 1048576
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'protocol-node',
--                          'size': size,
--                          'subformat': 'fixed',
--                          'force-size': True })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'protocol-node',
-+                         'size': size,
-+                         'subformat': 'fixed',
-+                         'force-size': True })
- # Size not representable in CHS with force-size=False
-@@ -XXX,XX +XXX,XX @@ def non_chs_size_without_force(vm, file_path):
-     # Not representable in CHS (will not work with force-size=False)
-     size = 1048576
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'protocol-node',
--                          'size': size,
--                          'force-size': False })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'protocol-node',
-+                         'size': size,
-+                         'force-size': False })
- # Zero size
-@@ -XXX,XX +XXX,XX @@ def zero_size(vm, file_path):
-     iotests.log("=== Zero size===")
-     iotests.log("")
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'protocol-node',
--                          'size': 0 })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'protocol-node',
-+                         'size': 0 })
- # Maximum CHS size
-@@ -XXX,XX +XXX,XX @@ def maximum_chs_size(vm, file_path):
-     iotests.log("=== Maximum CHS size===")
-     iotests.log("")
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'protocol-node',
--                          'size': 16 * 65535 * 255 * 512 })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'protocol-node',
-+                         'size': 16 * 65535 * 255 * 512 })
- # Actual maximum size
-@@ -XXX,XX +XXX,XX @@ def maximum_size(vm, file_path):
-     iotests.log("=== Actual maximum size===")
-     iotests.log("")
--    blockdev_create(vm, { 'driver': imgfmt,
--                          'file': 'protocol-node',
--                          'size': 0xff000000 * 512,
--                          'force-size': True })
-+    vm.blockdev_create({ 'driver': imgfmt,
-+                         'file': 'protocol-node',
-+                         'size': 0xff000000 * 512,
-+                         'force-size': True })
- def main():
-@@ -XXX,XX +XXX,XX @@ def main():
-             vm.launch()
-             iotests.log('--- Creating empty file ---')
--            blockdev_create(vm, { 'driver': 'file',
--                                  'filename': file_path,
--                                  'size': 0 })
-+            vm.blockdev_create({ 'driver': 'file',
-+                                 'filename': file_path,
-+                                 'size': 0 })
-             vm.qmp_log('blockdev-add', driver='file', filename=file_path,
-                        node_name='protocol-node',
-diff --git a/tests/qemu-iotests/266.out b/tests/qemu-iotests/266.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/266.out
-+++ b/tests/qemu-iotests/266.out
-@@ -XXX,XX +XXX,XX @@
- {"return": {}}
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
- {"return": {}}
-@@ -XXX,XX +XXX,XX @@
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- image: TEST_IMG
- file format: IMGFMT
- virtual size: 64 MiB (67125248 bytes)
-@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
- {"return": {}}
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
- {"return": {}}
-@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- image: TEST_IMG
- file format: IMGFMT
- virtual size: 128 MiB (134250496 bytes)
-@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
- {"return": {}}
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
- {"return": {}}
-@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- image: TEST_IMG
- file format: IMGFMT
- virtual size: 1 MiB (1048576 bytes)
-@@ -XXX,XX +XXX,XX @@ virtual size: 1 MiB (1048576 bytes)
- {"return": {}}
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
- {"return": {}}
-@@ -XXX,XX +XXX,XX @@ Job failed: The requested image size cannot be represented in CHS geometry
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- qemu-img: Could not open 'TEST_IMG': File too small for a VHD header
- --- Creating empty file ---
-@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_IMG': File too small for a VHD header
- {"return": {}}
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
- {"return": {}}
-@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_IMG': File too small for a VHD header
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- image: TEST_IMG
- file format: IMGFMT
- virtual size: 0 B (0 bytes)
-@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
- {"return": {}}
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
- {"return": {}}
-@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- image: TEST_IMG
- file format: IMGFMT
- virtual size: 127 GiB (136899993600 bytes)
-@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
- {"return": {}}
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
- {"return": {}}
-@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
- {"execute": "job-dismiss", "arguments": {"id": "job0"}}
- {"return": {}}
-+
- image: TEST_IMG
- file format: IMGFMT
- virtual size: 1.99 TiB (2190433320960 bytes)
---
-.20.1

-[PULL 26/30] iotests: 207: Remove duplication with VM.blockdev_create()
+Deleted patch
-The blockdev_create() function in this test case adds another filter to
-the logging, but provides otherwise the same functionality as
-VM.blockdev_create() from iotests.py. Make it a thin wrapper around the
-iotests.py function.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/207 | 8 +-------
-file changed, 1 insertion(+), 7 deletions(-)
-diff --git a/tests/qemu-iotests/207 b/tests/qemu-iotests/207
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/207
-+++ b/tests/qemu-iotests/207
-@@ -XXX,XX +XXX,XX @@ def filter_hash(qmsg):
-     return iotests.filter_qmp(qmsg, _filter)
- def blockdev_create(vm, options):
--    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
--                        filters=[iotests.filter_qmp_testfiles, filter_hash])
--
--    if 'return' in result:
--        assert result['return'] == {}
--        vm.run_job('job0')
--    iotests.log("")
-+    vm.blockdev_create(options, filters=[iotests.filter_qmp_testfiles, filter_hash])
- with iotests.FilePath('t.img') as disk_path, \
-      iotests.VM() as vm:
---
-.20.1

-[PULL 27/30] iotests: 211: Remove duplication with VM.blockdev_create()
+[PULL 7/7] main loop: add missing documentation links to GS/IO macros
-The blockdev_create() function in this test case adds an error check
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
 that skips the test in case of failure because of memory shortage, but
 provides otherwise the same functionality as VM.blockdev_create() from
 iotests.py. Make it a thin wrapper around the iotests.py function.
+If we go directly to GLOBAL_STATE_CODE, IO_CODE or IO_OR_GS_CODE
+definition, we just find that they "mark and check that the function
+is part of the {category} API".
+However, ther is no definition on what {category} API is, they are
+in include/block/block-*.h
+Therefore, add a comment that refers to such documentation.
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Message-Id: <20220609122206.1016936-1-eesposit@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- tests/qemu-iotests/211 | 12 +++---------
+ include/qemu/main-loop.h | 18 +++++++++++++++---
-file changed, 3 insertions(+), 9 deletions(-)
+file changed, 15 insertions(+), 3 deletions(-)
-diff --git a/tests/qemu-iotests/211 b/tests/qemu-iotests/211
+diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
-index XXXXXXX..XXXXXXX 100755
+index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/211
+--- a/include/qemu/main-loop.h
-+++ b/tests/qemu-iotests/211
++++ b/include/qemu/main-loop.h
-@@ -XXX,XX +XXX,XX @@ iotests.verify_image_format(supported_fmts=['vdi'])
+@@ -XXX,XX +XXX,XX @@ bool qemu_mutex_iothread_locked(void);
- iotests.verify_protocol(supported=['file'])
+  */
+ bool qemu_in_main_thread(void);
- def blockdev_create(vm, options):
--    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
+-/* Mark and check that the function is part of the global state API. */
--                        filters=[iotests.filter_qmp_testfiles])
++/*
--
++ * Mark and check that the function is part of the Global State API.
--    if 'return' in result:
++ * Please refer to include/block/block-global-state.h for more
--        assert result['return'] == {}
++ * information about GS API.
--        error = vm.run_job('job0')
++ */
--        if error and 'Could not allocate bmap' in error:
+ #ifdef CONFIG_COCOA
--            iotests.notrun('Insufficient memory')
+ /*
--    iotests.log("")
+  * When using the Cocoa UI, addRemovableDevicesMenuItems() is called from
-+    error = vm.blockdev_create(options)
+@@ -XXX,XX +XXX,XX @@ bool qemu_in_main_thread(void);
-+    if error and 'Could not allocate bmap' in error:
+     } while (0)
-+        iotests.notrun('Insufficient memory')
+ #endif /* CONFIG_COCOA */
- with iotests.FilePath('t.vdi') as disk_path, \
+-/* Mark and check that the function is part of the I/O API. */
-      iotests.VM() as vm:
++/*
 + * Mark and check that the function is part of the I/O API.
 + * Please refer to include/block/block-io.h for more
 + * information about IO API.
 + */
  #define IO_CODE()                                                   \
      do {                                                            \
          /* nop */                                                   \
      } while (0)
 -/* Mark and check that the function is part of the "I/O OR GS" API. */
 +/*
 + * Mark and check that the function is part of the "I/O OR GS" API.
 + * Please refer to include/block/block-io.h for more
 + * information about "IO or GS" API.
 + */
  #define IO_OR_GS_CODE()                                             \
      do {                                                            \
          /* nop */                                                   \
 --
-.20.1
+.35.3

The following changes since commit aceeaa69d28e6f08a24395d0aa6915b687d0a681:

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-12-17' into staging (2019-12-17 15:55:20 +0000)

are available in the Git repository at:

git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to f62f08ab7a9d902da70078992248ec5c98f652ad:

iotests: Test external snapshot with VM state (2019-12-19 18:04:25 +0100)

----------------------------------------------------------------
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

----------------------------------------------------------------
Alberto Garcia (1):
      qcow2: Use offset_into_cluster()

Daniel P. Berrangé (1):
      qapi: better document NVMe blockdev @device parameter

Kevin Wolf (19):
      block: Error out on image creation with conflicting size options
      blockjob: Fix error message for negative speed
      qcow2: Declare BDRV_REQ_NO_FALLBACK supported
      iotests: Add qemu_io_log()
      iotests: Fix timeout in run_job()
      iotests: Support job-complete in run_job()
      iotests: Create VM.blockdev_create()
      iotests: 255: Drop blockdev_create()
      iotests: 206: Convert to VM.blockdev_create()
      iotests: 210: Convert to VM.blockdev_create()
      iotests: 212: Convert to VM.blockdev_create()
      iotests: 213: Convert to VM.blockdev_create()
      iotests: 237: Convert to VM.blockdev_create()
      iotests: 266: Convert to VM.blockdev_create()
      iotests: 207: Remove duplication with VM.blockdev_create()
      iotests: 211: Remove duplication with VM.blockdev_create()
      block: Activate recursively even for already active nodes
      hmp: Allow using qdev ID for qemu-io command
      iotests: Test external snapshot with VM state

Max Reitz (2):
      iotests/273: Filter format-specific information
      iotests: Fix IMGOPTSSYNTAX for nbd

Stefan Hajnoczi (1):
      qemu-img: fix info --backing-chain --image-opts

Thomas Huth (4):
      iotests: Provide a function for checking the creation of huge files
      iotests: Skip test 060 if it is not possible to create large files
      iotests: Skip test 079 if it is not possible to create large files
      iotests: Add more "_require_drivers" checks to the shell-based tests

Tuguoyi (1):
      qcow2: Move error check of local_err near its assignment

Vladimir Sementsov-Ogievskiy (1):
      MAINTAINERS: fix qcow2-bitmap.c under Dirty Bitmaps header

From: Thomas Huth <thuth@redhat.com>

Some tests create huge (but sparse) files, and to be able to run those
tests in certain limited environments (like CI containers), we have to
check for the possibility to create such files first. Thus let's introduce
a common function to check for large files, and replace the already
existing checks in the iotests 005 and 220 with this function.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/005       |  5 +----
 tests/qemu-iotests/220       |  6 ++----
 tests/qemu-iotests/common.rc | 10 ++++++++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/005
+++ b/tests/qemu-iotests/005
@@ -XXX,XX +XXX,XX @@ fi
 # Sanity check: For raw, we require a file system that permits the creation
 # of a HUGE (but very sparse) file. Check we can create it before continuing.
 if [ "$IMGFMT" = "raw" ]; then
-    if ! truncate --size=5T "$TEST_IMG"; then
-        _notrun "file system on $TEST_DIR does not support large enough files"
-    fi
-    rm "$TEST_IMG"
+    _require_large_file 5T
 fi
 
 echo
diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/220
+++ b/tests/qemu-iotests/220
@@ -XXX,XX +XXX,XX @@ echo "== Creating huge file =="
 
 # Sanity check: We require a file system that permits the creation
 # of a HUGE (but very sparse) file.  tmpfs works, ext4 does not.
-if ! truncate --size=513T "$TEST_IMG"; then
-    _notrun "file system on $TEST_DIR does not support large enough files"
-fi
-rm "$TEST_IMG"
+_require_large_file 513T
+
 IMGOPTS='cluster_size=2M,refcount_bits=1' _make_test_img 513T
 
 echo "== Populating refcounts =="
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ _require_drivers()
     done
 }
 
+# Check that we have a file system that allows huge (but very sparse) files
+#
+_require_large_file()
+{
+    if ! truncate --size="$1" "$TEST_IMG"; then
+        _notrun "file system on $TEST_DIR does not support large enough files"
+    fi
+    rm "$TEST_IMG"
+}
+
 # make sure this script returns success
 true
-- 
2.20.1

From: Thomas Huth <thuth@redhat.com>

Test 060 fails in the arm64, s390x and ppc64le LXD containers on Travis
(which we will hopefully enable in our CI soon). These containers
apparently do not allow large files to be created. The repair process
in test 060 creates a file of 64 GiB, so test first whether such large
files are possible and skip the test if that's not the case.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/060 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
 
+# The repair process will create a large file - so check for availability first
+_require_large_file 64G
+
 rt_offset=65536  # 0x10000 (XXX: just an assumption)
 rb_offset=131072 # 0x20000 (XXX: just an assumption)
 l1_offset=196608 # 0x30000 (XXX: just an assumption)
-- 
2.20.1

From: Thomas Huth <thuth@redhat.com>

Test 079 fails in the arm64, s390x and ppc64le LXD containers on Travis
(which we will hopefully enable in our CI soon). These containers
apparently do not allow large files to be created. Test 079 tries to
create a 4G sparse file, which is apparently already too big for these
containers, so check first whether we can really create such files before
executing the test.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/079 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/079
+++ b/tests/qemu-iotests/079
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file nfs
 
+# Some containers (e.g. non-x86 on Travis) do not allow large files
+_require_large_file 4G
+
 echo "=== Check option preallocation and cluster_size ==="
 echo
 cluster_sizes="16384 32768 65536 131072 262144 524288 1048576 2097152 4194304"
-- 
2.20.1

From: Daniel P. Berrangé <berrange@redhat.com>

Mention that this is a PCI device address & give the format it is
expected in. Also mention that it must be first unbound from any
host kernel driver.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qapi/block-core.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 #
 # Driver specific block device options for the NVMe backend.
 #
-# @device:    controller address of the NVMe device.
+# @device:    PCI controller address of the NVMe device in
+#             format hhhh:bb:ss.f (host:bus:slot.function)
 # @namespace: namespace number of the device, starting from 1.
 #
+# Note that the PCI @device must have been unbound from any host
+# kernel driver before instructing QEMU to add the blockdev.
+#
 # Since: 2.12
 ##
 { 'struct': 'BlockdevOptionsNVMe',
-- 
2.20.1

From: Stefan Hajnoczi <stefanha@redhat.com>

Only apply --image-opts to the topmost image when listing an entire
backing chain.  It is incorrect to treat backing filenames as image
options.  Assuming we have the backing chain t.IMGFMT.base <-
t.IMGFMT.mid <- t.IMGFMT, qemu-img info fails as follows:

$ qemu-img info --backing-chain --image-opts \
      driver=qcow2,file.driver=file,file.filename=t.IMGFMT
  qemu-img: Could not open 'TEST_DIR/t.IMGFMT.mid': Cannot find device=TEST_DIR/t.IMGFMT.mid nor node_name=TEST_DIR/t.IMGFMT.mid

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qemu-img.c                 |  3 ++
 tests/qemu-iotests/279     | 57 ++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/279.out | 35 +++++++++++++++++++++++
 tests/qemu-iotests/group   |  1 +
 4 files changed, 96 insertions(+)
 create mode 100755 tests/qemu-iotests/279
 create mode 100644 tests/qemu-iotests/279.out

diff --git a/qemu-img.c b/qemu-img.c
index XXXXXXX..XXXXXXX 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -XXX,XX +XXX,XX @@ static ImageInfoList *collect_image_info_list(bool image_opts,
 
         blk_unref(blk);
 
+        /* Clear parameters that only apply to the topmost image */
         filename = fmt = NULL;
+        image_opts = false;
+
         if (chain) {
             if (info->has_full_backing_filename) {
                 filename = info->full_backing_filename;
diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279
new file mode 100755
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/279
@@ -XXX,XX +XXX,XX @@
+#!/usr/bin/env bash
+#
+# Test qemu-img --backing-chain --image-opts
+#
+# Copyright (C) 2019 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+seq=$(basename "$0")
+echo "QA output created by $seq"
+
+status=1	# failure is the default!
+
+_cleanup()
+{
+    _cleanup_test_img
+    rm -f "$TEST_IMG.mid"
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+
+# Backing files are required...
+_supported_fmt qcow qcow2 vmdk qed
+_supported_proto file
+_supported_os Linux
+
+TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+TEST_IMG="$TEST_IMG.mid" _make_test_img -b "$TEST_IMG.base"
+_make_test_img -b "$TEST_IMG.mid"
+
+echo
+echo '== qemu-img info --backing-chain =='
+_img_info --backing-chain | _filter_img_info
+
+echo
+echo '== qemu-img info --backing-chain --image-opts =='
+TEST_IMG="driver=qcow2,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts | _filter_img_info
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/279.out b/tests/qemu-iotests/279.out
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/279.out
@@ -XXX,XX +XXX,XX @@
+QA output created by 279
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
+Formatting 'TEST_DIR/t.IMGFMT.mid', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.mid
+
+== qemu-img info --backing-chain ==
+image: TEST_DIR/t.IMGFMT
+file format: IMGFMT
+virtual size: 64 MiB (67108864 bytes)
+backing file: TEST_DIR/t.IMGFMT.mid
+
+image: TEST_DIR/t.IMGFMT.mid
+file format: IMGFMT
+virtual size: 64 MiB (67108864 bytes)
+backing file: TEST_DIR/t.IMGFMT.base
+
+image: TEST_DIR/t.IMGFMT.base
+file format: IMGFMT
+virtual size: 64 MiB (67108864 bytes)
+
+== qemu-img info --backing-chain --image-opts ==
+image: TEST_DIR/t.IMGFMT
+file format: IMGFMT
+virtual size: 64 MiB (67108864 bytes)
+backing file: TEST_DIR/t.IMGFMT.mid
+
+image: TEST_DIR/t.IMGFMT.mid
+file format: IMGFMT
+virtual size: 64 MiB (67108864 bytes)
+backing file: TEST_DIR/t.IMGFMT.base
+
+image: TEST_DIR/t.IMGFMT.base
+file format: IMGFMT
+virtual size: 64 MiB (67108864 bytes)
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -XXX,XX +XXX,XX @@
 272 rw
 273 backing quick
 277 rw quick
+279 rw backing quick
-- 
2.20.1

If both the create options (qemu-img create -o ...) and the size
parameter were given, the size parameter was silently ignored. Instead,
make specifying two sizes an error.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 block.c                    | 10 ++++++++--
 tests/qemu-iotests/049     |  5 +++++
 tests/qemu-iotests/049.out |  5 +++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void bdrv_img_create(const char *filename, const char *fmt,
         return;
     }
 
+    /* Create parameter list */
     create_opts = qemu_opts_append(create_opts, drv->create_opts);
     create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
 
-    /* Create parameter list with default values */
     opts = qemu_opts_create(create_opts, NULL, 0, &error_abort);
-    qemu_opt_set_number(opts, BLOCK_OPT_SIZE, img_size, &error_abort);
 
     /* Parse -o options */
     if (options) {
@@ -XXX,XX +XXX,XX @@ void bdrv_img_create(const char *filename, const char *fmt,
         }
     }
 
+    if (!qemu_opt_get(opts, BLOCK_OPT_SIZE)) {
+        qemu_opt_set_number(opts, BLOCK_OPT_SIZE, img_size, &error_abort);
+    } else if (img_size != UINT64_C(-1)) {
+        error_setg(errp, "The image size must be specified only once");
+        goto out;
+    }
+
     if (base_filename) {
         qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, base_filename, &local_err);
         if (local_err) {
diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/049
+++ b/tests/qemu-iotests/049
@@ -XXX,XX +XXX,XX @@ for s in $sizes; do
     test_qemu_img create -f $IMGFMT -o size=$s "$TEST_IMG"
 done
 
+echo "== 4. Specify size twice (-o and traditional parameter) =="
+echo
+
+test_qemu_img create -f $IMGFMT -o size=10M "$TEST_IMG" 20M
+
 echo "== Check correct interpretation of suffixes for cluster size =="
 echo
 sizes="1024 1024b 1k 1K 1M "
diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/049.out
+++ b/tests/qemu-iotests/049.out
@@ -XXX,XX +XXX,XX @@ qemu-img: TEST_DIR/t.qcow2: Parameter 'size' expects a non-negative number below
 Optional suffix k, M, G, T, P or E means kilo-, mega-, giga-, tera-, peta-
 and exabytes, respectively.
 
+== 4. Specify size twice (-o and traditional parameter) ==
+
+qemu-img create -f qcow2 -o size=10M TEST_DIR/t.qcow2 20M
+qemu-img: TEST_DIR/t.qcow2: The image size must be specified only once
+
 == Check correct interpretation of suffixes for cluster size ==
 
 qemu-img create -f qcow2 -o cluster_size=1024 TEST_DIR/t.qcow2 64M
-- 
2.20.1

The error message for a negative speed uses QERR_INVALID_PARAMETER,
which implies that the 'speed' option doesn't even exist:

{"error": {"class": "GenericError", "desc": "Invalid parameter 'speed'"}}

Make it use QERR_INVALID_PARAMETER_VALUE instead:

{"error": {"class": "GenericError", "desc": "Parameter 'speed' expects a non-negative value"}}

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 blockjob.c             | 3 ++-
 tests/qemu-iotests/030 | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/blockjob.c b/blockjob.c
index XXXXXXX..XXXXXXX 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -XXX,XX +XXX,XX @@ void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)
         return;
     }
     if (speed < 0) {
-        error_setg(errp, QERR_INVALID_PARAMETER, "speed");
+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "speed",
+                   "a non-negative value");
         return;
     }
 
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -XXX,XX +XXX,XX @@ class TestSetSpeed(iotests.QMPTestCase):
         self.assert_no_active_block_jobs()
 
         result = self.vm.qmp('block-stream', device='drive0', speed=-1)
-        self.assert_qmp(result, 'error/desc', "Invalid parameter 'speed'")
+        self.assert_qmp(result, 'error/desc', "Parameter 'speed' expects a non-negative value")
 
         self.assert_no_active_block_jobs()
 
@@ -XXX,XX +XXX,XX @@ class TestSetSpeed(iotests.QMPTestCase):
         self.assert_qmp(result, 'return', {})
 
         result = self.vm.qmp('block-job-set-speed', device='drive0', speed=-1)
-        self.assert_qmp(result, 'error/desc', "Invalid parameter 'speed'")
+        self.assert_qmp(result, 'error/desc', "Parameter 'speed' expects a non-negative value")
 
         self.cancel_and_wait(resume=True)
 
-- 
2.20.1

In the common case, qcow2_co_pwrite_zeroes() already only modifies
metadata case, so we're fine with or without BDRV_REQ_NO_FALLBACK set.

The only exception is when using an external data file, where the
request is passed down to the block driver of the external data file. We
are forwarding the BDRV_REQ_NO_FALLBACK flag there, though, so this is
fine, too.

Declare the flag supported therefore.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
---
 block/qcow2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
         }
     }
 
-    bs->supported_zero_flags = header.version >= 3 ? BDRV_REQ_MAY_UNMAP : 0;
+    bs->supported_zero_flags = header.version >= 3 ?
+                               BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK : 0;
 
     /* Repair image if dirty */
     if (!(flags & (BDRV_O_CHECK | BDRV_O_INACTIVE)) && !bs->read_only &&
-- 
2.20.1

Add a function that runs qemu-io and logs the output with the
appropriate filters applied.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tests/qemu-iotests/iotests.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -XXX,XX +XXX,XX @@ def qemu_io(*args):
         sys.stderr.write('qemu-io received signal %i: %s\n' % (-exitcode, ' '.join(args)))
     return subp.communicate()[0]
 
+def qemu_io_log(*args):
+    result = qemu_io(*args)
+    log(result, filters=[filter_testfiles, filter_qemu_io])
+    return result
+
 def qemu_io_silent(*args):
     '''Run qemu-io and return the exit code, suppressing stdout'''
     args = qemu_io_args + list(args)
-- 
2.20.1

run_job() accepts a wait parameter for a timeout, but it doesn't
actually use it. The only thing that is missing is passing it to
events_wait(), so do that now.

Automatically complete jobs that have a 'ready' state and need an
explicit job-complete. Without this, run_job() would hang for such
jobs.

From: Alberto Garcia <berto@igalia.com>

There's a couple of places left in the qcow2 code that still do the
calculation manually, so let's replace them.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
                 return -EINVAL;
             }
 
-            if (bitmaps_ext.bitmap_directory_offset & (s->cluster_size - 1)) {
+            if (offset_into_cluster(s, bitmaps_ext.bitmap_directory_offset)) {
                 error_setg(errp, "bitmaps_ext: "
                                  "invalid bitmap directory offset");
                 return -EINVAL;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_block_status(BlockDriverState *bs,
 {
     BDRVQcow2State *s = bs->opaque;
     uint64_t cluster_offset;
-    int index_in_cluster, ret;
     unsigned int bytes;
-    int status = 0;
+    int ret, status = 0;
 
     qemu_co_mutex_lock(&s->lock);
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_block_status(BlockDriverState *bs,
 
     if ((ret == QCOW2_CLUSTER_NORMAL || ret == QCOW2_CLUSTER_ZERO_ALLOC) &&
         !s->crypto) {
-        index_in_cluster = offset & (s->cluster_size - 1);
-        *map = cluster_offset | index_in_cluster;
+        *map = cluster_offset | offset_into_cluster(s, offset);
         *file = s->data_file->bs;
         status |= BDRV_BLOCK_OFFSET_VALID;
     }
-- 
2.20.1

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Somehow I wrote not full path to the file. Fix that.

Also, while being here, rearrange entries, so that includes go first,
then block, than migration, than util.

Fixes: 052db8e71444d
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 MAINTAINERS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ M: John Snow <jsnow@redhat.com>
 R: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 L: qemu-block@nongnu.org
 S: Supported
-F: util/hbitmap.c
-F: block/dirty-bitmap.c
 F: include/qemu/hbitmap.h
 F: include/block/dirty-bitmap.h
-F: qcow2-bitmap.c
+F: block/dirty-bitmap.c
+F: block/qcow2-bitmap.c
 F: migration/block-dirty-bitmap.c
+F: util/hbitmap.c
 F: tests/test-hbitmap.c
 F: docs/interop/bitmaps.rst
 T: git https://github.com/jnsnow/qemu.git bitmaps
-- 
2.20.1

From: Thomas Huth <thuth@redhat.com>

Test 051 should be skipped if nbd is not available, and 267 should
be skipped if copy-on-read is not enabled.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/051 | 1 +
 tests/qemu-iotests/267 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 # A compat=0.10 image is created in this test which does not support anything
 # other than refcount_bits=16
 _unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+_require_drivers nbd
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/267
+++ b/tests/qemu-iotests/267
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+_require_drivers copy-on-read
 
 # Internal snapshots are (currently) impossible with refcount_bits=1
 _unsupported_imgopts 'refcount_bits=1[^0-9]'
-- 
2.20.1

From: Max Reitz <mreitz@redhat.com>

Doing this allows running this test with e.g. -o compat=0.10 or
-o compat=refcount_bits=1.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/273     |  3 ++-
 tests/qemu-iotests/273.out | 27 ---------------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/tests/qemu-iotests/273 b/tests/qemu-iotests/273
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/273
+++ b/tests/qemu-iotests/273
@@ -XXX,XX +XXX,XX @@ do_run_qemu()
 run_qemu()
 {
     do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp |
-        _filter_generated_node_ids | _filter_imgfmt | _filter_actual_image_size
+        _filter_generated_node_ids | _filter_imgfmt |
+        _filter_actual_image_size | _filter_img_info
 }
 
 TEST_IMG="$TEST_IMG.base" _make_test_img 64M
diff --git a/tests/qemu-iotests/273.out b/tests/qemu-iotests/273.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/273.out
+++ b/tests/qemu-iotests/273.out
@@ -XXX,XX +XXX,XX @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
                     "cluster-size": 65536,
                     "format": "IMGFMT",
                     "actual-size": SIZE,
-                    "format-specific": {
-                        "type": "IMGFMT",
-                        "data": {
-                            "compat": "1.1",
-                            "lazy-refcounts": false,
-                            "refcount-bits": 16,
-                            "corrupt": false
-                        }
-                    },
                     "full-backing-filename": "TEST_DIR/t.IMGFMT.base",
                     "backing-filename": "TEST_DIR/t.IMGFMT.base",
                     "dirty-flag": false
@@ -XXX,XX +XXX,XX @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
                 "cluster-size": 65536,
                 "format": "IMGFMT",
                 "actual-size": SIZE,
-                "format-specific": {
-                    "type": "IMGFMT",
-                    "data": {
-                        "compat": "1.1",
-                        "lazy-refcounts": false,
-                        "refcount-bits": 16,
-                        "corrupt": false
-                    }
-                },
                 "full-backing-filename": "TEST_DIR/t.IMGFMT.mid",
                 "backing-filename": "TEST_DIR/t.IMGFMT.mid",
                 "dirty-flag": false
@@ -XXX,XX +XXX,XX @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
                 "cluster-size": 65536,
                 "format": "IMGFMT",
                 "actual-size": SIZE,
-                "format-specific": {
-                    "type": "IMGFMT",
-                    "data": {
-                        "compat": "1.1",
-                        "lazy-refcounts": false,
-                        "refcount-bits": 16,
-                        "corrupt": false
-                    }
-                },
                 "full-backing-filename": "TEST_DIR/t.IMGFMT.base",
                 "backing-filename": "TEST_DIR/t.IMGFMT.base",
                 "dirty-flag": false
-- 
2.20.1

From: Max Reitz <mreitz@redhat.com>

There is no $SOCKDIR, only $SOCK_DIR.

Fixes: f3923a72f199b2c63747a7032db74730546f55c6
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/common.rc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ if [ "$IMGOPTSSYNTAX" = "true" ]; then
         TEST_IMG="$DRIVER,file.filename=$TEST_DIR/t.$IMGFMT"
     elif [ "$IMGPROTO" = "nbd" ]; then
         TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
-        TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix,file.path=$SOCKDIR/nbd"
+        TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix"
+        TEST_IMG="$TEST_IMG,file.path=$SOCK_DIR/nbd"
     elif [ "$IMGPROTO" = "ssh" ]; then
         TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
         TEST_IMG="$DRIVER,file.driver=ssh,file.host=127.0.0.1,file.path=$TEST_IMG_FILE"
-- 
2.20.1

From: Tuguoyi <tu.guoyi@h3c.com>

The local_err check outside of the if block was necessary
when it was introduced in commit d1258dd0c87 because it needed to be
executed even if qcow2_load_autoloading_dirty_bitmaps() returned false.

After some modifications that all required the error check to remain
where it is, commit 9c98f145dfb finally moved the
qcow2_load_dirty_bitmaps() call into the if block, so now the error
check should be there, too.

Signed-off-by: Guoyi Tu <tu.guoyi@h3c.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
     if (!(bdrv_get_flags(bs) & BDRV_O_INACTIVE)) {
         /* It's case 1, 2 or 3.2. Or 3.1 which is BUG in management layer. */
         bool header_updated = qcow2_load_dirty_bitmaps(bs, &local_err);
+        if (local_err != NULL) {
+            error_propagate(errp, local_err);
+            ret = -EINVAL;
+            goto fail;
+        }
 
         update_header = update_header && !header_updated;
     }
-    if (local_err != NULL) {
-        error_propagate(errp, local_err);
-        ret = -EINVAL;
-        goto fail;
-    }
 
     if (update_header) {
         ret = qcow2_update_header(bs);
-- 
2.20.1

We have several almost identical copies of a blockdev_create() function
in different test cases. Time to create one unified function in
iotests.py.

To keep the diff managable, this patch only creates the function and
follow-up patches will convert the individual test cases.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/iotests.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -XXX,XX +XXX,XX @@ class VM(qtest.QEMUQtestMachine):
             elif status == 'null':
                 return error
 
+    # Returns None on success, and an error string on failure
+    def blockdev_create(self, options, job_id='job0', filters=None):
+        if filters is None:
+            filters = [filter_qmp_testfiles]
+        result = self.qmp_log('blockdev-create', filters=filters,
+                              job_id=job_id, options=options)
+
+        if 'return' in result:
+            assert result['return'] == {}
+            job_result = self.run_job(job_id)
+        else:
+            job_result = result['error']
+
+        log("")
+        return job_result
+
     def enable_migration_events(self, name):
         log('Enabling migration QMP events on %s...' % name)
         log(self.qmp('migrate-set-capabilities', capabilities=[
-- 
2.20.1

Instead of having a separate blockdev_create() function, make use of the
VM.blockdev_create() offered by iotests.py.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/206 | 232 ++++++++++++++++++++---------------------
 1 file changed, 111 insertions(+), 121 deletions(-)

diff --git a/tests/qemu-iotests/206 b/tests/qemu-iotests/206
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/206
+++ b/tests/qemu-iotests/206
@@ -XXX,XX +XXX,XX @@ from iotests import imgfmt
 
 iotests.verify_image_format(supported_fmts=['qcow2'])
 
-def blockdev_create(vm, options):
-    result = vm.qmp_log('blockdev-create',
-                        filters=[iotests.filter_qmp_testfiles],
-                        job_id='job0', options=options)
-
-    if 'return' in result:
-        assert result['return'] == {}
-        vm.run_job('job0')
-    iotests.log("")
-
 with iotests.FilePath('t.qcow2') as disk_path, \
      iotests.FilePath('t.qcow2.base') as backing_path, \
      iotests.VM() as vm:
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
     size = 128 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0 })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0 })
 
     vm.qmp_log('blockdev-add',
                filters=[iotests.filter_qmp_testfiles],
                driver='file', filename=disk_path,
                node_name='imgfile')
 
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'imgfile',
-                          'size': size })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'imgfile',
+                         'size': size })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
     size = 64 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0,
-                          'preallocation': 'off',
-                          'nocow': False })
-
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': {
-                              'driver': 'file',
-                              'filename': disk_path,
-                          },
-                          'size': size,
-                          'version': 'v3',
-                          'cluster-size': 65536,
-                          'preallocation': 'off',
-                          'lazy-refcounts': False,
-                          'refcount-bits': 16 })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0,
+                         'preallocation': 'off',
+                         'nocow': False })
+
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': {
+                             'driver': 'file',
+                             'filename': disk_path,
+                         },
+                         'size': size,
+                         'version': 'v3',
+                         'cluster-size': 65536,
+                         'preallocation': 'off',
+                         'lazy-refcounts': False,
+                         'refcount-bits': 16 })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
     size = 32 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0,
-                          'preallocation': 'falloc',
-                          'nocow': True })
-
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': {
-                              'driver': 'file',
-                              'filename': disk_path,
-                          },
-                          'size': size,
-                          'version': 'v3',
-                          'cluster-size': 2097152,
-                          'preallocation': 'metadata',
-                          'lazy-refcounts': True,
-                          'refcount-bits': 1 })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0,
+                         'preallocation': 'falloc',
+                         'nocow': True })
+
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': {
+                             'driver': 'file',
+                             'filename': disk_path,
+                         },
+                         'size': size,
+                         'version': 'v3',
+                         'cluster-size': 2097152,
+                         'preallocation': 'metadata',
+                         'lazy-refcounts': True,
+                         'refcount-bits': 1 })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
     iotests.log("")
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0 })
-
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': {
-                              'driver': 'file',
-                              'filename': disk_path,
-                          },
-                          'size': size,
-                          'backing-file': backing_path,
-                          'backing-fmt': 'qcow2',
-                          'version': 'v2',
-                          'cluster-size': 512 })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0 })
+
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': {
+                             'driver': 'file',
+                             'filename': disk_path,
+                         },
+                         'size': size,
+                         'backing-file': backing_path,
+                         'backing-fmt': 'qcow2',
+                         'version': 'v2',
+                         'cluster-size': 512 })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
     iotests.log("")
 
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': {
-                              'driver': 'file',
-                              'filename': disk_path,
-                          },
-                          'size': size,
-                          'encrypt': {
-                              'format': 'luks',
-                              'key-secret': 'keysec0',
-                              'cipher-alg': 'twofish-128',
-                              'cipher-mode': 'ctr',
-                              'ivgen-alg': 'plain64',
-                              'ivgen-hash-alg': 'md5',
-                              'hash-alg': 'sha1',
-                              'iter-time': 10,
-                          }})
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': {
+                             'driver': 'file',
+                             'filename': disk_path,
+                         },
+                         'size': size,
+                         'encrypt': {
+                             'format': 'luks',
+                             'key-secret': 'keysec0',
+                             'cipher-alg': 'twofish-128',
+                             'cipher-mode': 'ctr',
+                             'ivgen-alg': 'plain64',
+                             'ivgen-hash-alg': 'md5',
+                             'hash-alg': 'sha1',
+                             'iter-time': 10,
+                         }})
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
     iotests.log("")
 
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': "this doesn't exist",
-                          'size': size })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': "this doesn't exist",
+                         'size': size })
     vm.shutdown()
 
     #
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
     vm.launch()
     for size in [ 1234, 18446744073709551104, 9223372036854775808,
                   9223372036854775296 ]:
-        blockdev_create(vm, { 'driver': imgfmt,
-                              'file': 'node0',
-                              'size': size })
+        vm.blockdev_create({ 'driver': imgfmt,
+                             'file': 'node0',
+                             'size': size })
     vm.shutdown()
 
     #
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
     iotests.log("=== Invalid version ===")
 
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': 67108864,
-                          'version': 'v1' })
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': 67108864,
-                          'version': 'v2',
-                          'lazy-refcounts': True })
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': 67108864,
-                          'version': 'v2',
-                          'refcount-bits': 8 })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': 67108864,
+                         'version': 'v1' })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': 67108864,
+                         'version': 'v2',
+                         'lazy-refcounts': True })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': 67108864,
+                         'version': 'v2',
+                         'refcount-bits': 8 })
     vm.shutdown()
 
     #
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
     iotests.log("=== Invalid backing file options ===")
 
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': 67108864,
-                          'backing-file': '/dev/null',
-                          'preallocation': 'full' })
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': 67108864,
-                          'backing-fmt': imgfmt })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': 67108864,
+                         'backing-file': '/dev/null',
+                         'preallocation': 'full' })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': 67108864,
+                         'backing-fmt': imgfmt })
     vm.shutdown()
 
     #
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
 
     vm.launch()
     for csize in [ 1234, 128, 4194304, 0 ]:
-        blockdev_create(vm, { 'driver': imgfmt,
-                              'file': 'node0',
-                              'size': 67108864,
-                              'cluster-size': csize })
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': 281474976710656,
-                          'cluster-size': 512 })
+        vm.blockdev_create({ 'driver': imgfmt,
+                             'file': 'node0',
+                             'size': 67108864,
+                             'cluster-size': csize })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': 281474976710656,
+                         'cluster-size': 512 })
     vm.shutdown()
 
     #
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.qcow2') as disk_path, \
 
     vm.launch()
     for refcount_bits in [ 128, 0, 7 ]:
-        blockdev_create(vm, { 'driver': imgfmt,
-                              'file': 'node0',
-                              'size': 67108864,
-                              'refcount-bits': refcount_bits })
+        vm.blockdev_create({ 'driver': imgfmt,
+                             'file': 'node0',
+                             'size': 67108864,
+                             'refcount-bits': refcount_bits })
     vm.shutdown()
-- 
2.20.1

Instead of having a separate blockdev_create() function, make use of the
VM.blockdev_create() offered by iotests.py.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/210 | 81 +++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 45 deletions(-)

diff --git a/tests/qemu-iotests/210 b/tests/qemu-iotests/210
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/210
+++ b/tests/qemu-iotests/210
@@ -XXX,XX +XXX,XX @@ from iotests import imgfmt
 iotests.verify_image_format(supported_fmts=['luks'])
 iotests.verify_protocol(supported=['file'])
 
-def blockdev_create(vm, options):
-    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
-                        filters=[iotests.filter_qmp_testfiles])
-
-    if 'return' in result:
-        assert result['return'] == {}
-        vm.run_job('job0')
-    iotests.log("")
-
 with iotests.FilePath('t.luks') as disk_path, \
      iotests.VM() as vm:
 
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \
     size = 128 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0 })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0 })
 
     vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
                node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
 
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'imgfile',
-                          'key-secret': 'keysec0',
-                          'size': size,
-                          'iter-time': 10 })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'imgfile',
+                         'key-secret': 'keysec0',
+                         'size': size,
+                         'iter-time': 10 })
     vm.shutdown()
 
     # TODO Proper support for images to be used with imgopts and/or protocols
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \
     size = 64 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0 })
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': {
-                              'driver': 'file',
-                              'filename': disk_path,
-                          },
-                          'size': size,
-                          'key-secret': 'keysec0',
-                          'cipher-alg': 'twofish-128',
-                          'cipher-mode': 'ctr',
-                          'ivgen-alg': 'plain64',
-                          'ivgen-hash-alg': 'md5',
-                          'hash-alg': 'sha1',
-                          'iter-time': 10 })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0 })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': {
+                             'driver': 'file',
+                             'filename': disk_path,
+                         },
+                         'size': size,
+                         'key-secret': 'keysec0',
+                         'cipher-alg': 'twofish-128',
+                         'cipher-mode': 'ctr',
+                         'ivgen-alg': 'plain64',
+                         'ivgen-hash-alg': 'md5',
+                         'hash-alg': 'sha1',
+                         'iter-time': 10 })
     vm.shutdown()
 
     # TODO Proper support for images to be used with imgopts and/or protocols
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \
     size = 64 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': "this doesn't exist",
-                          'size': size })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': "this doesn't exist",
+                         'size': size })
     vm.shutdown()
 
     #
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \
 
     vm.add_blockdev('driver=file,filename=%s,node-name=node0' % (disk_path))
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'key-secret': 'keysec0',
-                          'size': 0,
-                          'iter-time': 10 })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'key-secret': 'keysec0',
+                         'size': 0,
+                         'iter-time': 10 })
     vm.shutdown()
 
     # TODO Proper support for images to be used with imgopts and/or protocols
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \
 
     vm.launch()
     for size in [ 18446744073709551104, 9223372036854775808, 9223372036854775296 ]:
-        blockdev_create(vm, { 'driver': imgfmt,
-                              'file': 'node0',
-                              'key-secret': 'keysec0',
-                              'size': size })
+        vm.blockdev_create({ 'driver': imgfmt,
+                             'file': 'node0',
+                             'key-secret': 'keysec0',
+                             'size': size })
     vm.shutdown()
 
     #
-- 
2.20.1

Instead of having a separate blockdev_create() function, make use of the
VM.blockdev_create() offered by iotests.py.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/212 | 101 +++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 55 deletions(-)

diff --git a/tests/qemu-iotests/212 b/tests/qemu-iotests/212
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/212
+++ b/tests/qemu-iotests/212
@@ -XXX,XX +XXX,XX @@ from iotests import imgfmt
 iotests.verify_image_format(supported_fmts=['parallels'])
 iotests.verify_protocol(supported=['file'])
 
-def blockdev_create(vm, options):
-    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
-                        filters=[iotests.filter_qmp_testfiles])
-
-    if 'return' in result:
-        assert result['return'] == {}
-        vm.run_job('job0')
-    iotests.log("")
-
 with iotests.FilePath('t.parallels') as disk_path, \
      iotests.VM() as vm:
 
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
     size = 128 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0 })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0 })
 
     vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
                node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
 
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'imgfile',
-                          'size': size })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'imgfile',
+                         'size': size })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
     size = 64 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0 })
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': {
-                              'driver': 'file',
-                              'filename': disk_path,
-                          },
-                          'size': size,
-                          'cluster-size': 1048576 })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0 })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': {
+                             'driver': 'file',
+                             'filename': disk_path,
+                         },
+                         'size': size,
+                         'cluster-size': 1048576 })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
     size = 32 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0 })
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': {
-                              'driver': 'file',
-                              'filename': disk_path,
-                          },
-                          'size': size,
-                          'cluster-size': 65536 })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0 })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': {
+                             'driver': 'file',
+                             'filename': disk_path,
+                         },
+                         'size': size,
+                         'cluster-size': 65536 })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
     iotests.log("")
 
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': "this doesn't exist",
-                          'size': size })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': "this doesn't exist",
+                         'size': size })
     vm.shutdown()
 
     #
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
 
     vm.add_blockdev('driver=file,filename=%s,node-name=node0' % (disk_path))
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': 0 })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': 0 })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
     iotests.log("")
 
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': 4503599627369984})
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': 4503599627369984})
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
     vm.launch()
     for size in [ 1234, 18446744073709551104, 9223372036854775808,
                   9223372036854775296, 4503599627370497 ]:
-        blockdev_create(vm, { 'driver': imgfmt,
-                              'file': 'node0',
-                              'size': size })
+        vm.blockdev_create({ 'driver': imgfmt,
+                             'file': 'node0',
+                             'size': size })
     vm.shutdown()
 
     #
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.parallels') as disk_path, \
     vm.launch()
     for csize in [ 1234, 128, 4294967296, 9223372036854775808,
                    18446744073709551104, 0 ]:
-        blockdev_create(vm, { 'driver': imgfmt,
-                              'file': 'node0',
-                              'size': 67108864,
-                              'cluster-size': csize })
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': 281474976710656,
-                          'cluster-size': 512 })
+        vm.blockdev_create({ 'driver': imgfmt,
+                             'file': 'node0',
+                             'size': 67108864,
+                             'cluster-size': csize })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': 281474976710656,
+                         'cluster-size': 512 })
     vm.shutdown()
-- 
2.20.1

Instead of having a separate blockdev_create() function, make use of the
VM.blockdev_create() offered by iotests.py.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/213 | 113 +++++++++++++++++++----------------------
 1 file changed, 52 insertions(+), 61 deletions(-)

diff --git a/tests/qemu-iotests/213 b/tests/qemu-iotests/213
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/213
+++ b/tests/qemu-iotests/213
@@ -XXX,XX +XXX,XX @@ from iotests import imgfmt
 iotests.verify_image_format(supported_fmts=['vhdx'])
 iotests.verify_protocol(supported=['file'])
 
-def blockdev_create(vm, options):
-    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
-                        filters=[iotests.filter_qmp_testfiles])
-
-    if 'return' in result:
-        assert result['return'] == {}
-        vm.run_job('job0')
-    iotests.log("")
-
 with iotests.FilePath('t.vhdx') as disk_path, \
      iotests.VM() as vm:
 
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
     size = 128 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0 })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0 })
 
     vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
                node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
 
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'imgfile',
-                          'size': size })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'imgfile',
+                         'size': size })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
     size = 64 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0 })
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': {
-                              'driver': 'file',
-                              'filename': disk_path,
-                          },
-                          'size': size,
-                          'log-size': 1048576,
-                          'block-size': 8388608,
-                          'subformat': 'dynamic',
-                          'block-state-zero': True })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0 })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': {
+                             'driver': 'file',
+                             'filename': disk_path,
+                         },
+                         'size': size,
+                         'log-size': 1048576,
+                         'block-size': 8388608,
+                         'subformat': 'dynamic',
+                         'block-state-zero': True })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
     size = 32 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0 })
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': {
-                              'driver': 'file',
-                              'filename': disk_path,
-                          },
-                          'size': size,
-                          'log-size': 8388608,
-                          'block-size': 268435456,
-                          'subformat': 'fixed',
-                          'block-state-zero': False })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0 })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': {
+                             'driver': 'file',
+                             'filename': disk_path,
+                         },
+                         'size': size,
+                         'log-size': 8388608,
+                         'block-size': 268435456,
+                         'subformat': 'fixed',
+                         'block-state-zero': False })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
     iotests.log("")
 
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': "this doesn't exist",
-                          'size': size })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': "this doesn't exist",
+                         'size': size })
     vm.shutdown()
 
     #
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
 
     vm.add_blockdev('driver=file,filename=%s,node-name=node0' % (disk_path))
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': 0 })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': 0 })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
     iotests.log("")
 
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': 70368744177664 })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': 70368744177664 })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
     vm.launch()
     for size in [ 18446744073709551104, 9223372036854775808,
                   9223372036854775296, 70368744177665 ]:
-        blockdev_create(vm, { 'driver': imgfmt,
-                              'file': 'node0',
-                              'size': size })
+        vm.blockdev_create({ 'driver': imgfmt,
+                             'file': 'node0',
+                             'size': size })
     vm.shutdown()
 
     #
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
 
     vm.launch()
     for bsize in [ 1234567, 128, 3145728, 536870912, 0 ]:
-        blockdev_create(vm, { 'driver': imgfmt,
-                              'file': 'node0',
-                              'size': 67108864,
-                              'block-size': bsize })
+        vm.blockdev_create({ 'driver': imgfmt,
+                             'file': 'node0',
+                             'size': 67108864,
+                             'block-size': bsize })
     vm.shutdown()
 
     #
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vhdx') as disk_path, \
 
     vm.launch()
     for lsize in [ 1234567, 128, 4294967296, 0 ]:
-        blockdev_create(vm, { 'driver': imgfmt,
-                              'file': 'node0',
-                              'size': 67108864,
-                              'log-size': lsize })
+        vm.blockdev_create({ 'driver': imgfmt,
+                             'file': 'node0',
+                             'size': 67108864,
+                             'log-size': lsize })
     vm.shutdown()
-- 
2.20.1

Instead of having a separate blockdev_create() function, make use of the
VM.blockdev_create() offered by iotests.py.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/237 | 139 +++++++++++++++++++----------------------
 1 file changed, 65 insertions(+), 74 deletions(-)

diff --git a/tests/qemu-iotests/237 b/tests/qemu-iotests/237
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/237
+++ b/tests/qemu-iotests/237
@@ -XXX,XX +XXX,XX @@ from iotests import imgfmt
 
 iotests.verify_image_format(supported_fmts=['vmdk'])
 
-def blockdev_create(vm, options):
-    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
-                        filters=[iotests.filter_qmp_testfiles])
-
-    if 'return' in result:
-        assert result['return'] == {}
-        vm.run_job('job0')
-    iotests.log("")
-
 with iotests.FilePath('t.vmdk') as disk_path, \
      iotests.FilePath('t.vmdk.1') as extent1_path, \
      iotests.FilePath('t.vmdk.2') as extent2_path, \
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
     size = 5 * 1024 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0 })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0 })
 
     vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
                node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
 
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'imgfile',
-                          'size': size })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'imgfile',
+                         'size': size })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
     size = 64 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0 })
-
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': {
-                              'driver': 'file',
-                              'filename': disk_path,
-                          },
-                          'size': size,
-                          'extents': [],
-                          'subformat': 'monolithicSparse',
-                          'adapter-type': 'ide',
-                          'hwversion': '4',
-                          'zeroed-grain': False })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0 })
+
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': {
+                             'driver': 'file',
+                             'filename': disk_path,
+                         },
+                         'size': size,
+                         'extents': [],
+                         'subformat': 'monolithicSparse',
+                         'adapter-type': 'ide',
+                         'hwversion': '4',
+                         'zeroed-grain': False })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
     size = 32 * 1024 * 1024
 
     vm.launch()
-    blockdev_create(vm, { 'driver': 'file',
-                          'filename': disk_path,
-                          'size': 0 })
-
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': {
-                              'driver': 'file',
-                              'filename': disk_path,
-                          },
-                          'size': size,
-                          'extents': [],
-                          'subformat': 'monolithicSparse',
-                          'adapter-type': 'buslogic',
-                          'zeroed-grain': True })
+    vm.blockdev_create({ 'driver': 'file',
+                         'filename': disk_path,
+                         'size': 0 })
+
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': {
+                             'driver': 'file',
+                             'filename': disk_path,
+                         },
+                         'size': size,
+                         'extents': [],
+                         'subformat': 'monolithicSparse',
+                         'adapter-type': 'buslogic',
+                         'zeroed-grain': True })
     vm.shutdown()
 
     iotests.img_info_log(disk_path)
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
     iotests.log("")
 
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': "this doesn't exist",
-                          'size': size })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': "this doesn't exist",
+                         'size': size })
     vm.shutdown()
 
     #
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
 
     vm.launch()
     for adapter_type in [ 'ide', 'buslogic', 'lsilogic', 'legacyESX' ]:
-        blockdev_create(vm, { 'driver': imgfmt,
-                              'file': 'node0',
-                              'size': size,
-                              'adapter-type': adapter_type })
+        vm.blockdev_create({ 'driver': imgfmt,
+                             'file': 'node0',
+                             'size': size,
+                             'adapter-type': adapter_type })
     vm.shutdown()
 
     # Invalid
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
 
     vm.launch()
     for adapter_type in [ 'foo', 'IDE', 'legacyesx', 1 ]:
-        blockdev_create(vm, { 'driver': imgfmt,
-                              'file': 'node0',
-                              'size': size,
-                              'adapter-type': adapter_type })
+        vm.blockdev_create({ 'driver': imgfmt,
+                             'file': 'node0',
+                             'size': size,
+                             'adapter-type': adapter_type })
     vm.shutdown()
 
     #
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
     iotests.log("")
 
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': size,
-                          'subformat': 'monolithicFlat' })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': size,
+                         'subformat': 'monolithicFlat' })
     vm.shutdown()
 
     # Correct extent
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
     iotests.log("")
 
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': size,
-                          'subformat': 'monolithicFlat',
-                          'extents': ['ext1'] })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': size,
+                         'subformat': 'monolithicFlat',
+                         'extents': ['ext1'] })
     vm.shutdown()
 
     # Extra extent
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
     iotests.log("")
 
     vm.launch()
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'node0',
-                          'size': 512,
-                          'subformat': 'monolithicFlat',
-                          'extents': ['ext1', 'ext2', 'ext3'] })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'node0',
+                         'size': 512,
+                         'subformat': 'monolithicFlat',
+                         'extents': ['ext1', 'ext2', 'ext3'] })
     vm.shutdown()
 
     # Split formats
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.vmdk') as disk_path, \
             extents = [ "ext%d" % (i) for i in range(1, num_extents + 1) ]
 
             vm.launch()
-            blockdev_create(vm, { 'driver': imgfmt,
-                                  'file': 'node0',
-                                  'size': size,
-                                  'subformat': subfmt,
-                                  'extents': extents })
+            vm.blockdev_create({ 'driver': imgfmt,
+                                 'file': 'node0',
+                                 'size': size,
+                                 'subformat': subfmt,
+                                 'extents': extents })
             vm.shutdown()
 
             iotests.img_info_log(disk_path)
-- 
2.20.1

Instead of having a separate blockdev_create() function, make use of the
VM.blockdev_create() offered by iotests.py.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/266     | 69 +++++++++++++++++---------------------
 tests/qemu-iotests/266.out | 14 ++++++++
 2 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/tests/qemu-iotests/266 b/tests/qemu-iotests/266
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/266
+++ b/tests/qemu-iotests/266
@@ -XXX,XX +XXX,XX @@ import iotests
 from iotests import imgfmt
 
 
-def blockdev_create(vm, options):
-    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
-                        filters=[iotests.filter_qmp_testfiles])
-
-    if 'return' in result:
-        assert result['return'] == {}
-        vm.run_job('job0')
-
-
 # Successful image creation (defaults)
 def implicit_defaults(vm, file_path):
     iotests.log("=== Successful image creation (defaults) ===")
@@ -XXX,XX +XXX,XX @@ def implicit_defaults(vm, file_path):
     # (Close to 64 MB)
     size = 8 * 964 * 17 * 512
 
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'protocol-node',
-                          'size': size })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'protocol-node',
+                         'size': size })
 
 
 # Successful image creation (explicit defaults)
@@ -XXX,XX +XXX,XX @@ def explicit_defaults(vm, file_path):
     # (Close to 128 MB)
     size = 16 * 964 * 17 * 512
 
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'protocol-node',
-                          'size': size,
-                          'subformat': 'dynamic',
-                          'force-size': False })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'protocol-node',
+                         'size': size,
+                         'subformat': 'dynamic',
+                         'force-size': False })
 
 
 # Successful image creation (non-default options)
@@ -XXX,XX +XXX,XX @@ def non_defaults(vm, file_path):
     # Not representable in CHS (fine with force-size=True)
     size = 1048576
 
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'protocol-node',
-                          'size': size,
-                          'subformat': 'fixed',
-                          'force-size': True })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'protocol-node',
+                         'size': size,
+                         'subformat': 'fixed',
+                         'force-size': True })
 
 
 # Size not representable in CHS with force-size=False
@@ -XXX,XX +XXX,XX @@ def non_chs_size_without_force(vm, file_path):
     # Not representable in CHS (will not work with force-size=False)
     size = 1048576
 
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'protocol-node',
-                          'size': size,
-                          'force-size': False })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'protocol-node',
+                         'size': size,
+                         'force-size': False })
 
 
 # Zero size
@@ -XXX,XX +XXX,XX @@ def zero_size(vm, file_path):
     iotests.log("=== Zero size===")
     iotests.log("")
 
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'protocol-node',
-                          'size': 0 })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'protocol-node',
+                         'size': 0 })
 
 
 # Maximum CHS size
@@ -XXX,XX +XXX,XX @@ def maximum_chs_size(vm, file_path):
     iotests.log("=== Maximum CHS size===")
     iotests.log("")
 
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'protocol-node',
-                          'size': 16 * 65535 * 255 * 512 })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'protocol-node',
+                         'size': 16 * 65535 * 255 * 512 })
 
 
 # Actual maximum size
@@ -XXX,XX +XXX,XX @@ def maximum_size(vm, file_path):
     iotests.log("=== Actual maximum size===")
     iotests.log("")
 
-    blockdev_create(vm, { 'driver': imgfmt,
-                          'file': 'protocol-node',
-                          'size': 0xff000000 * 512,
-                          'force-size': True })
+    vm.blockdev_create({ 'driver': imgfmt,
+                         'file': 'protocol-node',
+                         'size': 0xff000000 * 512,
+                         'force-size': True })
 
 
 def main():
@@ -XXX,XX +XXX,XX @@ def main():
             vm.launch()
 
             iotests.log('--- Creating empty file ---')
-            blockdev_create(vm, { 'driver': 'file',
-                                  'filename': file_path,
-                                  'size': 0 })
+            vm.blockdev_create({ 'driver': 'file',
+                                 'filename': file_path,
+                                 'size': 0 })
 
             vm.qmp_log('blockdev-add', driver='file', filename=file_path,
                        node_name='protocol-node',
diff --git a/tests/qemu-iotests/266.out b/tests/qemu-iotests/266.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/266.out
+++ b/tests/qemu-iotests/266.out
@@ -XXX,XX +XXX,XX @@
 {"return": {}}
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
+
 {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
 {"return": {}}
 
@@ -XXX,XX +XXX,XX @@
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
 
+
 image: TEST_IMG
 file format: IMGFMT
 virtual size: 64 MiB (67125248 bytes)
@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
 {"return": {}}
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
+
 {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
 {"return": {}}
 
@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
 
+
 image: TEST_IMG
 file format: IMGFMT
 virtual size: 128 MiB (134250496 bytes)
@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
 {"return": {}}
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
+
 {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
 {"return": {}}
 
@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
 
+
 image: TEST_IMG
 file format: IMGFMT
 virtual size: 1 MiB (1048576 bytes)
@@ -XXX,XX +XXX,XX @@ virtual size: 1 MiB (1048576 bytes)
 {"return": {}}
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
+
 {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
 {"return": {}}
 
@@ -XXX,XX +XXX,XX @@ Job failed: The requested image size cannot be represented in CHS geometry
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
 
+
 qemu-img: Could not open 'TEST_IMG': File too small for a VHD header
 
 --- Creating empty file ---
@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_IMG': File too small for a VHD header
 {"return": {}}
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
+
 {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
 {"return": {}}
 
@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_IMG': File too small for a VHD header
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
 
+
 image: TEST_IMG
 file format: IMGFMT
 virtual size: 0 B (0 bytes)
@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
 {"return": {}}
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
+
 {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
 {"return": {}}
 
@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
 
+
 image: TEST_IMG
 file format: IMGFMT
 virtual size: 127 GiB (136899993600 bytes)
@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
 {"return": {}}
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
+
 {"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "node-name": "protocol-node"}}
 {"return": {}}
 
@@ -XXX,XX +XXX,XX @@ cluster_size: 2097152
 {"execute": "job-dismiss", "arguments": {"id": "job0"}}
 {"return": {}}
 
+
 image: TEST_IMG
 file format: IMGFMT
 virtual size: 1.99 TiB (2190433320960 bytes)
-- 
2.20.1

The blockdev_create() function in this test case adds another filter to
the logging, but provides otherwise the same functionality as
VM.blockdev_create() from iotests.py. Make it a thin wrapper around the
iotests.py function.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/207 | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/qemu-iotests/207 b/tests/qemu-iotests/207
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/207
+++ b/tests/qemu-iotests/207
@@ -XXX,XX +XXX,XX @@ def filter_hash(qmsg):
     return iotests.filter_qmp(qmsg, _filter)
 
 def blockdev_create(vm, options):
-    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
-                        filters=[iotests.filter_qmp_testfiles, filter_hash])
-
-    if 'return' in result:
-        assert result['return'] == {}
-        vm.run_job('job0')
-    iotests.log("")
+    vm.blockdev_create(options, filters=[iotests.filter_qmp_testfiles, filter_hash])
 
 with iotests.FilePath('t.img') as disk_path, \
      iotests.VM() as vm:
-- 
2.20.1

The blockdev_create() function in this test case adds an error check
that skips the test in case of failure because of memory shortage, but
provides otherwise the same functionality as VM.blockdev_create() from
iotests.py. Make it a thin wrapper around the iotests.py function.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/211 | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/tests/qemu-iotests/211 b/tests/qemu-iotests/211
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/211
+++ b/tests/qemu-iotests/211
@@ -XXX,XX +XXX,XX @@ iotests.verify_image_format(supported_fmts=['vdi'])
 iotests.verify_protocol(supported=['file'])
 
 def blockdev_create(vm, options):
-    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
-                        filters=[iotests.filter_qmp_testfiles])
-
-    if 'return' in result:
-        assert result['return'] == {}
-        error = vm.run_job('job0')
-        if error and 'Could not allocate bmap' in error:
-            iotests.notrun('Insufficient memory')
-    iotests.log("")
+    error = vm.blockdev_create(options)
+    if error and 'Could not allocate bmap' in error:
+        iotests.notrun('Insufficient memory')
 
 with iotests.FilePath('t.vdi') as disk_path, \
      iotests.VM() as vm:
-- 
2.20.1

bdrv_invalidate_cache_all() assumes that all nodes in a given subtree
are either active or inactive when it starts. Therefore, as soon as it
arrives at an already active node, it stops.

However, this assumption is wrong. For example, it's possible to take a
snapshot of an inactive node, which results in an active overlay over an
inactive backing file. The active overlay is probably also the root node
of an inactive BlockBackend (blk->disable_perm == true).

In this case, bdrv_invalidate_cache_all() does not need to do anything
to activate the overlay node, but it still needs to recurse into the
children and the parents to make sure that after returning success,
really everything is activated.

Cc: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 block.c | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs,
         return;
     }
 
-    if (!(bs->open_flags & BDRV_O_INACTIVE)) {
-        return;
-    }
-
     QLIST_FOREACH(child, &bs->children, next) {
         bdrv_co_invalidate_cache(child->bs, &local_err);
         if (local_err) {
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs,
      * just keep the extended permissions for the next time that an activation
      * of the image is tried.
      */
-    bs->open_flags &= ~BDRV_O_INACTIVE;
-    bdrv_get_cumulative_perm(bs, &perm, &shared_perm);
-    ret = bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, NULL, &local_err);
-    if (ret < 0) {
-        bs->open_flags |= BDRV_O_INACTIVE;
-        error_propagate(errp, local_err);
-        return;
-    }
-    bdrv_set_perm(bs, perm, shared_perm);
-
-    if (bs->drv->bdrv_co_invalidate_cache) {
-        bs->drv->bdrv_co_invalidate_cache(bs, &local_err);
-        if (local_err) {
+    if (bs->open_flags & BDRV_O_INACTIVE) {
+        bs->open_flags &= ~BDRV_O_INACTIVE;
+        bdrv_get_cumulative_perm(bs, &perm, &shared_perm);
+        ret = bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, NULL, &local_err);
+        if (ret < 0) {
             bs->open_flags |= BDRV_O_INACTIVE;
             error_propagate(errp, local_err);
             return;
         }
-    }
+        bdrv_set_perm(bs, perm, shared_perm);
 
-    FOR_EACH_DIRTY_BITMAP(bs, bm) {
-        bdrv_dirty_bitmap_skip_store(bm, false);
-    }
+        if (bs->drv->bdrv_co_invalidate_cache) {
+            bs->drv->bdrv_co_invalidate_cache(bs, &local_err);
+            if (local_err) {
+                bs->open_flags |= BDRV_O_INACTIVE;
+                error_propagate(errp, local_err);
+                return;
+            }
+        }
 
-    ret = refresh_total_sectors(bs, bs->total_sectors);
-    if (ret < 0) {
-        bs->open_flags |= BDRV_O_INACTIVE;
-        error_setg_errno(errp, -ret, "Could not refresh total sector count");
-        return;
+        FOR_EACH_DIRTY_BITMAP(bs, bm) {
+            bdrv_dirty_bitmap_skip_store(bm, false);
+        }
+
+        ret = refresh_total_sectors(bs, bs->total_sectors);
+        if (ret < 0) {
+            bs->open_flags |= BDRV_O_INACTIVE;
+            error_setg_errno(errp, -ret, "Could not refresh total sector count");
+            return;
+        }
     }
 
     QLIST_FOREACH(parent, &bs->parents, next_parent) {
-- 
2.20.1

In order to issue requests on an existing BlockBackend with the
'qemu-io' HMP command, allow specifying the BlockBackend not only with a
BlockBackend name, but also with a qdev ID/QOM path for a device that
owns the (possibly anonymous) BlockBackend.

Because qdev names could be conflicting with BlockBackend and node
names, introduce a -d option to explicitly address a device. If the
option is not given, a BlockBackend or a node is addressed.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 monitor/hmp-cmds.c | 28 ++++++++++++++++++----------
 hmp-commands.hx    |  8 +++++---
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index XXXXXXX..XXXXXXX 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -XXX,XX +XXX,XX @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict)
 {
     BlockBackend *blk;
     BlockBackend *local_blk = NULL;
+    bool qdev = qdict_get_try_bool(qdict, "qdev", false);
     const char* device = qdict_get_str(qdict, "device");
     const char* command = qdict_get_str(qdict, "command");
     Error *err = NULL;
     int ret;
 
-    blk = blk_by_name(device);
-    if (!blk) {
-        BlockDriverState *bs = bdrv_lookup_bs(NULL, device, &err);
-        if (bs) {
-            blk = local_blk = blk_new(bdrv_get_aio_context(bs),
-                                      0, BLK_PERM_ALL);
-            ret = blk_insert_bs(blk, bs, &err);
-            if (ret < 0) {
+    if (qdev) {
+        blk = blk_by_qdev_id(device, &err);
+        if (!blk) {
+            goto fail;
+        }
+    } else {
+        blk = blk_by_name(device);
+        if (!blk) {
+            BlockDriverState *bs = bdrv_lookup_bs(NULL, device, &err);
+            if (bs) {
+                blk = local_blk = blk_new(bdrv_get_aio_context(bs),
+                                          0, BLK_PERM_ALL);
+                ret = blk_insert_bs(blk, bs, &err);
+                if (ret < 0) {
+                    goto fail;
+                }
+            } else {
                 goto fail;
             }
-        } else {
-            goto fail;
         }
     }
 
diff --git a/hmp-commands.hx b/hmp-commands.hx
index XXXXXXX..XXXXXXX 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -XXX,XX +XXX,XX @@ ETEXI
 
     {
         .name       = "qemu-io",
-        .args_type  = "device:B,command:s",
-        .params     = "[device] \"[command]\"",
-        .help       = "run a qemu-io command on a block device",
+        .args_type  = "qdev:-d,device:B,command:s",
+        .params     = "[-d] [device] \"[command]\"",
+        .help       = "run a qemu-io command on a block device\n\t\t\t"
+                      "-d: [device] is a device ID rather than a "
+                      "drive ID or node name",
         .cmd        = hmp_qemu_io,
     },
 
-- 
2.20.1

This tests creating an external snapshot with VM state (which results in
an active overlay over an inactive backing file, which is also the root
node of an inactive BlockBackend), re-activating the images and
performing some operations to test that the re-activation worked as
intended.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/280     | 83 ++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/280.out | 50 +++++++++++++++++++++++
 tests/qemu-iotests/group   |  1 +
 3 files changed, 134 insertions(+)
 create mode 100755 tests/qemu-iotests/280
 create mode 100644 tests/qemu-iotests/280.out

diff --git a/tests/qemu-iotests/280 b/tests/qemu-iotests/280
new file mode 100755
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/280
@@ -XXX,XX +XXX,XX @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2019 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Creator/Owner: Kevin Wolf <kwolf@redhat.com>
+#
+# Test migration to file for taking an external snapshot with VM state.
+
+import iotests
+import os
+
+iotests.verify_image_format(supported_fmts=['qcow2'])
+iotests.verify_protocol(supported=['file'])
+iotests.verify_platform(['linux'])
+
+with iotests.FilePath('base') as base_path , \
+     iotests.FilePath('top') as top_path, \
+     iotests.VM() as vm:
+
+    iotests.qemu_img_log('create', '-f', iotests.imgfmt, base_path, '64M')
+
+    iotests.log('=== Launch VM ===')
+    vm.add_object('iothread,id=iothread0')
+    vm.add_blockdev('file,filename=%s,node-name=base-file' % (base_path))
+    vm.add_blockdev('%s,file=base-file,node-name=base-fmt' % (iotests.imgfmt))
+    vm.add_device('virtio-blk,drive=base-fmt,iothread=iothread0,id=vda')
+    vm.launch()
+
+    vm.enable_migration_events('VM')
+
+    iotests.log('\n=== Migrate to file ===')
+    vm.qmp_log('migrate', uri='exec:cat > /dev/null')
+
+    with iotests.Timeout(3, 'Migration does not complete'):
+        vm.wait_migration()
+
+    iotests.log('\nVM is now stopped:')
+    iotests.log(vm.qmp('query-migrate')['return']['status'])
+    vm.qmp_log('query-status')
+
+    iotests.log('\n=== Create a snapshot of the disk image ===')
+    vm.blockdev_create({
+        'driver': 'file',
+        'filename': top_path,
+        'size': 0,
+    })
+    vm.qmp_log('blockdev-add', node_name='top-file',
+               driver='file', filename=top_path,
+               filters=[iotests.filter_qmp_testfiles])
+
+    vm.blockdev_create({
+        'driver': iotests.imgfmt,
+        'file': 'top-file',
+        'size': 1024 * 1024,
+    })
+    vm.qmp_log('blockdev-add', node_name='top-fmt',
+               driver=iotests.imgfmt, file='top-file')
+
+    vm.qmp_log('blockdev-snapshot', node='base-fmt', overlay='top-fmt')
+
+    iotests.log('\n=== Resume the VM and simulate a write request ===')
+    vm.qmp_log('cont')
+    iotests.log(vm.hmp_qemu_io('-d vda/virtio-backend', 'write 4k 4k'))
+
+    iotests.log('\n=== Commit it to the backing file ===')
+    result = vm.qmp_log('block-commit', job_id='job0', auto_dismiss=False,
+                        device='top-fmt', top_node='top-fmt',
+                        filters=[iotests.filter_qmp_testfiles])
+    if 'return' in result:
+        vm.run_job('job0')
diff --git a/tests/qemu-iotests/280.out b/tests/qemu-iotests/280.out
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/280.out
@@ -XXX,XX +XXX,XX @@
+Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=67108864 cluster_size=65536 lazy_refcounts=off refcount_bits=16
+
+=== Launch VM ===
+Enabling migration QMP events on VM...
+{"return": {}}
+
+=== Migrate to file ===
+{"execute": "migrate", "arguments": {"uri": "exec:cat > /dev/null"}}
+{"return": {}}
+{"data": {"status": "setup"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"status": "active"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+
+VM is now stopped:
+completed
+{"execute": "query-status", "arguments": {}}
+{"return": {"running": false, "singlestep": false, "status": "postmigrate"}}
+
+=== Create a snapshot of the disk image ===
+{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "file", "filename": "TEST_DIR/PID-top", "size": 0}}}
+{"return": {}}
+{"execute": "job-dismiss", "arguments": {"id": "job0"}}
+{"return": {}}
+
+{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "TEST_DIR/PID-top", "node-name": "top-file"}}
+{"return": {}}
+{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "qcow2", "file": "top-file", "size": 1048576}}}
+{"return": {}}
+{"execute": "job-dismiss", "arguments": {"id": "job0"}}
+{"return": {}}
+
+{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": "top-file", "node-name": "top-fmt"}}
+{"return": {}}
+{"execute": "blockdev-snapshot", "arguments": {"node": "base-fmt", "overlay": "top-fmt"}}
+{"return": {}}
+
+=== Resume the VM and simulate a write request ===
+{"execute": "cont", "arguments": {}}
+{"return": {}}
+{"return": ""}
+
+=== Commit it to the backing file ===
+{"execute": "block-commit", "arguments": {"auto-dismiss": false, "device": "top-fmt", "job-id": "job0", "top-node": "top-fmt"}}
+{"return": {}}
+{"execute": "job-complete", "arguments": {"id": "job0"}}
+{"return": {}}
+{"data": {"device": "job0", "len": 65536, "offset": 65536, "speed": 0, "type": "commit"}, "event": "BLOCK_JOB_READY", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "job0", "len": 65536, "offset": 65536, "speed": 0, "type": "commit"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"execute": "job-dismiss", "arguments": {"id": "job0"}}
+{"return": {}}
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -XXX,XX +XXX,XX @@
 273 backing quick
 277 rw quick
 279 rw backing quick
+280 rw migration quick
-- 
2.20.1

The following changes since commit 60205b71421cbc529ca60b12c79e0eeace007319:

Merge tag 'pull-aspeed-20220801' of https://github.com/legoater/qemu into staging (2022-08-01 13:55:11 -0700)

are available in the Git repository at:

git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to 21b1d974595b3986c68fe80a1f7e9b87886d4bae:

main loop: add missing documentation links to GS/IO macros (2022-08-02 12:02:17 +0200)

----------------------------------------------------------------
Block layer patches

- libvduse: Coverity fixes
- hd-geometry: Fix ignored bios-chs-trans setting
- io_uring: Fix compiler warning (missing #include)
- main loop: add missing documentation links to GS/IO macros
- qemu-iotests: Discard stderr when probing devices

----------------------------------------------------------------
Cole Robinson (1):
      qemu-iotests: Discard stderr when probing devices

Emanuele Giuseppe Esposito (1):
      main loop: add missing documentation links to GS/IO macros

Jinhao Fan (1):
      block/io_uring: add missing include file

Lev Kujawski (1):
      hw/block/hd-geometry: Do not override specified bios-chs-trans

Xie Yongji (3):
      libvduse: Fix the incorrect function name
      libvduse: Replace strcpy() with strncpy()
      libvduse: Pass positive value to strerror()

From: Xie Yongji <xieyongji@bytedance.com>

In vduse_name_is_valid(), we actually check whether
the name is invalid or not. So let's change the
function name to vduse_name_is_invalid() to match
the behavior.

Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220706095624.328-2-xieyongji@bytedance.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 subprojects/libvduse/libvduse.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/subprojects/libvduse/libvduse.c b/subprojects/libvduse/libvduse.c
index XXXXXXX..XXXXXXX 100644
--- a/subprojects/libvduse/libvduse.c
+++ b/subprojects/libvduse/libvduse.c
@@ -XXX,XX +XXX,XX @@ static int vduse_dev_init(VduseDev *dev, const char *name,
     return 0;
 }
 
-static inline bool vduse_name_is_valid(const char *name)
+static inline bool vduse_name_is_invalid(const char *name)
 {
     return strlen(name) >= VDUSE_NAME_MAX || strstr(name, "..");
 }
@@ -XXX,XX +XXX,XX @@ VduseDev *vduse_dev_create_by_name(const char *name, uint16_t num_queues,
     VduseDev *dev;
     int ret;
 
-    if (!name || vduse_name_is_valid(name) || !ops ||
+    if (!name || vduse_name_is_invalid(name) || !ops ||
         !ops->enable_queue || !ops->disable_queue) {
         fprintf(stderr, "Invalid parameter for vduse\n");
         return NULL;
@@ -XXX,XX +XXX,XX @@ VduseDev *vduse_dev_create(const char *name, uint32_t device_id,
     struct vduse_dev_config *dev_config;
     size_t size = offsetof(struct vduse_dev_config, config);
 
-    if (!name || vduse_name_is_valid(name) ||
+    if (!name || vduse_name_is_invalid(name) ||
         !has_feature(features,  VIRTIO_F_VERSION_1) || !config ||
         !config_size || !ops || !ops->enable_queue || !ops->disable_queue) {
         fprintf(stderr, "Invalid parameter for vduse\n");
-- 
2.35.3

From: Xie Yongji <xieyongji@bytedance.com>

Coverity reported a string overflow issue since we copied
"name" to "dev_config->name" without checking the length.
This should be a false positive since we already checked
the length of "name" in vduse_name_is_invalid(). But anyway,
let's replace strcpy() with strncpy() (as a general library,
we'd like to minimize dependencies on other libraries, so we
didn't use g_strlcpy() here) to fix the coverity complaint.

Fixes: Coverity CID 1490224
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220706095624.328-3-xieyongji@bytedance.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 subprojects/libvduse/libvduse.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subprojects/libvduse/libvduse.c b/subprojects/libvduse/libvduse.c
index XXXXXXX..XXXXXXX 100644
--- a/subprojects/libvduse/libvduse.c
+++ b/subprojects/libvduse/libvduse.c
@@ -XXX,XX +XXX,XX @@ VduseDev *vduse_dev_create(const char *name, uint32_t device_id,
         goto err_dev;
     }
 
-    strcpy(dev_config->name, name);
+    strncpy(dev_config->name, name, VDUSE_NAME_MAX);
+    dev_config->name[VDUSE_NAME_MAX - 1] = '\0';
     dev_config->device_id = device_id;
     dev_config->vendor_id = vendor_id;
     dev_config->features = features;
-- 
2.35.3

From: Xie Yongji <xieyongji@bytedance.com>

The value passed to strerror() should be positive.
So let's fix it.

Fixes: Coverity CID 1490226, 1490223
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220706095624.328-4-xieyongji@bytedance.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 subprojects/libvduse/libvduse.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subprojects/libvduse/libvduse.c b/subprojects/libvduse/libvduse.c
index XXXXXXX..XXXXXXX 100644
--- a/subprojects/libvduse/libvduse.c
+++ b/subprojects/libvduse/libvduse.c
@@ -XXX,XX +XXX,XX @@ VduseDev *vduse_dev_create_by_name(const char *name, uint16_t num_queues,
     ret = vduse_dev_init(dev, name, num_queues, ops, priv);
     if (ret < 0) {
         fprintf(stderr, "Failed to init vduse device %s: %s\n",
-                name, strerror(ret));
+                name, strerror(-ret));
         free(dev);
         return NULL;
     }
@@ -XXX,XX +XXX,XX @@ VduseDev *vduse_dev_create(const char *name, uint32_t device_id,
     ret = vduse_dev_init(dev, name, num_queues, ops, priv);
     if (ret < 0) {
         fprintf(stderr, "Failed to init vduse device %s: %s\n",
-                name, strerror(ret));
+                name, strerror(-ret));
         goto err;
     }
 
-- 
2.35.3

From: Lev Kujawski <lkujaw@member.fsf.org>

For small disk images (<4 GiB), QEMU and SeaBIOS default to the
LARGE/ECHS disk translation method, but it is not uncommon for other
BIOS software to use LBA in these cases as well.  Some operating
system boot loaders (e.g., NT 4) do not handle LARGE translations
outside of fixed configurations.  See, e.g., Q154052:

"When starting an x86 based computer, Ntdetect.com retrieves and
stores Interrupt 13 information. . . If the disk controller is using a
32 sector/64 head translation scheme, this boundary will be 1 GB. If
the controller uses 63 sector/255 head translation [AUTHOR: i.e.,
LBA], the limit will be 4 GB."

To accommodate these situations, hd_geometry_guess() now follows the
disk translation specified by the user even when the ATA disk geometry
is guessed.

hd_geometry_guess():
* Only set the disk translation when translation is AUTO.
* Show the soon-to-be active translation (*ptrans) in the trace rather
  than what was guessed.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/56
Buglink: https://bugs.launchpad.net/qemu/+bug/1745312

Signed-off-by: Lev Kujawski <lkujaw@member.fsf.org>
Message-Id: <20220707204045.999544-1-lkujaw@member.fsf.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 hw/block/hd-geometry.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/hd-geometry.c
+++ b/hw/block/hd-geometry.c
@@ -XXX,XX +XXX,XX @@ void hd_geometry_guess(BlockBackend *blk,
         translation = BIOS_ATA_TRANSLATION_NONE;
     }
     if (ptrans) {
-        *ptrans = translation;
+        if (*ptrans == BIOS_ATA_TRANSLATION_AUTO) {
+            *ptrans = translation;
+        } else {
+            /* Defer to the translation specified by the user.  */
+            translation = *ptrans;
+        }
     }
     trace_hd_geometry_guess(blk, *pcyls, *pheads, *psecs, translation);
 }
-- 
2.35.3

From: Cole Robinson <crobinso@redhat.com>

qemu-iotests fails in the following setup:

./configure --enable-modules --enable-smartcard \
      --target-list=x86_64-softmmu,s390x-softmmu
  make
  cd build
  QEMU_PROG=`pwd`/s390x-softmmu/qemu-system-s390x \
      ../tests/check-block.sh qcow2
  ...
  --- /home/crobinso/src/qemu/tests/qemu-iotests/127.out
  +++ /home/crobinso/src/qemu/build/tests/qemu-iotests/scratch/127.out.bad
  @@ -1,4 +1,18 @@
   QA output created by 127
  +Failed to open module: /home/crobinso/src/qemu/build/hw-usb-smartcard.so: undefined symbol: ccid_card_ccid_attach
  ...
  --- /home/crobinso/src/qemu/tests/qemu-iotests/267.out
  +++ /home/crobinso/src/qemu/build/tests/qemu-iotests/scratch/267.out.bad
  @@ -1,4 +1,11 @@
   QA output created by 267
  +Failed to open module: /home/crobinso/src/qemu/build/hw-usb-smartcard.so: undefined symbol: ccid_card_ccid_attach

The stderr spew is its own known issue, but seems like iotests should
be discarding stderr in this case.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/common.rc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ _require_large_file()
 #
 _require_devices()
 {
-    available=$($QEMU -M none -device help | \
+    available=$($QEMU -M none -device help 2> /dev/null | \
                 grep ^name | sed -e 's/^name "//' -e 's/".*$//')
     for device
     do
@@ -XXX,XX +XXX,XX @@ _require_devices()
 
 _require_one_device_of()
 {
-    available=$($QEMU -M none -device help | \
+    available=$($QEMU -M none -device help 2> /dev/null | \
                 grep ^name | sed -e 's/^name "//' -e 's/".*$//')
     for device
     do
-- 
2.35.3

From: Emanuele Giuseppe Esposito <eesposit@redhat.com>

If we go directly to GLOBAL_STATE_CODE, IO_CODE or IO_OR_GS_CODE
definition, we just find that they "mark and check that the function
is part of the {category} API".
However, ther is no definition on what {category} API is, they are
in include/block/block-*.h
Therefore, add a comment that refers to such documentation.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20220609122206.1016936-1-eesposit@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/qemu/main-loop.h | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/main-loop.h
+++ b/include/qemu/main-loop.h
@@ -XXX,XX +XXX,XX @@ bool qemu_mutex_iothread_locked(void);
  */
 bool qemu_in_main_thread(void);
 
-/* Mark and check that the function is part of the global state API. */
+/*
+ * Mark and check that the function is part of the Global State API.
+ * Please refer to include/block/block-global-state.h for more
+ * information about GS API.
+ */
 #ifdef CONFIG_COCOA
 /*
  * When using the Cocoa UI, addRemovableDevicesMenuItems() is called from
@@ -XXX,XX +XXX,XX @@ bool qemu_in_main_thread(void);
     } while (0)
 #endif /* CONFIG_COCOA */
 
-/* Mark and check that the function is part of the I/O API. */
+/*
+ * Mark and check that the function is part of the I/O API.
+ * Please refer to include/block/block-io.h for more
+ * information about IO API.
+ */
 #define IO_CODE()                                                   \
     do {                                                            \
         /* nop */                                                   \
     } while (0)
 
-/* Mark and check that the function is part of the "I/O OR GS" API. */
+/*
+ * Mark and check that the function is part of the "I/O OR GS" API.
+ * Please refer to include/block/block-io.h for more
+ * information about "IO or GS" API.
+ */
 #define IO_OR_GS_CODE()                                             \
     do {                                                            \
         /* nop */                                                   \
-- 
2.35.3