Series comparison

-[Qemu-devel] [PULL 00/36] Block layer patches
+[PULL 0/8] Block layer patches
-The following changes since commit b2f7a038bb4c4fc5ce6b8486e8513dfd97665e2a:
+The following changes since commit bf159f0bdc7b8e7aa8342dedb3829ca744c1b612:
-  Merge remote-tracking branch 'remotes/rth/tags/pull-softfloat-20181104' into staging (2018-11-05 10:32:49 +0000)
+  Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2021-01-27.for-upstream' into staging (2021-01-27 17:40:25 +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 1240ac558d348f6c7a5752b1a57c1da58e4efe3e:
+for you to fetch changes up to a44be0334beae3a9affb4a3a92cc6852993d7a84:
-  include: Add a comment to explain the origin of sizes' lookup table (2018-11-05 15:29:59 +0100)
+  iotests: rename and move 169 and 199 tests (2021-01-27 20:53:14 +0100)
 ----------------------------------------------------------------
 Block layer patches:
-- auto-read-only option to fix commit job when used with -blockdev
+- Fix crash on write to read-only devices
-- Fix help text related qemu-iotests failure (by improving the help text
+- iotests: Rewrite 'check' in Python, get rid of 'groups' and allow
-  and updating the reference output)
+  non-numeric test case names
 - quorum: Add missing checks when adding/removing child nodes
 - Don't take address of fields in packed structs
 - vvfat: Fix crash when reporting error about too many files in directory
 ----------------------------------------------------------------
-Alberto Garcia (7):
+Kevin Wolf (2):
-      block: replace "discard" literal with BDRV_OPT_DISCARD macro
+      block: Separate blk_is_writable() and blk_supports_write_perm()
-      qcow2: Get the request alignment for encrypted images from QCryptoBlock
+      virtio-scsi-test: Test writing to scsi-cd device
       quorum: Remove quorum_err()
       quorum: Return an error if the blkverify mode has invalid settings
       iotest: Test the blkverify mode of the Quorum driver
       quorum: Forbid adding children in blkverify mode
       iotest: Test x-blockdev-change on a Quorum
-Cleber Rosa (1):
+Vladimir Sementsov-Ogievskiy (6):
-      iotests: make 083 specific to raw
+      iotests: 146: drop extra whitespaces from .out file
       iotests: add findtests.py
       iotests: add testenv.py
       iotests: add testrunner.py
       iotests: rewrite check into python
       iotests: rename and move 169 and 199 tests
-Daniel P. Berrangé (1):
+ docs/devel/testing.rst                             |   50 +-
-      crypto: initialize sector size even when opening with no IO flag
+ include/sysemu/block-backend.h                     |    3 +-
  block/block-backend.c                              |   19 +-
  hw/block/dataplane/xen-block.c                     |    2 +-
  hw/block/fdc.c                                     |    9 +-
  hw/block/m25p80.c                                  |    6 +-
  hw/block/nand.c                                    |    2 +-
  hw/block/nvme-ns.c                                 |    7 +-
  hw/block/onenand.c                                 |    2 +-
  hw/block/pflash_cfi01.c                            |    2 +-
  hw/block/pflash_cfi02.c                            |    2 +-
  hw/block/swim.c                                    |    6 +-
  hw/block/virtio-blk.c                              |    6 +-
  hw/block/xen-block.c                               |    2 +-
  hw/ide/core.c                                      |    2 +-
  hw/misc/sifive_u_otp.c                             |    2 +-
  hw/ppc/pnv_pnor.c                                  |    2 +-
  hw/scsi/scsi-disk.c                                |   10 +-
  hw/scsi/scsi-generic.c                             |    4 +-
  hw/sd/sd.c                                         |    6 +-
  hw/usb/dev-storage.c                               |    4 +-
  tests/qtest/virtio-scsi-test.c                     |   39 +
  tests/qemu-iotests/findtests.py                    |  159 +++
  tests/qemu-iotests/iotests.py                      |    8 +
  tests/qemu-iotests/testenv.py                      |  281 +++++
  tests/qemu-iotests/testrunner.py                   |  367 +++++++
  Makefile                                           |    1 -
  tests/check-block.sh                               |    3 +-
  tests/qemu-iotests/146.out                         |  780 +++++++-------
  tests/qemu-iotests/check                           | 1095 +++-----------------
  tests/qemu-iotests/common.env.in                   |    3 -
  tests/qemu-iotests/group                           |  323 ------
  tests/qemu-iotests/meson.build                     |    3 -
  .../{199 => tests/migrate-bitmaps-postcopy-test}   |    0
  .../migrate-bitmaps-postcopy-test.out}             |    0
  .../{169 => tests/migrate-bitmaps-test}            |    0
  .../{169.out => tests/migrate-bitmaps-test.out}    |    0
 files changed, 1481 insertions(+), 1729 deletions(-)
  create mode 100644 tests/qemu-iotests/findtests.py
  create mode 100644 tests/qemu-iotests/testenv.py
  create mode 100644 tests/qemu-iotests/testrunner.py
  delete mode 100644 tests/qemu-iotests/common.env.in
  delete mode 100644 tests/qemu-iotests/group
  rename tests/qemu-iotests/{199 => tests/migrate-bitmaps-postcopy-test} (100%)
  rename tests/qemu-iotests/{199.out => tests/migrate-bitmaps-postcopy-test.out} (100%)
  rename tests/qemu-iotests/{169 => tests/migrate-bitmaps-test} (100%)
  rename tests/qemu-iotests/{169.out => tests/migrate-bitmaps-test.out} (100%)
-Kevin Wolf (12):
-      vpc: Don't leak opts in vpc_open()
-      block: Update flags in bdrv_set_read_only()
-      block: Add auto-read-only option
-      rbd: Close image in qemu_rbd_open() error path
-      block: Require auto-read-only for existing fallbacks
-      nbd: Support auto-read-only option
-      file-posix: Support auto-read-only option
-      curl: Support auto-read-only option
-      gluster: Support auto-read-only option
-      iscsi: Support auto-read-only option
-      block: Make auto-read-only=on default for -drive
-      qemu-iotests: Test auto-read-only with -drive and -blockdev
-Leonid Bloch (2):
-      vdi: Use a literal number of bytes for DEFAULT_CLUSTER_SIZE
-      include: Add a comment to explain the origin of sizes' lookup table
-Li Qiang (1):
-      block: change some function return type to bool
-Max Reitz (5):
-      option: Make option help nicer to read
-      chardev: Indent list of chardevs
-      qdev-monitor: Make device options help nicer
-      object: Make option help nicer to read
-      fw_cfg: Drop newline in @file description
-Peter Maydell (5):
-      block/qcow2: Don't take address of fields in packed structs
-      block/qcow: Don't take address of fields in packed structs
-      block/qcow2-bitmap: Don't take address of fields in packed structs
-      block/vhdx: Don't take address of fields in packed structs
-      block/vdi: Don't take address of fields in packed structs
-Stefan Weil (1):
-      qemu-io-cmds: Fix two format strings
-Thomas Huth (1):
-      block/vvfat: Fix crash when reporting error about too many files in directory
- qapi/block-core.json           |   7 +
- block/vhdx.h                   |  12 +-
- include/block/block.h          |   5 +-
- include/qemu/option.h          |   2 +-
- include/qemu/units.h           |  18 +
- include/sysemu/block-backend.h |   6 +-
- block.c                        |  60 ++-
- block/block-backend.c          |   8 +-
- block/bochs.c                  |  17 +-
- block/cloop.c                  |  16 +-
- block/curl.c                   |   8 +-
- block/dmg.c                    |  16 +-
- block/file-posix.c             |  19 +-
- block/gluster.c                |  12 +-
- block/iscsi.c                  |   8 +-
- block/nbd-client.c             |  10 +-
- block/qcow.c                   |  18 +-
- block/qcow2-bitmap.c           |  24 +-
- block/qcow2.c                  |  66 +--
- block/quorum.c                 |  45 +-
- block/rbd.c                    |  14 +-
- block/vdi.c                    |  68 +--
- block/vhdx-endian.c            | 118 ++---
- block/vhdx-log.c               |   4 +-
- block/vhdx.c                   |  18 +-
- block/vpc.c                    |   2 +
- block/vvfat.c                  |  15 +-
- blockdev.c                     |   3 +-
- chardev/char.c                 |   2 +-
- crypto/block-qcow.c            |   2 +
- qdev-monitor.c                 |  13 +-
- qemu-img.c                     |   4 +-
- qemu-io-cmds.c                 |   4 +-
- util/qemu-option.c             |  32 +-
- vl.c                           |  15 +-
- tests/qemu-iotests/081         | 116 +++++
- tests/qemu-iotests/081.out     |  70 +++
- tests/qemu-iotests/082.out     | 956 ++++++++++++++++++++---------------------
- tests/qemu-iotests/083         |   2 +-
- tests/qemu-iotests/232         | 147 +++++++
- tests/qemu-iotests/232.out     |  59 +++
- tests/qemu-iotests/group       |   1 +
-files changed, 1266 insertions(+), 776 deletions(-)
- create mode 100755 tests/qemu-iotests/232
- create mode 100644 tests/qemu-iotests/232.out

-[Qemu-devel] [PULL 01/36] block/vvfat: Fix crash when reporting error about too many files in directory
+Deleted patch
-From: Thomas Huth <thuth@redhat.com>
-When using the vvfat driver with a directory that contains too many files,
-QEMU currently crashes. This can be triggered like this for example:
- mkdir /tmp/vvfattest
- cd /tmp/vvfattest
- for ((x=0;x<=513;x++)); do mkdir $x; done
- qemu-system-x86_64 -drive \
-   file.driver=vvfat,file.dir=.,read-only=on,media=cdrom
-Seems like read_directory() is changing the mapping->path variable. Make
-sure we use the right pointer instead.
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/vvfat.c | 4 ++--
-file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/block/vvfat.c b/block/vvfat.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vvfat.c
-+++ b/block/vvfat.c
-@@ -XXX,XX +XXX,XX @@ static int init_directories(BDRVVVFATState* s,
-         mapping = array_get(&(s->mapping), i);
-         if (mapping->mode & MODE_DIRECTORY) {
-+            char *path = mapping->path;
-             mapping->begin = cluster;
-             if(read_directory(s, i)) {
--                error_setg(errp, "Could not read directory %s",
--                           mapping->path);
-+                error_setg(errp, "Could not read directory %s", path);
-                 return -1;
-             }
-             mapping = array_get(&(s->mapping), i);
---
-.19.1

-[Qemu-devel] [PULL 02/36] block: replace "discard" literal with BDRV_OPT_DISCARD macro
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block.c | 6 +++---
-file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ QemuOptsList bdrv_runtime_opts = {
-             .help = "try to optimize zero writes (off, on, unmap)",
-         },
-         {
--            .name = "discard",
-+            .name = BDRV_OPT_DISCARD,
-             .type = QEMU_OPT_STRING,
-             .help = "discard operation (ignore/off, unmap/on)",
-         },
-@@ -XXX,XX +XXX,XX @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
-         }
-     }
--    discard = qemu_opt_get(opts, "discard");
-+    discard = qemu_opt_get(opts, BDRV_OPT_DISCARD);
-     if (discard != NULL) {
-         if (bdrv_parse_discard_flags(discard, &bs->open_flags) != 0) {
-             error_setg(errp, "Invalid discard option");
-@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
-     update_flags_from_options(&reopen_state->flags, opts);
--    discard = qemu_opt_get_del(opts, "discard");
-+    discard = qemu_opt_get_del(opts, BDRV_OPT_DISCARD);
-     if (discard != NULL) {
-         if (bdrv_parse_discard_flags(discard, &reopen_state->flags) != 0) {
-             error_setg(errp, "Invalid discard option");
---
-.19.1

-[Qemu-devel] [PULL 03/36] qemu-io-cmds: Fix two format strings
+Deleted patch
-From: Stefan Weil <sw@weilnetz.de>
-Use %zu instead of %zd for unsigned numbers.
-This fixes two error messages from the LSTM static code analyzer:
-    This argument should be of type 'ssize_t' but is of type 'unsigned long'
-Signed-off-by: Stefan Weil <sw@weilnetz.de>
-Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- qemu-io-cmds.c | 4 ++--
-file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
-index XXXXXXX..XXXXXXX 100644
---- a/qemu-io-cmds.c
-+++ b/qemu-io-cmds.c
-@@ -XXX,XX +XXX,XX @@ static int readv_f(BlockBackend *blk, int argc, char **argv)
-         memset(cmp_buf, pattern, qiov.size);
-         if (memcmp(buf, cmp_buf, qiov.size)) {
-             printf("Pattern verification failed at offset %"
--                   PRId64 ", %zd bytes\n", offset, qiov.size);
-+                   PRId64 ", %zu bytes\n", offset, qiov.size);
-             ret = -EINVAL;
-         }
-         g_free(cmp_buf);
-@@ -XXX,XX +XXX,XX @@ static void aio_read_done(void *opaque, int ret)
-         memset(cmp_buf, ctx->pattern, ctx->qiov.size);
-         if (memcmp(ctx->buf, cmp_buf, ctx->qiov.size)) {
-             printf("Pattern verification failed at offset %"
--                   PRId64 ", %zd bytes\n", ctx->offset, ctx->qiov.size);
-+                   PRId64 ", %zu bytes\n", ctx->offset, ctx->qiov.size);
-         }
-         g_free(cmp_buf);
-     }
---
-.19.1

-[Qemu-devel] [PULL 04/36] block/qcow2: Don't take address of fields in packed structs
+Deleted patch
-From: Peter Maydell <peter.maydell@linaro.org>
-Taking the address of a field in a packed struct is a bad idea, because
-it might not be actually aligned enough for that pointer type (and
-thus cause a crash on dereference on some host architectures). Newer
-versions of clang warn about this. Avoid the bug by not using the
-"modify in place" byte swapping functions.
-There are a few places where the in-place swap function is
-used on something other than a packed struct field; we convert
-those anyway, for consistency.
-This patch was produced with the following spatch script
-(and hand-editing to fold a few resulting overlength lines):
-@@
-expression E;
-@@
--be16_to_cpus(&E);
-+E = be16_to_cpu(E);
-@@
-expression E;
-@@
--be32_to_cpus(&E);
-+E = be32_to_cpu(E);
-@@
-expression E;
-@@
--be64_to_cpus(&E);
-+E = be64_to_cpu(E);
-@@
-expression E;
-@@
--cpu_to_be16s(&E);
-+E = cpu_to_be16(E);
-@@
-expression E;
-@@
--cpu_to_be32s(&E);
-+E = cpu_to_be32(E);
-@@
-expression E;
-@@
--cpu_to_be64s(&E);
-+E = cpu_to_be64(E);
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Tested-by: John Snow <jsnow@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow2.c | 64 +++++++++++++++++++++++++++------------------------
-file changed, 34 insertions(+), 30 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,
-                              "pread fail from offset %" PRIu64, offset);
-             return 1;
-         }
--        be32_to_cpus(&ext.magic);
--        be32_to_cpus(&ext.len);
-+        ext.magic = be32_to_cpu(ext.magic);
-+        ext.len = be32_to_cpu(ext.len);
-         offset += sizeof(ext);
- #ifdef DEBUG_EXT
-         printf("ext.magic = 0x%x\n", ext.magic);
-@@ -XXX,XX +XXX,XX @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
-                                  "Unable to read CRYPTO header extension");
-                 return ret;
-             }
--            be64_to_cpus(&s->crypto_header.offset);
--            be64_to_cpus(&s->crypto_header.length);
-+            s->crypto_header.offset = be64_to_cpu(s->crypto_header.offset);
-+            s->crypto_header.length = be64_to_cpu(s->crypto_header.length);
-             if ((s->crypto_header.offset % s->cluster_size) != 0) {
-                 error_setg(errp, "Encryption header offset '%" PRIu64 "' is "
-@@ -XXX,XX +XXX,XX @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
-                 return -EINVAL;
-             }
--            be32_to_cpus(&bitmaps_ext.nb_bitmaps);
--            be64_to_cpus(&bitmaps_ext.bitmap_directory_size);
--            be64_to_cpus(&bitmaps_ext.bitmap_directory_offset);
-+            bitmaps_ext.nb_bitmaps = be32_to_cpu(bitmaps_ext.nb_bitmaps);
-+            bitmaps_ext.bitmap_directory_size =
-+                be64_to_cpu(bitmaps_ext.bitmap_directory_size);
-+            bitmaps_ext.bitmap_directory_offset =
-+                be64_to_cpu(bitmaps_ext.bitmap_directory_offset);
-             if (bitmaps_ext.nb_bitmaps > QCOW2_MAX_BITMAPS) {
-                 error_setg(errp,
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
-         error_setg_errno(errp, -ret, "Could not read qcow2 header");
-         goto fail;
-     }
--    be32_to_cpus(&header.magic);
--    be32_to_cpus(&header.version);
--    be64_to_cpus(&header.backing_file_offset);
--    be32_to_cpus(&header.backing_file_size);
--    be64_to_cpus(&header.size);
--    be32_to_cpus(&header.cluster_bits);
--    be32_to_cpus(&header.crypt_method);
--    be64_to_cpus(&header.l1_table_offset);
--    be32_to_cpus(&header.l1_size);
--    be64_to_cpus(&header.refcount_table_offset);
--    be32_to_cpus(&header.refcount_table_clusters);
--    be64_to_cpus(&header.snapshots_offset);
--    be32_to_cpus(&header.nb_snapshots);
-+    header.magic = be32_to_cpu(header.magic);
-+    header.version = be32_to_cpu(header.version);
-+    header.backing_file_offset = be64_to_cpu(header.backing_file_offset);
-+    header.backing_file_size = be32_to_cpu(header.backing_file_size);
-+    header.size = be64_to_cpu(header.size);
-+    header.cluster_bits = be32_to_cpu(header.cluster_bits);
-+    header.crypt_method = be32_to_cpu(header.crypt_method);
-+    header.l1_table_offset = be64_to_cpu(header.l1_table_offset);
-+    header.l1_size = be32_to_cpu(header.l1_size);
-+    header.refcount_table_offset = be64_to_cpu(header.refcount_table_offset);
-+    header.refcount_table_clusters =
-+        be32_to_cpu(header.refcount_table_clusters);
-+    header.snapshots_offset = be64_to_cpu(header.snapshots_offset);
-+    header.nb_snapshots = be32_to_cpu(header.nb_snapshots);
-     if (header.magic != QCOW_MAGIC) {
-         error_setg(errp, "Image is not in qcow2 format");
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
-         header.refcount_order           = 4;
-         header.header_length            = 72;
-     } else {
--        be64_to_cpus(&header.incompatible_features);
--        be64_to_cpus(&header.compatible_features);
--        be64_to_cpus(&header.autoclear_features);
--        be32_to_cpus(&header.refcount_order);
--        be32_to_cpus(&header.header_length);
-+        header.incompatible_features =
-+            be64_to_cpu(header.incompatible_features);
-+        header.compatible_features = be64_to_cpu(header.compatible_features);
-+        header.autoclear_features = be64_to_cpu(header.autoclear_features);
-+        header.refcount_order = be32_to_cpu(header.refcount_order);
-+        header.header_length = be32_to_cpu(header.header_length);
-         if (header.header_length < 104) {
-             error_setg(errp, "qcow2 header too short");
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
-             goto fail;
-         }
-         for(i = 0;i < s->l1_size; i++) {
--            be64_to_cpus(&s->l1_table[i]);
-+            s->l1_table[i] = be64_to_cpu(s->l1_table[i]);
-         }
-     }
-@@ -XXX,XX +XXX,XX @@ int qcow2_update_header(BlockDriverState *bs)
-     /* Full disk encryption header pointer extension */
-     if (s->crypto_header.offset != 0) {
--        cpu_to_be64s(&s->crypto_header.offset);
--        cpu_to_be64s(&s->crypto_header.length);
-+        s->crypto_header.offset = cpu_to_be64(s->crypto_header.offset);
-+        s->crypto_header.length = cpu_to_be64(s->crypto_header.length);
-         ret = header_ext_add(buf, QCOW2_EXT_MAGIC_CRYPTO_HEADER,
-                              &s->crypto_header, sizeof(s->crypto_header),
-                              buflen);
--        be64_to_cpus(&s->crypto_header.offset);
--        be64_to_cpus(&s->crypto_header.length);
-+        s->crypto_header.offset = be64_to_cpu(s->crypto_header.offset);
-+        s->crypto_header.length = be64_to_cpu(s->crypto_header.length);
-         if (ret < 0) {
-             goto fail;
-         }
---
-.19.1

-[Qemu-devel] [PULL 05/36] block/qcow: Don't take address of fields in packed structs
+Deleted patch
-From: Peter Maydell <peter.maydell@linaro.org>
-Taking the address of a field in a packed struct is a bad idea, because
-it might not be actually aligned enough for that pointer type (and
-thus cause a crash on dereference on some host architectures). Newer
-versions of clang warn about this. Avoid the bug by not using the
-"modify in place" byte swapping functions.
-There are a few places where the in-place swap function is
-used on something other than a packed struct field; we convert
-those anyway, for consistency.
-This patch was produced with the following spatch script:
-@@
-expression E;
-@@
--be16_to_cpus(&E);
-+E = be16_to_cpu(E);
-@@
-expression E;
-@@
--be32_to_cpus(&E);
-+E = be32_to_cpu(E);
-@@
-expression E;
-@@
--be64_to_cpus(&E);
-+E = be64_to_cpu(E);
-@@
-expression E;
-@@
--cpu_to_be16s(&E);
-+E = cpu_to_be16(E);
-@@
-expression E;
-@@
--cpu_to_be32s(&E);
-+E = cpu_to_be32(E);
-@@
-expression E;
-@@
--cpu_to_be64s(&E);
-+E = cpu_to_be64(E);
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Tested-by: John Snow <jsnow@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow.c | 18 +++++++++---------
-file changed, 9 insertions(+), 9 deletions(-)
-diff --git a/block/qcow.c b/block/qcow.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow.c
-+++ b/block/qcow.c
-@@ -XXX,XX +XXX,XX @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
-     if (ret < 0) {
-         goto fail;
-     }
--    be32_to_cpus(&header.magic);
--    be32_to_cpus(&header.version);
--    be64_to_cpus(&header.backing_file_offset);
--    be32_to_cpus(&header.backing_file_size);
--    be32_to_cpus(&header.mtime);
--    be64_to_cpus(&header.size);
--    be32_to_cpus(&header.crypt_method);
--    be64_to_cpus(&header.l1_table_offset);
-+    header.magic = be32_to_cpu(header.magic);
-+    header.version = be32_to_cpu(header.version);
-+    header.backing_file_offset = be64_to_cpu(header.backing_file_offset);
-+    header.backing_file_size = be32_to_cpu(header.backing_file_size);
-+    header.mtime = be32_to_cpu(header.mtime);
-+    header.size = be64_to_cpu(header.size);
-+    header.crypt_method = be32_to_cpu(header.crypt_method);
-+    header.l1_table_offset = be64_to_cpu(header.l1_table_offset);
-     if (header.magic != QCOW_MAGIC) {
-         error_setg(errp, "Image not in qcow format");
-@@ -XXX,XX +XXX,XX @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
-     }
-     for(i = 0;i < s->l1_size; i++) {
--        be64_to_cpus(&s->l1_table[i]);
-+        s->l1_table[i] = be64_to_cpu(s->l1_table[i]);
-     }
-     /* alloc L2 cache (max. 64k * 16 * 8 = 8 MB) */
---
-.19.1

-[Qemu-devel] [PULL 09/36] block: change some function return type to bool
+[PULL 1/8] block: Separate blk_is_writable() and blk_supports_write_perm()
-From: Li Qiang <liq3ea@163.com>
+Currently, blk_is_read_only() tells whether a given BlockBackend can
+only be used in read-only mode because its root node is read-only. Some
-Signed-off-by: Li Qiang <liq3ea@163.com>
+callers actually try to answer a slightly different question: Is the
-Reviewed-by: Alberto Garcia <berto@igalia.com>
+BlockBackend configured to be writable, by taking write permissions on
 the root node?
 This can differ, for example, for CD-ROM devices which don't take write
 permissions, but may be backed by a writable image file. scsi-cd allows
 write requests to the drive if blk_is_read_only() returns false.
 However, the write request will immediately run into an assertion
 failure because the write permission is missing.
 This patch introduces separate functions for both questions.
 blk_supports_write_perm() answers the question whether the block
 node/image file can support writable devices, whereas blk_is_writable()
 tells whether the BlockBackend is currently configured to be writable.
 All calls of blk_is_read_only() are converted to one of the two new
 functions.
 Fixes: https://bugs.launchpad.net/bugs/1906693
 Cc: qemu-stable@nongnu.org
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 Message-Id: <20210118123448.307825-2-kwolf@redhat.com>
 Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Reviewed-by: Max Reitz <mreitz@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- include/sysemu/block-backend.h | 6 +++---
+ include/sysemu/block-backend.h |  3 ++-
- block/block-backend.c          | 8 ++++----
+ block/block-backend.c          | 19 ++++++++++++++++---
-files changed, 7 insertions(+), 7 deletions(-)
+ hw/block/dataplane/xen-block.c |  2 +-
  hw/block/fdc.c                 |  9 +++++----
  hw/block/m25p80.c              |  6 +++---
  hw/block/nand.c                |  2 +-
  hw/block/nvme-ns.c             |  7 ++++---
  hw/block/onenand.c             |  2 +-
  hw/block/pflash_cfi01.c        |  2 +-
  hw/block/pflash_cfi02.c        |  2 +-
  hw/block/swim.c                |  6 +++---
  hw/block/virtio-blk.c          |  6 +++---
  hw/block/xen-block.c           |  2 +-
  hw/ide/core.c                  |  2 +-
  hw/misc/sifive_u_otp.c         |  2 +-
  hw/ppc/pnv_pnor.c              |  2 +-
  hw/scsi/scsi-disk.c            | 10 +++++-----
  hw/scsi/scsi-generic.c         |  4 ++--
  hw/sd/sd.c                     |  6 +++---
  hw/usb/dev-storage.c           |  4 ++--
 files changed, 57 insertions(+), 41 deletions(-)
 diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/sysemu/block-backend.h
 +++ b/include/sysemu/block-backend.h
 @@ -XXX,XX +XXX,XX @@ BlockErrorAction blk_get_error_action(BlockBackend *blk, bool is_read,
                                        int error);
  void blk_error_action(BlockBackend *blk, BlockErrorAction action,
                        bool is_read, int error);
--int blk_is_read_only(BlockBackend *blk);
+-bool blk_is_read_only(BlockBackend *blk);
--int blk_is_sg(BlockBackend *blk);
++bool blk_supports_write_perm(BlockBackend *blk);
--int blk_enable_write_cache(BlockBackend *blk);
++bool blk_is_writable(BlockBackend *blk);
-+bool blk_is_read_only(BlockBackend *blk);
+ bool blk_is_sg(BlockBackend *blk);
-+bool blk_is_sg(BlockBackend *blk);
+ bool blk_enable_write_cache(BlockBackend *blk);
 +bool blk_enable_write_cache(BlockBackend *blk);
  void blk_set_enable_write_cache(BlockBackend *blk, bool wce);
- void blk_invalidate_cache(BlockBackend *blk, Error **errp);
- bool blk_is_inserted(BlockBackend *blk);
 diff --git a/block/block-backend.c b/block/block-backend.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/block-backend.c
 +++ b/block/block-backend.c
 @@ -XXX,XX +XXX,XX @@ void blk_error_action(BlockBackend *blk, BlockErrorAction action,
      }
  }
--int blk_is_read_only(BlockBackend *blk)
+-bool blk_is_read_only(BlockBackend *blk)
-+bool blk_is_read_only(BlockBackend *blk)
++/*
 + * Returns true if the BlockBackend can support taking write permissions
 + * (because its root node is not read-only).
 + */
 +bool blk_supports_write_perm(BlockBackend *blk)
  {
      BlockDriverState *bs = blk_bs(blk);
-@@ -XXX,XX +XXX,XX @@ int blk_is_read_only(BlockBackend *blk)
+     if (bs) {
 -        return bdrv_is_read_only(bs);
 +        return !bdrv_is_read_only(bs);
      } else {
 -        return blk->root_state.read_only;
 +        return !blk->root_state.read_only;
      }
  }
--int blk_is_sg(BlockBackend *blk)
++/*
-+bool blk_is_sg(BlockBackend *blk)
++ * Returns true if the BlockBackend can be written to in its current
 + * configuration (i.e. if write permission have been requested)
 + */
 +bool blk_is_writable(BlockBackend *blk)
 +{
 +    return blk->perm & BLK_PERM_WRITE;
 +}
 +
  bool blk_is_sg(BlockBackend *blk)
  {
      BlockDriverState *bs = blk_bs(blk);
+diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c
-     if (!bs) {
+index XXXXXXX..XXXXXXX 100644
--        return 0;
+--- a/hw/block/dataplane/xen-block.c
-+        return false;
++++ b/hw/block/dataplane/xen-block.c
-     }
+@@ -XXX,XX +XXX,XX @@ static int xen_block_parse_request(XenBlockRequest *request)
+     };
-     return bdrv_is_sg(bs);
      if (request->req.operation != BLKIF_OP_READ &&
 -        blk_is_read_only(dataplane->blk)) {
 +        !blk_is_writable(dataplane->blk)) {
          error_report("error: write req for ro device");
          goto err;
      }
 diff --git a/hw/block/fdc.c b/hw/block/fdc.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/block/fdc.c
 +++ b/hw/block/fdc.c
@@ -XXX,XX +XXX,XX @@ static void fd_revalidate(FDrive *drv)
      FLOPPY_DPRINTF("revalidate\n");
      if (drv->blk != NULL) {
 -        drv->ro = blk_is_read_only(drv->blk);
 +        drv->ro = !blk_is_writable(drv->blk);
          if (!blk_is_inserted(drv->blk)) {
              FLOPPY_DPRINTF("No disk in drive\n");
              drv->disk = FLOPPY_DRIVE_TYPE_NONE;
@@ -XXX,XX +XXX,XX @@ static void fd_change_cb(void *opaque, bool load, Error **errp)
          blk_set_perm(drive->blk, 0, BLK_PERM_ALL, &error_abort);
      } else {
          if (!blkconf_apply_backend_options(drive->conf,
 -                                           blk_is_read_only(drive->blk), false,
 -                                           errp)) {
 +                                           !blk_supports_write_perm(drive->blk),
 +                                           false, errp)) {
              return;
          }
      }
@@ -XXX,XX +XXX,XX @@ static void floppy_drive_realize(DeviceState *qdev, Error **errp)
           * read-only node later */
          read_only = true;
      } else {
 -        read_only = !blk_bs(dev->conf.blk) || blk_is_read_only(dev->conf.blk);
 +        read_only = !blk_bs(dev->conf.blk) ||
 +                    !blk_supports_write_perm(dev->conf.blk);
      }
      if (!blkconf_blocksizes(&dev->conf, errp)) {
 diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/block/m25p80.c
 +++ b/hw/block/m25p80.c
@@ -XXX,XX +XXX,XX @@ static void flash_sync_page(Flash *s, int page)
  {
      QEMUIOVector *iov;
 -    if (!s->blk || blk_is_read_only(s->blk)) {
 +    if (!s->blk || !blk_is_writable(s->blk)) {
          return;
      }
@@ -XXX,XX +XXX,XX @@ static inline void flash_sync_area(Flash *s, int64_t off, int64_t len)
  {
      QEMUIOVector *iov;
 -    if (!s->blk || blk_is_read_only(s->blk)) {
 +    if (!s->blk || !blk_is_writable(s->blk)) {
          return;
      }
@@ -XXX,XX +XXX,XX @@ static void m25p80_realize(SSIPeripheral *ss, Error **errp)
      if (s->blk) {
          uint64_t perm = BLK_PERM_CONSISTENT_READ |
 -                        (blk_is_read_only(s->blk) ? 0 : BLK_PERM_WRITE);
 +                        (blk_supports_write_perm(s->blk) ? BLK_PERM_WRITE : 0);
          ret = blk_set_perm(s->blk, perm, BLK_PERM_ALL, errp);
          if (ret < 0) {
              return;
 diff --git a/hw/block/nand.c b/hw/block/nand.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/block/nand.c
 +++ b/hw/block/nand.c
@@ -XXX,XX +XXX,XX @@ static void nand_realize(DeviceState *dev, Error **errp)
      pagesize = 1 << s->oob_shift;
      s->mem_oob = 1;
      if (s->blk) {
 -        if (blk_is_read_only(s->blk)) {
 +        if (!blk_supports_write_perm(s->blk)) {
              error_setg(errp, "Can't use a read-only drive");
              return;
          }
 diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/block/nvme-ns.c
 +++ b/hw/block/nvme-ns.c
@@ -XXX,XX +XXX,XX @@ static void nvme_ns_init(NvmeNamespace *ns)
  static int nvme_ns_init_blk(NvmeCtrl *n, NvmeNamespace *ns, Error **errp)
  {
 +    bool read_only;
 +
      if (!blkconf_blocksizes(&ns->blkconf, errp)) {
          return -1;
      }
 -    if (!blkconf_apply_backend_options(&ns->blkconf,
 -                                       blk_is_read_only(ns->blkconf.blk),
 -                                       false, errp)) {
 +    read_only = !blk_supports_write_perm(ns->blkconf.blk);
 +    if (!blkconf_apply_backend_options(&ns->blkconf, read_only, false, errp)) {
          return -1;
      }
 diff --git a/hw/block/onenand.c b/hw/block/onenand.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/block/onenand.c
 +++ b/hw/block/onenand.c
@@ -XXX,XX +XXX,XX @@ static void onenand_realize(DeviceState *dev, Error **errp)
          s->image = memset(g_malloc(size + (size >> 5)),
 xff, size + (size >> 5));
      } else {
 -        if (blk_is_read_only(s->blk)) {
 +        if (!blk_supports_write_perm(s->blk)) {
              error_setg(errp, "Can't use a read-only drive");
              return;
          }
 diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/block/pflash_cfi01.c
 +++ b/hw/block/pflash_cfi01.c
@@ -XXX,XX +XXX,XX @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp)
      if (pfl->blk) {
          uint64_t perm;
 -        pfl->ro = blk_is_read_only(pfl->blk);
 +        pfl->ro = !blk_supports_write_perm(pfl->blk);
          perm = BLK_PERM_CONSISTENT_READ | (pfl->ro ? 0 : BLK_PERM_WRITE);
          ret = blk_set_perm(pfl->blk, perm, BLK_PERM_ALL, errp);
          if (ret < 0) {
 diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/block/pflash_cfi02.c
 +++ b/hw/block/pflash_cfi02.c
@@ -XXX,XX +XXX,XX @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp)
      if (pfl->blk) {
          uint64_t perm;
 -        pfl->ro = blk_is_read_only(pfl->blk);
 +        pfl->ro = !blk_supports_write_perm(pfl->blk);
          perm = BLK_PERM_CONSISTENT_READ | (pfl->ro ? 0 : BLK_PERM_WRITE);
          ret = blk_set_perm(pfl->blk, perm, BLK_PERM_ALL, errp);
          if (ret < 0) {
 diff --git a/hw/block/swim.c b/hw/block/swim.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/block/swim.c
 +++ b/hw/block/swim.c
@@ -XXX,XX +XXX,XX @@ static void swim_change_cb(void *opaque, bool load, Error **errp)
          blk_set_perm(drive->blk, 0, BLK_PERM_ALL, &error_abort);
      } else {
          if (!blkconf_apply_backend_options(drive->conf,
 -                                           blk_is_read_only(drive->blk), false,
 -                                           errp)) {
 +                                           !blk_supports_write_perm(drive->blk),
 +                                           false, errp)) {
              return;
          }
      }
@@ -XXX,XX +XXX,XX @@ static void swim_drive_realize(DeviceState *qdev, Error **errp)
      dev->conf.werror = BLOCKDEV_ON_ERROR_AUTO;
      if (!blkconf_apply_backend_options(&dev->conf,
 -                                       blk_is_read_only(dev->conf.blk),
 +                                       !blk_supports_write_perm(dev->conf.blk),
                                         false, errp)) {
          return;
      }
 diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/block/virtio-blk.c
 +++ b/hw/block/virtio-blk.c
@@ -XXX,XX +XXX,XX @@ static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features,
           virtio_has_feature(features, VIRTIO_BLK_F_CONFIG_WCE))) {
          virtio_add_feature(&features, VIRTIO_BLK_F_WCE);
      }
 -    if (blk_is_read_only(s->blk)) {
 +    if (!blk_is_writable(s->blk)) {
          virtio_add_feature(&features, VIRTIO_BLK_F_RO);
      }
      if (s->conf.num_queues > 1) {
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
      }
      if (!blkconf_apply_backend_options(&conf->conf,
 -                                       blk_is_read_only(conf->conf.blk), true,
 -                                       errp)) {
 +                                       !blk_supports_write_perm(conf->conf.blk),
 +                                       true, errp)) {
          return;
      }
      s->original_wce = blk_enable_write_cache(conf->conf.blk);
 diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/block/xen-block.c
 +++ b/hw/block/xen-block.c
@@ -XXX,XX +XXX,XX @@ static void xen_disk_realize(XenBlockDevice *blockdev, Error **errp)
          return;
      }
 -    blockdev->info = blk_is_read_only(conf->blk) ? VDISK_READONLY : 0;
 +    blockdev->info = blk_supports_write_perm(conf->blk) ? 0 : VDISK_READONLY;
  }
--int blk_enable_write_cache(BlockBackend *blk)
+ static void xen_disk_class_init(ObjectClass *class, void *data)
-+bool blk_enable_write_cache(BlockBackend *blk)
+diff --git a/hw/ide/core.c b/hw/ide/core.c
- {
+index XXXXXXX..XXXXXXX 100644
-     return blk->enable_write_cache;
+--- a/hw/ide/core.c
 +++ b/hw/ide/core.c
@@ -XXX,XX +XXX,XX @@ int ide_init_drive(IDEState *s, BlockBackend *blk, IDEDriveKind kind,
              error_setg(errp, "Device needs media, but drive is empty");
              return -1;
          }
 -        if (blk_is_read_only(blk)) {
 +        if (!blk_is_writable(blk)) {
              error_setg(errp, "Can't use a read-only drive");
              return -1;
          }
 diff --git a/hw/misc/sifive_u_otp.c b/hw/misc/sifive_u_otp.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/misc/sifive_u_otp.c
 +++ b/hw/misc/sifive_u_otp.c
@@ -XXX,XX +XXX,XX @@ static void sifive_u_otp_realize(DeviceState *dev, Error **errp)
          if (s->blk) {
              perm = BLK_PERM_CONSISTENT_READ |
 -                   (blk_is_read_only(s->blk) ? 0 : BLK_PERM_WRITE);
 +                   (blk_supports_write_perm(s->blk) ? BLK_PERM_WRITE : 0);
              ret = blk_set_perm(s->blk, perm, BLK_PERM_ALL, errp);
              if (ret < 0) {
                  return;
 diff --git a/hw/ppc/pnv_pnor.c b/hw/ppc/pnv_pnor.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/ppc/pnv_pnor.c
 +++ b/hw/ppc/pnv_pnor.c
@@ -XXX,XX +XXX,XX @@ static void pnv_pnor_realize(DeviceState *dev, Error **errp)
      if (s->blk) {
          uint64_t perm = BLK_PERM_CONSISTENT_READ |
 -                        (blk_is_read_only(s->blk) ? 0 : BLK_PERM_WRITE);
 +                        (blk_supports_write_perm(s->blk) ? BLK_PERM_WRITE : 0);
          ret = blk_set_perm(s->blk, perm, BLK_PERM_ALL, errp);
          if (ret < 0) {
              return;
 diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/scsi/scsi-disk.c
 +++ b/hw/scsi/scsi-disk.c
@@ -XXX,XX +XXX,XX @@ static int scsi_disk_emulate_mode_sense(SCSIDiskReq *r, uint8_t *outbuf)
      if (s->qdev.type == TYPE_DISK) {
          dev_specific_param = s->features & (1 << SCSI_DISK_F_DPOFUA) ? 0x10 : 0;
 -        if (blk_is_read_only(s->qdev.conf.blk)) {
 +        if (!blk_is_writable(s->qdev.conf.blk)) {
              dev_specific_param |= 0x80; /* Readonly.  */
          }
      } else {
@@ -XXX,XX +XXX,XX @@ static void scsi_disk_emulate_unmap(SCSIDiskReq *r, uint8_t *inbuf)
          goto invalid_param_len;
      }
 -    if (blk_is_read_only(s->qdev.conf.blk)) {
 +    if (!blk_is_writable(s->qdev.conf.blk)) {
          block_acct_invalid(blk_get_stats(s->qdev.conf.blk), BLOCK_ACCT_UNMAP);
          scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED));
          return;
@@ -XXX,XX +XXX,XX @@ static void scsi_disk_emulate_write_same(SCSIDiskReq *r, uint8_t *inbuf)
          return;
      }
 -    if (blk_is_read_only(s->qdev.conf.blk)) {
 +    if (!blk_is_writable(s->qdev.conf.blk)) {
          scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED));
          return;
      }
@@ -XXX,XX +XXX,XX @@ static int32_t scsi_disk_dma_command(SCSIRequest *req, uint8_t *buf)
      case WRITE_VERIFY_10:
      case WRITE_VERIFY_12:
      case WRITE_VERIFY_16:
 -        if (blk_is_read_only(s->qdev.conf.blk)) {
 +        if (!blk_is_writable(s->qdev.conf.blk)) {
              scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED));
              return 0;
          }
@@ -XXX,XX +XXX,XX @@ static void scsi_realize(SCSIDevice *dev, Error **errp)
          }
      }
 -    read_only = blk_is_read_only(s->qdev.conf.blk);
 +    read_only = !blk_supports_write_perm(s->qdev.conf.blk);
      if (dev->type == TYPE_ROM) {
          read_only = true;
      }
 diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/scsi/scsi-generic.c
 +++ b/hw/scsi/scsi-generic.c
@@ -XXX,XX +XXX,XX @@ static void scsi_read_complete(void * opaque, int ret)
       * readonly.
       */
      if ((s->type == TYPE_DISK || s->type == TYPE_TAPE || s->type == TYPE_ZBC) &&
 -        blk_is_read_only(s->conf.blk) &&
 +        !blk_is_writable(s->conf.blk) &&
          (r->req.cmd.buf[0] == MODE_SENSE ||
           r->req.cmd.buf[0] == MODE_SENSE_10) &&
          (r->req.cmd.buf[1] & 0x8) == 0) {
@@ -XXX,XX +XXX,XX @@ static void scsi_generic_realize(SCSIDevice *s, Error **errp)
          return;
      }
      if (!blkconf_apply_backend_options(&s->conf,
 -                                       blk_is_read_only(s->conf.blk),
 +                                       !blk_supports_write_perm(s->conf.blk),
                                         true, errp)) {
          return;
      }
 diff --git a/hw/sd/sd.c b/hw/sd/sd.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/sd/sd.c
 +++ b/hw/sd/sd.c
@@ -XXX,XX +XXX,XX @@ static void sd_reset(DeviceState *dev)
      sd_set_sdstatus(sd);
      g_free(sd->wp_groups);
 -    sd->wp_switch = sd->blk ? blk_is_read_only(sd->blk) : false;
 +    sd->wp_switch = sd->blk ? !blk_is_writable(sd->blk) : false;
      sd->wpgrps_size = sect;
      sd->wp_groups = bitmap_new(sd->wpgrps_size);
      memset(sd->function_group, 0, sizeof(sd->function_group));
@@ -XXX,XX +XXX,XX @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert)
  {
      sd->readonly_cb = readonly;
      sd->inserted_cb = insert;
 -    qemu_set_irq(readonly, sd->blk ? blk_is_read_only(sd->blk) : 0);
 +    qemu_set_irq(readonly, sd->blk ? !blk_is_writable(sd->blk) : 0);
      qemu_set_irq(insert, sd->blk ? blk_is_inserted(sd->blk) : 0);
  }
+@@ -XXX,XX +XXX,XX @@ static void sd_realize(DeviceState *dev, Error **errp)
+     if (sd->blk) {
+         int64_t blk_size;
+-        if (blk_is_read_only(sd->blk)) {
++        if (!blk_supports_write_perm(sd->blk)) {
+             error_setg(errp, "Cannot use read-only drive as SD card");
+             return;
+         }
+diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/usb/dev-storage.c
++++ b/hw/usb/dev-storage.c
+@@ -XXX,XX +XXX,XX @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp)
+         return;
+     }
+-    if (!blkconf_apply_backend_options(&s->conf, blk_is_read_only(blk), true,
+-                                       errp)) {
++    if (!blkconf_apply_backend_options(&s->conf, !blk_supports_write_perm(blk),
++                                       true, errp)) {
+         return;
+     }
 --
-.19.1
+.29.2

-[Qemu-devel] [PULL 06/36] block/qcow2-bitmap: Don't take address of fields in packed structs
+[PULL 2/8] virtio-scsi-test: Test writing to scsi-cd device
-From: Peter Maydell <peter.maydell@linaro.org>
+This tests that trying to write to a (read-only) scsi-cd device backed
 by a read-write image file doesn't crash and results in the correct
 error.
-Taking the address of a field in a packed struct is a bad idea, because
+This is a regression test for https://bugs.launchpad.net/bugs/1906693.
 it might not be actually aligned enough for that pointer type (and
 thus cause a crash on dereference on some host architectures). Newer
 versions of clang warn about this. Avoid the bug by not using the
 "modify in place" byte swapping functions.
-There are a few places where the in-place swap function is
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-used on something other than a packed struct field; we convert
+Message-Id: <20210118123448.307825-3-kwolf@redhat.com>
-those anyway, for consistency.
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Reviewed-by: Max Reitz <mreitz@redhat.com>
 This patch was produced with the following spatch script:
 @@
 expression E;
 @@
 -be16_to_cpus(&E);
 +E = be16_to_cpu(E);
 @@
 expression E;
 @@
 -be32_to_cpus(&E);
 +E = be32_to_cpu(E);
 @@
 expression E;
 @@
 -be64_to_cpus(&E);
 +E = be64_to_cpu(E);
 @@
 expression E;
 @@
 -cpu_to_be16s(&E);
 +E = cpu_to_be16(E);
 @@
 expression E;
 @@
 -cpu_to_be32s(&E);
 +E = cpu_to_be32(E);
 @@
 expression E;
 @@
 -cpu_to_be64s(&E);
 +E = cpu_to_be64(E);
 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
 Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
 Tested-by: John Snow <jsnow@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- block/qcow2-bitmap.c | 24 ++++++++++++------------
+ tests/qtest/virtio-scsi-test.c | 39 ++++++++++++++++++++++++++++++++++
-file changed, 12 insertions(+), 12 deletions(-)
+file changed, 39 insertions(+)
-diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
+diff --git a/tests/qtest/virtio-scsi-test.c b/tests/qtest/virtio-scsi-test.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2-bitmap.c
+--- a/tests/qtest/virtio-scsi-test.c
-+++ b/block/qcow2-bitmap.c
++++ b/tests/qtest/virtio-scsi-test.c
-@@ -XXX,XX +XXX,XX @@ static inline void bitmap_table_to_be(uint64_t *bitmap_table, size_t size)
+@@ -XXX,XX +XXX,XX @@ static void test_unaligned_write_same(void *obj, void *data,
-     size_t i;
+     qvirtio_scsi_pci_free(vs);
      for (i = 0; i < size; ++i) {
 -        cpu_to_be64s(&bitmap_table[i]);
 +        bitmap_table[i] = cpu_to_be64(bitmap_table[i]);
      }
  }
-@@ -XXX,XX +XXX,XX @@ static int bitmap_table_load(BlockDriverState *bs, Qcow2BitmapTable *tb,
++static void test_write_to_cdrom(void *obj, void *data,
-     }
++                                QGuestAllocator *t_alloc)
++{
-     for (i = 0; i < tb->size; ++i) {
++    QVirtioSCSI *scsi = obj;
--        be64_to_cpus(&table[i]);
++    QVirtioSCSIQueues *vs;
-+        table[i] = be64_to_cpu(table[i]);
++    uint8_t buf[2048] = { 0 };
-         ret = check_table_entry(table[i], s->cluster_size);
++    const uint8_t write_cdb[VIRTIO_SCSI_CDB_SIZE] = {
-         if (ret < 0) {
++        /* WRITE(10) to LBA 0, transfer length 1 */
-             goto fail;
++        0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
-@@ -XXX,XX +XXX,XX @@ fail:
++    };
++    struct virtio_scsi_cmd_resp resp;
- static inline void bitmap_dir_entry_to_cpu(Qcow2BitmapDirEntry *entry)
++
 +    alloc = t_alloc;
 +    vs = qvirtio_scsi_init(scsi->vdev);
 +
 +    virtio_scsi_do_command(vs, write_cdb, NULL, 0, buf, 2048, &resp);
 +    g_assert_cmphex(resp.response, ==, 0);
 +    g_assert_cmphex(resp.status, ==, CHECK_CONDITION);
 +    g_assert_cmphex(resp.sense[0], ==, 0x70);
 +    g_assert_cmphex(resp.sense[2], ==, DATA_PROTECT);
 +    g_assert_cmphex(resp.sense[12], ==, 0x27); /* WRITE PROTECTED */
 +    g_assert_cmphex(resp.sense[13], ==, 0x00); /* WRITE PROTECTED */
 +
 +    qvirtio_scsi_pci_free(vs);
 +}
 +
  static void test_iothread_attach_node(void *obj, void *data,
                                        QGuestAllocator *t_alloc)
  {
--    be64_to_cpus(&entry->bitmap_table_offset);
+@@ -XXX,XX +XXX,XX @@ static void *virtio_scsi_setup(GString *cmd_line, void *arg)
--    be32_to_cpus(&entry->bitmap_table_size);
+     return arg;
 -    be32_to_cpus(&entry->flags);
 -    be16_to_cpus(&entry->name_size);
 -    be32_to_cpus(&entry->extra_data_size);
 +    entry->bitmap_table_offset = be64_to_cpu(entry->bitmap_table_offset);
 +    entry->bitmap_table_size = be32_to_cpu(entry->bitmap_table_size);
 +    entry->flags = be32_to_cpu(entry->flags);
 +    entry->name_size = be16_to_cpu(entry->name_size);
 +    entry->extra_data_size = be32_to_cpu(entry->extra_data_size);
  }
- static inline void bitmap_dir_entry_to_be(Qcow2BitmapDirEntry *entry)
++static void *virtio_scsi_setup_cd(GString *cmd_line, void *arg)
 +{
 +    g_string_append(cmd_line,
 +                    " -drive file=null-co://,"
 +                    "file.read-zeroes=on,"
 +                    "if=none,id=dr1,format=raw "
 +                    "-device scsi-cd,drive=dr1,lun=0,scsi-id=1");
 +    return arg;
 +}
 +
  static void *virtio_scsi_setup_iothread(GString *cmd_line, void *arg)
  {
--    cpu_to_be64s(&entry->bitmap_table_offset);
+     g_string_append(cmd_line,
--    cpu_to_be32s(&entry->bitmap_table_size);
+@@ -XXX,XX +XXX,XX @@ static void register_virtio_scsi_test(void)
--    cpu_to_be32s(&entry->flags);
+     qos_add_test("unaligned-write-same", "virtio-scsi",
--    cpu_to_be16s(&entry->name_size);
+                  test_unaligned_write_same, &opts);
--    cpu_to_be32s(&entry->extra_data_size);
-+    entry->bitmap_table_offset = cpu_to_be64(entry->bitmap_table_offset);
++    opts.before = virtio_scsi_setup_cd;
-+    entry->bitmap_table_size = cpu_to_be32(entry->bitmap_table_size);
++    qos_add_test("write-to-cdrom", "virtio-scsi", test_write_to_cdrom, &opts);
-+    entry->flags = cpu_to_be32(entry->flags);
++
-+    entry->name_size = cpu_to_be16(entry->name_size);
+     opts.before = virtio_scsi_setup_iothread;
-+    entry->extra_data_size = cpu_to_be32(entry->extra_data_size);
+     opts.edge = (QOSGraphEdgeOptions) {
- }
+         .extra_device_opts = "iothread=thread0",
  static inline int calc_dir_entry_size(size_t name_size, size_t extra_data_size)
 --
-.19.1
+.29.2

-[Qemu-devel] [PULL 07/36] crypto: initialize sector size even when opening with no IO flag
+Deleted patch
-From: Daniel P. Berrangé <berrange@redhat.com>
-The qcow2 block driver expects to see a valid sector size even when it
-has opened the crypto layer with QCRYPTO_BLOCK_OPEN_NO_IO.
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- crypto/block-qcow.c | 2 ++
-file changed, 2 insertions(+)
-diff --git a/crypto/block-qcow.c b/crypto/block-qcow.c
-index XXXXXXX..XXXXXXX 100644
---- a/crypto/block-qcow.c
-+++ b/crypto/block-qcow.c
-@@ -XXX,XX +XXX,XX @@ qcrypto_block_qcow_open(QCryptoBlock *block,
-                         Error **errp)
- {
-     if (flags & QCRYPTO_BLOCK_OPEN_NO_IO) {
-+        block->sector_size = QCRYPTO_BLOCK_QCOW_SECTOR_SIZE;
-+        block->payload_offset = 0;
-         return 0;
-     } else {
-         if (!options->u.qcow.key_secret) {
---
-.19.1

-[Qemu-devel] [PULL 08/36] qcow2: Get the request alignment for encrypted images from QCryptoBlock
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-This doesn't have any practical effect at the moment because the
-values of BDRV_SECTOR_SIZE, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE and
-QCRYPTO_BLOCK_QCOW_SECTOR_SIZE are all the same (512 bytes), but
-future encryption methods could have different requirements.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow2.c | 2 +-
-file changed, 1 insertion(+), 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 void qcow2_refresh_limits(BlockDriverState *bs, Error **errp)
-     if (bs->encrypted) {
-         /* Encryption works on a sector granularity */
--        bs->bl.request_alignment = BDRV_SECTOR_SIZE;
-+        bs->bl.request_alignment = qcrypto_block_get_sector_size(s->crypto);
-     }
-     bs->bl.pwrite_zeroes_alignment = s->cluster_size;
-     bs->bl.pdiscard_alignment = s->cluster_size;
---
-.19.1

-[Qemu-devel] [PULL 10/36] iotests: make 083 specific to raw
+Deleted patch
-From: Cleber Rosa <crosa@redhat.com>
-While testing the Python 3 changes which touch the 083 test, I noticed
-that it would fail with qcow2.  Expanding the testing, I noticed it
-had nothing to do with the Python 3 changes, and in fact, it would not
-pass on anything but raw:
- raw: pass
- bochs: not generic
- cloop: not generic
- parallels: fail
- qcow: fail
- qcow2: fail
- qed: fail
- vdi: fail
- vhdx: fail
- vmdk: fail
- vpc: fail
- luks: fail
-The errors are a mixture I/O and "image not in xxx format", such as:
-  === Check disconnect before data ===
-  Unexpected end-of-file before all bytes were read
- -read failed: Input/output error
- +can't open device nbd+tcp://127.0.0.1:PORT/foo: Could not open 'nbd://127.0.0.1:PORT/foo': Input/output error
-  === Check disconnect after data ===
- -read 512/512 bytes at offset 0
- -512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- +can't open device nbd+tcp://127.0.0.1:PORT/foo: Image not in qcow format
-I'm not aware if there's a quick fix, so, for the time being, it looks
-like the honest approach is to make the test known to work on raw
-only.
-Signed-off-by: Cleber Rosa <crosa@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/083 | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/083
-+++ b/tests/qemu-iotests/083
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--_supported_fmt generic
-+_supported_fmt raw
- _supported_proto nbd
- _supported_os Linux
---
-.19.1

-[Qemu-devel] [PULL 11/36] vpc: Don't leak opts in vpc_open()
+Deleted patch
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
----
- block/vpc.c | 2 ++
-file changed, 2 insertions(+)
-diff --git a/block/vpc.c b/block/vpc.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vpc.c
-+++ b/block/vpc.c
-@@ -XXX,XX +XXX,XX @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,
-     }
-     qemu_co_mutex_init(&s->lock);
-+    qemu_opts_del(opts);
-     return 0;
- fail:
-+    qemu_opts_del(opts);
-     qemu_vfree(s->pagetable);
- #ifdef CACHE
-     g_free(s->pageentry_u8);
---
-.19.1

-[Qemu-devel] [PULL 12/36] block/vhdx: Don't take address of fields in packed structs
+Deleted patch
-From: Peter Maydell <peter.maydell@linaro.org>
-Taking the address of a field in a packed struct is a bad idea, because
-it might not be actually aligned enough for that pointer type (and
-thus cause a crash on dereference on some host architectures). Newer
-versions of clang warn about this. Avoid the bug by not using the
-"modify in place" byte swapping functions.
-There are a few places where the in-place swap function is
-used on something other than a packed struct field; we convert
-those anyway, for consistency.
-Patch produced with scripts/coccinelle/inplace-byteswaps.cocci.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/vhdx.h        |  12 ++---
- block/vhdx-endian.c | 118 ++++++++++++++++++++++----------------------
- block/vhdx-log.c    |   4 +-
- block/vhdx.c        |  18 +++----
-files changed, 76 insertions(+), 76 deletions(-)
-diff --git a/block/vhdx.h b/block/vhdx.h
-index XXXXXXX..XXXXXXX 100644
---- a/block/vhdx.h
-+++ b/block/vhdx.h
-@@ -XXX,XX +XXX,XX @@ int vhdx_log_write_and_flush(BlockDriverState *bs, BDRVVHDXState *s,
- static inline void leguid_to_cpus(MSGUID *guid)
- {
--    le32_to_cpus(&guid->data1);
--    le16_to_cpus(&guid->data2);
--    le16_to_cpus(&guid->data3);
-+    guid->data1 = le32_to_cpu(guid->data1);
-+    guid->data2 = le16_to_cpu(guid->data2);
-+    guid->data3 = le16_to_cpu(guid->data3);
- }
- static inline void cpu_to_leguids(MSGUID *guid)
- {
--    cpu_to_le32s(&guid->data1);
--    cpu_to_le16s(&guid->data2);
--    cpu_to_le16s(&guid->data3);
-+    guid->data1 = cpu_to_le32(guid->data1);
-+    guid->data2 = cpu_to_le16(guid->data2);
-+    guid->data3 = cpu_to_le16(guid->data3);
- }
- void vhdx_header_le_import(VHDXHeader *h);
-diff --git a/block/vhdx-endian.c b/block/vhdx-endian.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vhdx-endian.c
-+++ b/block/vhdx-endian.c
-@@ -XXX,XX +XXX,XX @@ void vhdx_header_le_import(VHDXHeader *h)
- {
-     assert(h != NULL);
--    le32_to_cpus(&h->signature);
--    le32_to_cpus(&h->checksum);
--    le64_to_cpus(&h->sequence_number);
-+    h->signature = le32_to_cpu(h->signature);
-+    h->checksum = le32_to_cpu(h->checksum);
-+    h->sequence_number = le64_to_cpu(h->sequence_number);
-     leguid_to_cpus(&h->file_write_guid);
-     leguid_to_cpus(&h->data_write_guid);
-     leguid_to_cpus(&h->log_guid);
--    le16_to_cpus(&h->log_version);
--    le16_to_cpus(&h->version);
--    le32_to_cpus(&h->log_length);
--    le64_to_cpus(&h->log_offset);
-+    h->log_version = le16_to_cpu(h->log_version);
-+    h->version = le16_to_cpu(h->version);
-+    h->log_length = le32_to_cpu(h->log_length);
-+    h->log_offset = le64_to_cpu(h->log_offset);
- }
- void vhdx_header_le_export(VHDXHeader *orig_h, VHDXHeader *new_h)
-@@ -XXX,XX +XXX,XX @@ void vhdx_log_desc_le_import(VHDXLogDescriptor *d)
- {
-     assert(d != NULL);
--    le32_to_cpus(&d->signature);
--    le64_to_cpus(&d->file_offset);
--    le64_to_cpus(&d->sequence_number);
-+    d->signature = le32_to_cpu(d->signature);
-+    d->file_offset = le64_to_cpu(d->file_offset);
-+    d->sequence_number = le64_to_cpu(d->sequence_number);
- }
- void vhdx_log_desc_le_export(VHDXLogDescriptor *d)
- {
-     assert(d != NULL);
--    cpu_to_le32s(&d->signature);
--    cpu_to_le32s(&d->trailing_bytes);
--    cpu_to_le64s(&d->leading_bytes);
--    cpu_to_le64s(&d->file_offset);
--    cpu_to_le64s(&d->sequence_number);
-+    d->signature = cpu_to_le32(d->signature);
-+    d->trailing_bytes = cpu_to_le32(d->trailing_bytes);
-+    d->leading_bytes = cpu_to_le64(d->leading_bytes);
-+    d->file_offset = cpu_to_le64(d->file_offset);
-+    d->sequence_number = cpu_to_le64(d->sequence_number);
- }
- void vhdx_log_data_le_import(VHDXLogDataSector *d)
- {
-     assert(d != NULL);
--    le32_to_cpus(&d->data_signature);
--    le32_to_cpus(&d->sequence_high);
--    le32_to_cpus(&d->sequence_low);
-+    d->data_signature = le32_to_cpu(d->data_signature);
-+    d->sequence_high = le32_to_cpu(d->sequence_high);
-+    d->sequence_low = le32_to_cpu(d->sequence_low);
- }
- void vhdx_log_data_le_export(VHDXLogDataSector *d)
- {
-     assert(d != NULL);
--    cpu_to_le32s(&d->data_signature);
--    cpu_to_le32s(&d->sequence_high);
--    cpu_to_le32s(&d->sequence_low);
-+    d->data_signature = cpu_to_le32(d->data_signature);
-+    d->sequence_high = cpu_to_le32(d->sequence_high);
-+    d->sequence_low = cpu_to_le32(d->sequence_low);
- }
- void vhdx_log_entry_hdr_le_import(VHDXLogEntryHeader *hdr)
- {
-     assert(hdr != NULL);
--    le32_to_cpus(&hdr->signature);
--    le32_to_cpus(&hdr->checksum);
--    le32_to_cpus(&hdr->entry_length);
--    le32_to_cpus(&hdr->tail);
--    le64_to_cpus(&hdr->sequence_number);
--    le32_to_cpus(&hdr->descriptor_count);
-+    hdr->signature = le32_to_cpu(hdr->signature);
-+    hdr->checksum = le32_to_cpu(hdr->checksum);
-+    hdr->entry_length = le32_to_cpu(hdr->entry_length);
-+    hdr->tail = le32_to_cpu(hdr->tail);
-+    hdr->sequence_number = le64_to_cpu(hdr->sequence_number);
-+    hdr->descriptor_count = le32_to_cpu(hdr->descriptor_count);
-     leguid_to_cpus(&hdr->log_guid);
--    le64_to_cpus(&hdr->flushed_file_offset);
--    le64_to_cpus(&hdr->last_file_offset);
-+    hdr->flushed_file_offset = le64_to_cpu(hdr->flushed_file_offset);
-+    hdr->last_file_offset = le64_to_cpu(hdr->last_file_offset);
- }
- void vhdx_log_entry_hdr_le_export(VHDXLogEntryHeader *hdr)
- {
-     assert(hdr != NULL);
--    cpu_to_le32s(&hdr->signature);
--    cpu_to_le32s(&hdr->checksum);
--    cpu_to_le32s(&hdr->entry_length);
--    cpu_to_le32s(&hdr->tail);
--    cpu_to_le64s(&hdr->sequence_number);
--    cpu_to_le32s(&hdr->descriptor_count);
-+    hdr->signature = cpu_to_le32(hdr->signature);
-+    hdr->checksum = cpu_to_le32(hdr->checksum);
-+    hdr->entry_length = cpu_to_le32(hdr->entry_length);
-+    hdr->tail = cpu_to_le32(hdr->tail);
-+    hdr->sequence_number = cpu_to_le64(hdr->sequence_number);
-+    hdr->descriptor_count = cpu_to_le32(hdr->descriptor_count);
-     cpu_to_leguids(&hdr->log_guid);
--    cpu_to_le64s(&hdr->flushed_file_offset);
--    cpu_to_le64s(&hdr->last_file_offset);
-+    hdr->flushed_file_offset = cpu_to_le64(hdr->flushed_file_offset);
-+    hdr->last_file_offset = cpu_to_le64(hdr->last_file_offset);
- }
-@@ -XXX,XX +XXX,XX @@ void vhdx_region_header_le_import(VHDXRegionTableHeader *hdr)
- {
-     assert(hdr != NULL);
--    le32_to_cpus(&hdr->signature);
--    le32_to_cpus(&hdr->checksum);
--    le32_to_cpus(&hdr->entry_count);
-+    hdr->signature = le32_to_cpu(hdr->signature);
-+    hdr->checksum = le32_to_cpu(hdr->checksum);
-+    hdr->entry_count = le32_to_cpu(hdr->entry_count);
- }
- void vhdx_region_header_le_export(VHDXRegionTableHeader *hdr)
- {
-     assert(hdr != NULL);
--    cpu_to_le32s(&hdr->signature);
--    cpu_to_le32s(&hdr->checksum);
--    cpu_to_le32s(&hdr->entry_count);
-+    hdr->signature = cpu_to_le32(hdr->signature);
-+    hdr->checksum = cpu_to_le32(hdr->checksum);
-+    hdr->entry_count = cpu_to_le32(hdr->entry_count);
- }
- void vhdx_region_entry_le_import(VHDXRegionTableEntry *e)
-@@ -XXX,XX +XXX,XX @@ void vhdx_region_entry_le_import(VHDXRegionTableEntry *e)
-     assert(e != NULL);
-     leguid_to_cpus(&e->guid);
--    le64_to_cpus(&e->file_offset);
--    le32_to_cpus(&e->length);
--    le32_to_cpus(&e->data_bits);
-+    e->file_offset = le64_to_cpu(e->file_offset);
-+    e->length = le32_to_cpu(e->length);
-+    e->data_bits = le32_to_cpu(e->data_bits);
- }
- void vhdx_region_entry_le_export(VHDXRegionTableEntry *e)
-@@ -XXX,XX +XXX,XX @@ void vhdx_region_entry_le_export(VHDXRegionTableEntry *e)
-     assert(e != NULL);
-     cpu_to_leguids(&e->guid);
--    cpu_to_le64s(&e->file_offset);
--    cpu_to_le32s(&e->length);
--    cpu_to_le32s(&e->data_bits);
-+    e->file_offset = cpu_to_le64(e->file_offset);
-+    e->length = cpu_to_le32(e->length);
-+    e->data_bits = cpu_to_le32(e->data_bits);
- }
-@@ -XXX,XX +XXX,XX @@ void vhdx_metadata_header_le_import(VHDXMetadataTableHeader *hdr)
- {
-     assert(hdr != NULL);
--    le64_to_cpus(&hdr->signature);
--    le16_to_cpus(&hdr->entry_count);
-+    hdr->signature = le64_to_cpu(hdr->signature);
-+    hdr->entry_count = le16_to_cpu(hdr->entry_count);
- }
- void vhdx_metadata_header_le_export(VHDXMetadataTableHeader *hdr)
- {
-     assert(hdr != NULL);
--    cpu_to_le64s(&hdr->signature);
--    cpu_to_le16s(&hdr->entry_count);
-+    hdr->signature = cpu_to_le64(hdr->signature);
-+    hdr->entry_count = cpu_to_le16(hdr->entry_count);
- }
- void vhdx_metadata_entry_le_import(VHDXMetadataTableEntry *e)
-@@ -XXX,XX +XXX,XX @@ void vhdx_metadata_entry_le_import(VHDXMetadataTableEntry *e)
-     assert(e != NULL);
-     leguid_to_cpus(&e->item_id);
--    le32_to_cpus(&e->offset);
--    le32_to_cpus(&e->length);
--    le32_to_cpus(&e->data_bits);
-+    e->offset = le32_to_cpu(e->offset);
-+    e->length = le32_to_cpu(e->length);
-+    e->data_bits = le32_to_cpu(e->data_bits);
- }
- void vhdx_metadata_entry_le_export(VHDXMetadataTableEntry *e)
- {
-     assert(e != NULL);
-     cpu_to_leguids(&e->item_id);
--    cpu_to_le32s(&e->offset);
--    cpu_to_le32s(&e->length);
--    cpu_to_le32s(&e->data_bits);
-+    e->offset = cpu_to_le32(e->offset);
-+    e->length = cpu_to_le32(e->length);
-+    e->data_bits = cpu_to_le32(e->data_bits);
- }
-diff --git a/block/vhdx-log.c b/block/vhdx-log.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vhdx-log.c
-+++ b/block/vhdx-log.c
-@@ -XXX,XX +XXX,XX @@ static void vhdx_log_raw_to_le_sector(VHDXLogDescriptor *desc,
-     /* 8 + 4084 + 4 = 4096, 1 log sector */
-     memcpy(&desc->leading_bytes, data, 8);
-     data += 8;
--    cpu_to_le64s(&desc->leading_bytes);
-+    desc->leading_bytes = cpu_to_le64(desc->leading_bytes);
-     memcpy(sector->data, data, 4084);
-     data += 4084;
-     memcpy(&desc->trailing_bytes, data, 4);
--    cpu_to_le32s(&desc->trailing_bytes);
-+    desc->trailing_bytes = cpu_to_le32(desc->trailing_bytes);
-     data += 4;
-     sector->sequence_high  = (uint32_t) (seq >> 32);
-diff --git a/block/vhdx.c b/block/vhdx.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vhdx.c
-+++ b/block/vhdx.c
-@@ -XXX,XX +XXX,XX @@ uint32_t vhdx_update_checksum(uint8_t *buf, size_t size, int crc_offset)
-     memset(buf + crc_offset, 0, sizeof(crc));
-     crc =  crc32c(0xffffffff, buf, size);
--    cpu_to_le32s(&crc);
-+    crc = cpu_to_le32(crc);
-     memcpy(buf + crc_offset, &crc, sizeof(crc));
-     return crc;
-@@ -XXX,XX +XXX,XX @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s)
-         goto exit;
-     }
--    le32_to_cpus(&s->params.block_size);
--    le32_to_cpus(&s->params.data_bits);
-+    s->params.block_size = le32_to_cpu(s->params.block_size);
-+    s->params.data_bits = le32_to_cpu(s->params.data_bits);
-     /* We now have the file parameters, so we can tell if this is a
-@@ -XXX,XX +XXX,XX @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s)
-         goto exit;
-     }
--    le64_to_cpus(&s->virtual_disk_size);
--    le32_to_cpus(&s->logical_sector_size);
--    le32_to_cpus(&s->physical_sector_size);
-+    s->virtual_disk_size = le64_to_cpu(s->virtual_disk_size);
-+    s->logical_sector_size = le32_to_cpu(s->logical_sector_size);
-+    s->physical_sector_size = le32_to_cpu(s->physical_sector_size);
-     if (s->params.block_size < VHDX_BLOCK_SIZE_MIN ||
-         s->params.block_size > VHDX_BLOCK_SIZE_MAX) {
-@@ -XXX,XX +XXX,XX @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags,
-     /* endian convert, and verify populated BAT field file offsets against
-      * region table and log entries */
-     for (i = 0; i < s->bat_entries; i++) {
--        le64_to_cpus(&s->bat[i]);
-+        s->bat[i] = le64_to_cpu(s->bat[i]);
-         if (payblocks--) {
-             /* payload bat entries */
-             if ((s->bat[i] & VHDX_BAT_STATE_BIT_MASK) ==
-@@ -XXX,XX +XXX,XX @@ static int vhdx_create_new_metadata(BlockBackend *blk,
-     mt_file_params->block_size = cpu_to_le32(block_size);
-     if (type == VHDX_TYPE_FIXED) {
-         mt_file_params->data_bits |= VHDX_PARAMS_LEAVE_BLOCKS_ALLOCED;
--        cpu_to_le32s(&mt_file_params->data_bits);
-+        mt_file_params->data_bits = cpu_to_le32(mt_file_params->data_bits);
-     }
-     vhdx_guid_generate(&mt_page83->page_83_data);
-@@ -XXX,XX +XXX,XX @@ static int vhdx_create_bat(BlockBackend *blk, BDRVVHDXState *s,
-             sinfo.file_offset = ROUND_UP(sinfo.file_offset, MiB);
-             vhdx_update_bat_table_entry(blk_bs(blk), s, &sinfo, &unused, &unused,
-                                         block_state);
--            cpu_to_le64s(&s->bat[sinfo.bat_idx]);
-+            s->bat[sinfo.bat_idx] = cpu_to_le64(s->bat[sinfo.bat_idx]);
-             sector_num += s->sectors_per_block;
-         }
-         ret = blk_pwrite(blk, file_offset, s->bat, length, 0);
---
-.19.1

-[Qemu-devel] [PULL 13/36] block/vdi: Don't take address of fields in packed structs
+Deleted patch
-From: Peter Maydell <peter.maydell@linaro.org>
-Taking the address of a field in a packed struct is a bad idea, because
-it might not be actually aligned enough for that pointer type (and
-thus cause a crash on dereference on some host architectures). Newer
-versions of clang warn about this. Avoid the bug by not using the
-"modify in place" byte swapping functions.
-There are a few places where the in-place swap function is
-used on something other than a packed struct field; we convert
-those anyway, for consistency.
-Patch produced with scripts/coccinelle/inplace-byteswaps.cocci.
-There are other places where we take the address of a packed member
-in this file for other purposes than passing it to a byteswap
-function (all the calls to qemu_uuid_*()); we leave those for now.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/vdi.c | 64 ++++++++++++++++++++++++++---------------------------
-file changed, 32 insertions(+), 32 deletions(-)
-diff --git a/block/vdi.c b/block/vdi.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vdi.c
-+++ b/block/vdi.c
-@@ -XXX,XX +XXX,XX @@ typedef struct {
- static void vdi_header_to_cpu(VdiHeader *header)
- {
--    le32_to_cpus(&header->signature);
--    le32_to_cpus(&header->version);
--    le32_to_cpus(&header->header_size);
--    le32_to_cpus(&header->image_type);
--    le32_to_cpus(&header->image_flags);
--    le32_to_cpus(&header->offset_bmap);
--    le32_to_cpus(&header->offset_data);
--    le32_to_cpus(&header->cylinders);
--    le32_to_cpus(&header->heads);
--    le32_to_cpus(&header->sectors);
--    le32_to_cpus(&header->sector_size);
--    le64_to_cpus(&header->disk_size);
--    le32_to_cpus(&header->block_size);
--    le32_to_cpus(&header->block_extra);
--    le32_to_cpus(&header->blocks_in_image);
--    le32_to_cpus(&header->blocks_allocated);
-+    header->signature = le32_to_cpu(header->signature);
-+    header->version = le32_to_cpu(header->version);
-+    header->header_size = le32_to_cpu(header->header_size);
-+    header->image_type = le32_to_cpu(header->image_type);
-+    header->image_flags = le32_to_cpu(header->image_flags);
-+    header->offset_bmap = le32_to_cpu(header->offset_bmap);
-+    header->offset_data = le32_to_cpu(header->offset_data);
-+    header->cylinders = le32_to_cpu(header->cylinders);
-+    header->heads = le32_to_cpu(header->heads);
-+    header->sectors = le32_to_cpu(header->sectors);
-+    header->sector_size = le32_to_cpu(header->sector_size);
-+    header->disk_size = le64_to_cpu(header->disk_size);
-+    header->block_size = le32_to_cpu(header->block_size);
-+    header->block_extra = le32_to_cpu(header->block_extra);
-+    header->blocks_in_image = le32_to_cpu(header->blocks_in_image);
-+    header->blocks_allocated = le32_to_cpu(header->blocks_allocated);
-     qemu_uuid_bswap(&header->uuid_image);
-     qemu_uuid_bswap(&header->uuid_last_snap);
-     qemu_uuid_bswap(&header->uuid_link);
-@@ -XXX,XX +XXX,XX @@ static void vdi_header_to_cpu(VdiHeader *header)
- static void vdi_header_to_le(VdiHeader *header)
- {
--    cpu_to_le32s(&header->signature);
--    cpu_to_le32s(&header->version);
--    cpu_to_le32s(&header->header_size);
--    cpu_to_le32s(&header->image_type);
--    cpu_to_le32s(&header->image_flags);
--    cpu_to_le32s(&header->offset_bmap);
--    cpu_to_le32s(&header->offset_data);
--    cpu_to_le32s(&header->cylinders);
--    cpu_to_le32s(&header->heads);
--    cpu_to_le32s(&header->sectors);
--    cpu_to_le32s(&header->sector_size);
--    cpu_to_le64s(&header->disk_size);
--    cpu_to_le32s(&header->block_size);
--    cpu_to_le32s(&header->block_extra);
--    cpu_to_le32s(&header->blocks_in_image);
--    cpu_to_le32s(&header->blocks_allocated);
-+    header->signature = cpu_to_le32(header->signature);
-+    header->version = cpu_to_le32(header->version);
-+    header->header_size = cpu_to_le32(header->header_size);
-+    header->image_type = cpu_to_le32(header->image_type);
-+    header->image_flags = cpu_to_le32(header->image_flags);
-+    header->offset_bmap = cpu_to_le32(header->offset_bmap);
-+    header->offset_data = cpu_to_le32(header->offset_data);
-+    header->cylinders = cpu_to_le32(header->cylinders);
-+    header->heads = cpu_to_le32(header->heads);
-+    header->sectors = cpu_to_le32(header->sectors);
-+    header->sector_size = cpu_to_le32(header->sector_size);
-+    header->disk_size = cpu_to_le64(header->disk_size);
-+    header->block_size = cpu_to_le32(header->block_size);
-+    header->block_extra = cpu_to_le32(header->block_extra);
-+    header->blocks_in_image = cpu_to_le32(header->blocks_in_image);
-+    header->blocks_allocated = cpu_to_le32(header->blocks_allocated);
-     qemu_uuid_bswap(&header->uuid_image);
-     qemu_uuid_bswap(&header->uuid_last_snap);
-     qemu_uuid_bswap(&header->uuid_link);
---
-.19.1

-[Qemu-devel] [PULL 16/36] iotest: Test the blkverify mode of the Quorum driver
+[PULL 3/8] iotests: 146: drop extra whitespaces from .out file
-From: Alberto Garcia <berto@igalia.com>
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Alberto Garcia <berto@igalia.com>
+check script will be stricter soon about whitespaces, so fix 146.out
 now.
 Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Message-Id: <20210125185056.129513-2-vsementsov@virtuozzo.com>
 Reviewed-by: Eric Blake <eblake@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- tests/qemu-iotests/081     | 30 ++++++++++++++++++++++++++++++
+ tests/qemu-iotests/146.out | 780 ++++++++++++++++++-------------------
- tests/qemu-iotests/081.out | 16 ++++++++++++++++
+file changed, 390 insertions(+), 390 deletions(-)
 files changed, 46 insertions(+)
-diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
+diff --git a/tests/qemu-iotests/146.out b/tests/qemu-iotests/146.out
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/081
 +++ b/tests/qemu-iotests/081
@@ -XXX,XX +XXX,XX @@ echo "== checking that quorum is broken =="
  $QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size" | _filter_qemu_io
 +echo
 +echo "== checking the blkverify mode with broken content =="
 +
 +quorum="driver=raw,file.driver=quorum,file.vote-threshold=2,file.blkverify=on"
 +quorum="$quorum,file.children.0.file.filename=$TEST_DIR/1.raw"
 +quorum="$quorum,file.children.1.file.filename=$TEST_DIR/2.raw"
 +quorum="$quorum,file.children.0.driver=raw"
 +quorum="$quorum,file.children.1.driver=raw"
 +
 +$QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size" | _filter_qemu_io
 +
 +echo
 +echo "== writing the same data to both files =="
 +
 +$QEMU_IO -c "write -P 0x32 0 $size" "$TEST_DIR/1.raw" | _filter_qemu_io
 +$QEMU_IO -c "write -P 0x32 0 $size" "$TEST_DIR/2.raw" | _filter_qemu_io
 +
 +echo
 +echo "== checking the blkverify mode with valid content =="
 +
 +$QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size" | _filter_qemu_io
 +
 +echo
 +echo "== checking the blkverify mode with invalid settings =="
 +
 +quorum="$quorum,file.children.2.file.filename=$TEST_DIR/3.raw"
 +quorum="$quorum,file.children.2.driver=raw"
 +
 +$QEMU_IO -c "open -o $quorum" | _filter_qemu_io
 +
  # success, all done
  echo "*** done"
  rm -f $seq.full
 diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/081.out
+--- a/tests/qemu-iotests/146.out
-+++ b/tests/qemu-iotests/081.out
++++ b/tests/qemu-iotests/146.out
-@@ -XXX,XX +XXX,XX @@ wrote 10485760/10485760 bytes at offset 0
+@@ -XXX,XX +XXX,XX @@ QA output created by 146
- == checking that quorum is broken ==
+ === Testing VPC Autodetect ===
- read failed: Input/output error
-+
+-[{ "start": 0, "length": 136363130880, "depth": 0, "zero": true, "data": false }]
-+== checking the blkverify mode with broken content ==
++[{ "start": 0, "length": 136363130880, "depth": 0, "zero": true, "data": false}]
-+quorum: offset=0 bytes=10485760 contents mismatch at offset 0
-+
+ === Testing VPC with current_size force ===
-+== writing the same data to both files ==
-+wrote 10485760/10485760 bytes at offset 0
+-[{ "start": 0, "length": 136365211648, "depth": 0, "zero": true, "data": false }]
-+10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
++[{ "start": 0, "length": 136365211648, "depth": 0, "zero": true, "data": false}]
-+wrote 10485760/10485760 bytes at offset 0
-+10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+ === Testing VPC with chs force ===
-+
-+== checking the blkverify mode with valid content ==
+-[{ "start": 0, "length": 136363130880, "depth": 0, "zero": true, "data": false }]
-+read 10485760/10485760 bytes at offset 0
++[{ "start": 0, "length": 136363130880, "depth": 0, "zero": true, "data": false}]
-+10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+
+ === Testing Hyper-V Autodetect ===
-+== checking the blkverify mode with invalid settings ==
-+can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
+-[{ "start": 0, "length": 136365211648, "depth": 0, "zero": true, "data": false }]
 +[{ "start": 0, "length": 136365211648, "depth": 0, "zero": true, "data": false}]
  === Testing Hyper-V with current_size force ===
 -[{ "start": 0, "length": 136365211648, "depth": 0, "zero": true, "data": false }]
 +[{ "start": 0, "length": 136365211648, "depth": 0, "zero": true, "data": false}]
  === Testing Hyper-V with chs force ===
 -[{ "start": 0, "length": 136363130880, "depth": 0, "zero": true, "data": false }]
 +[{ "start": 0, "length": 136363130880, "depth": 0, "zero": true, "data": false}]
  === Testing d2v Autodetect ===
 -[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 4194304, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 6291456, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 8388608, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 10485760, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 12582912, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 14680064, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 16777216, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 18874368, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 20971520, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 23068672, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 25165824, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 27262976, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 29360128, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 31457280, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 33554432, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 35651584, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 37748736, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 39845888, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 41943040, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 44040192, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 46137344, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 48234496, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 50331648, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 52428800, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 54525952, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 56623104, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 58720256, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 60817408, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 62914560, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 65011712, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 67108864, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 69206016, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 71303168, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 73400320, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 75497472, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 77594624, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 79691776, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 81788928, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 83886080, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 85983232, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 88080384, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 90177536, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 92274688, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 94371840, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 96468992, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 98566144, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 100663296, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 102760448, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 104857600, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 106954752, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 109051904, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 111149056, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 113246208, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 115343360, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 117440512, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 119537664, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 121634816, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 123731968, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 125829120, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 127926272, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 130023424, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 132120576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 134217728, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 136314880, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 138412032, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 140509184, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 142606336, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 144703488, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 146800640, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 148897792, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 150994944, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 153092096, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 155189248, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 157286400, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 159383552, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 161480704, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 163577856, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 165675008, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 167772160, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 169869312, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 171966464, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 174063616, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 176160768, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 178257920, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 180355072, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 182452224, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 184549376, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 186646528, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 188743680, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 190840832, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 192937984, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 195035136, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 197132288, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 199229440, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 201326592, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 203423744, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 205520896, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 207618048, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 209715200, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 211812352, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 213909504, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 216006656, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 218103808, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 220200960, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 222298112, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 224395264, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 226492416, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 228589568, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 230686720, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 232783872, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 234881024, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 236978176, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 239075328, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 241172480, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 243269632, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 245366784, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 247463936, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 249561088, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 251658240, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 253755392, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 255852544, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 257949696, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 260046848, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 262144000, "length": 1310720, "depth": 0, "zero": false, "data": true, "offset": OFFSET }]
 +[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 4194304, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 6291456, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 8388608, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 10485760, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 12582912, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 14680064, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 16777216, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 18874368, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 20971520, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 23068672, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 25165824, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 27262976, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 29360128, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 31457280, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 33554432, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 35651584, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 37748736, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 39845888, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 41943040, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 44040192, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 46137344, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 48234496, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 50331648, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 52428800, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 54525952, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 56623104, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 58720256, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 60817408, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 62914560, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 65011712, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 67108864, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 69206016, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 71303168, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 73400320, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 75497472, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 77594624, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 79691776, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 81788928, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 83886080, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 85983232, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 88080384, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 90177536, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 92274688, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 94371840, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 96468992, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 98566144, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 100663296, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 102760448, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 104857600, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 106954752, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 109051904, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 111149056, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 113246208, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 115343360, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 117440512, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 119537664, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 121634816, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 123731968, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 125829120, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 127926272, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 130023424, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 132120576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 134217728, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 136314880, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 138412032, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 140509184, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 142606336, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 144703488, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 146800640, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 148897792, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 150994944, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 153092096, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 155189248, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 157286400, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 159383552, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 161480704, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 163577856, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 165675008, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 167772160, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 169869312, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 171966464, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 174063616, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 176160768, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 178257920, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 180355072, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 182452224, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 184549376, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 186646528, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 188743680, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 190840832, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 192937984, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 195035136, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 197132288, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 199229440, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 201326592, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 203423744, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 205520896, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 207618048, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 209715200, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 211812352, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 213909504, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 216006656, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 218103808, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 220200960, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 222298112, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 224395264, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 226492416, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 228589568, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 230686720, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 232783872, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 234881024, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 236978176, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 239075328, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 241172480, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 243269632, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 245366784, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 247463936, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 249561088, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 251658240, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 253755392, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 255852544, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 257949696, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 260046848, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 262144000, "length": 1310720, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
  === Testing d2v with current_size force ===
 -[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 4194304, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 6291456, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 8388608, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 10485760, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 12582912, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 14680064, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 16777216, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 18874368, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 20971520, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 23068672, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 25165824, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 27262976, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 29360128, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 31457280, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 33554432, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 35651584, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 37748736, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 39845888, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 41943040, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 44040192, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 46137344, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 48234496, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 50331648, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 52428800, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 54525952, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 56623104, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 58720256, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 60817408, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 62914560, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 65011712, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 67108864, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 69206016, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 71303168, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 73400320, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 75497472, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 77594624, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 79691776, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 81788928, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 83886080, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 85983232, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 88080384, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 90177536, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 92274688, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 94371840, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 96468992, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 98566144, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 100663296, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 102760448, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 104857600, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 106954752, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 109051904, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 111149056, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 113246208, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 115343360, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 117440512, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 119537664, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 121634816, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 123731968, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 125829120, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 127926272, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 130023424, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 132120576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 134217728, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 136314880, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 138412032, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 140509184, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 142606336, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 144703488, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 146800640, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 148897792, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 150994944, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 153092096, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 155189248, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 157286400, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 159383552, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 161480704, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 163577856, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 165675008, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 167772160, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 169869312, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 171966464, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 174063616, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 176160768, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 178257920, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 180355072, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 182452224, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 184549376, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 186646528, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 188743680, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 190840832, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 192937984, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 195035136, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 197132288, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 199229440, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 201326592, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 203423744, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 205520896, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 207618048, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 209715200, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 211812352, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 213909504, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 216006656, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 218103808, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 220200960, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 222298112, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 224395264, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 226492416, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 228589568, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 230686720, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 232783872, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 234881024, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 236978176, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 239075328, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 241172480, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 243269632, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 245366784, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 247463936, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 249561088, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 251658240, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 253755392, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 255852544, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 257949696, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 260046848, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 262144000, "length": 1310720, "depth": 0, "zero": false, "data": true, "offset": OFFSET }]
 +[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 4194304, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 6291456, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 8388608, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 10485760, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 12582912, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 14680064, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 16777216, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 18874368, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 20971520, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 23068672, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 25165824, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 27262976, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 29360128, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 31457280, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 33554432, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 35651584, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 37748736, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 39845888, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 41943040, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 44040192, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 46137344, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 48234496, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 50331648, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 52428800, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 54525952, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 56623104, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 58720256, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 60817408, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 62914560, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 65011712, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 67108864, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 69206016, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 71303168, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 73400320, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 75497472, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 77594624, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 79691776, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 81788928, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 83886080, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 85983232, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 88080384, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 90177536, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 92274688, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 94371840, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 96468992, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 98566144, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 100663296, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 102760448, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 104857600, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 106954752, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 109051904, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 111149056, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 113246208, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 115343360, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 117440512, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 119537664, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 121634816, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 123731968, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 125829120, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 127926272, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 130023424, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 132120576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 134217728, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 136314880, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 138412032, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 140509184, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 142606336, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 144703488, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 146800640, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 148897792, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 150994944, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 153092096, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 155189248, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 157286400, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 159383552, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 161480704, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 163577856, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 165675008, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 167772160, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 169869312, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 171966464, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 174063616, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 176160768, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 178257920, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 180355072, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 182452224, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 184549376, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 186646528, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 188743680, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 190840832, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 192937984, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 195035136, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 197132288, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 199229440, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 201326592, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 203423744, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 205520896, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 207618048, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 209715200, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 211812352, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 213909504, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 216006656, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 218103808, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 220200960, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 222298112, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 224395264, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 226492416, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 228589568, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 230686720, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 232783872, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 234881024, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 236978176, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 239075328, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 241172480, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 243269632, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 245366784, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 247463936, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 249561088, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 251658240, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 253755392, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 255852544, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 257949696, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 260046848, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 262144000, "length": 1310720, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
  === Testing d2v with chs force ===
 -[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 4194304, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 6291456, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 8388608, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 10485760, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 12582912, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 14680064, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 16777216, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 18874368, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 20971520, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 23068672, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 25165824, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 27262976, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 29360128, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 31457280, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 33554432, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 35651584, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 37748736, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 39845888, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 41943040, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 44040192, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 46137344, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 48234496, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 50331648, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 52428800, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 54525952, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 56623104, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 58720256, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 60817408, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 62914560, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 65011712, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 67108864, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 69206016, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 71303168, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 73400320, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 75497472, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 77594624, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 79691776, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 81788928, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 83886080, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 85983232, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 88080384, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 90177536, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 92274688, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 94371840, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 96468992, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 98566144, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 100663296, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 102760448, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 104857600, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 106954752, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 109051904, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 111149056, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 113246208, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 115343360, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 117440512, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 119537664, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 121634816, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 123731968, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 125829120, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 127926272, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 130023424, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 132120576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 134217728, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 136314880, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 138412032, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 140509184, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 142606336, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 144703488, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 146800640, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 148897792, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 150994944, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 153092096, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 155189248, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 157286400, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 159383552, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 161480704, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 163577856, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 165675008, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 167772160, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 169869312, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 171966464, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 174063616, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 176160768, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 178257920, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 180355072, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 182452224, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 184549376, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 186646528, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 188743680, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 190840832, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 192937984, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 195035136, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 197132288, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 199229440, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 201326592, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 203423744, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 205520896, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 207618048, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 209715200, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 211812352, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 213909504, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 216006656, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 218103808, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 220200960, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 222298112, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 224395264, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 226492416, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 228589568, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 230686720, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 232783872, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 234881024, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 236978176, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 239075328, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 241172480, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 243269632, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 245366784, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 247463936, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 249561088, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 251658240, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 253755392, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 255852544, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 257949696, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 260046848, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
 -{ "start": 262144000, "length": 1310720, "depth": 0, "zero": false, "data": true, "offset": OFFSET }]
 +[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 4194304, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 6291456, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 8388608, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 10485760, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 12582912, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 14680064, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 16777216, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 18874368, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 20971520, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 23068672, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 25165824, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 27262976, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 29360128, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 31457280, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 33554432, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 35651584, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 37748736, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 39845888, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 41943040, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 44040192, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 46137344, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 48234496, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 50331648, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 52428800, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 54525952, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 56623104, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 58720256, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 60817408, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 62914560, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 65011712, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 67108864, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 69206016, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 71303168, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 73400320, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 75497472, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 77594624, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 79691776, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 81788928, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 83886080, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 85983232, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 88080384, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 90177536, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 92274688, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 94371840, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 96468992, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 98566144, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 100663296, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 102760448, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 104857600, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 106954752, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 109051904, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 111149056, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 113246208, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 115343360, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 117440512, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 119537664, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 121634816, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 123731968, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 125829120, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 127926272, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 130023424, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 132120576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 134217728, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 136314880, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 138412032, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 140509184, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 142606336, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 144703488, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 146800640, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 148897792, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 150994944, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 153092096, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 155189248, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 157286400, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 159383552, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 161480704, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 163577856, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 165675008, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 167772160, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 169869312, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 171966464, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 174063616, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 176160768, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 178257920, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 180355072, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 182452224, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 184549376, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 186646528, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 188743680, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 190840832, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 192937984, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 195035136, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 197132288, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 199229440, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 201326592, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 203423744, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 205520896, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 207618048, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 209715200, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 211812352, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 213909504, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 216006656, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 218103808, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 220200960, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 222298112, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 224395264, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 226492416, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 228589568, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 230686720, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 232783872, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 234881024, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 236978176, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 239075328, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 241172480, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 243269632, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 245366784, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 247463936, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 249561088, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 251658240, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 253755392, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 255852544, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 257949696, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 260046848, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 262144000, "length": 1310720, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
  === Testing Image create, default ===
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/IMGFMT-create-test.IMGFMT', fmt=IMGFMT size=4294967296
  === Read created image, default opts ====
 -[{ "start": 0, "length": 4295467008, "depth": 0, "zero": true, "data": false }]
 +[{ "start": 0, "length": 4295467008, "depth": 0, "zero": true, "data": false}]
  === Read created image, force_size_calc=chs ====
 -[{ "start": 0, "length": 4295467008, "depth": 0, "zero": true, "data": false }]
 +[{ "start": 0, "length": 4295467008, "depth": 0, "zero": true, "data": false}]
  === Read created image, force_size_calc=current_size ====
 -[{ "start": 0, "length": 4295467008, "depth": 0, "zero": true, "data": false }]
 +[{ "start": 0, "length": 4295467008, "depth": 0, "zero": true, "data": false}]
  === Testing Image create, force_size ===
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/IMGFMT-create-test.IMGFMT', fmt=IMGFMT size=4294967296
  === Read created image, default opts ====
 -[{ "start": 0, "length": 4294967296, "depth": 0, "zero": true, "data": false }]
 +[{ "start": 0, "length": 4294967296, "depth": 0, "zero": true, "data": false}]
  === Read created image, force_size_calc=chs ====
 -[{ "start": 0, "length": 4294967296, "depth": 0, "zero": true, "data": false }]
 +[{ "start": 0, "length": 4294967296, "depth": 0, "zero": true, "data": false}]
  === Read created image, force_size_calc=current_size ====
 -[{ "start": 0, "length": 4294967296, "depth": 0, "zero": true, "data": false }]
 +[{ "start": 0, "length": 4294967296, "depth": 0, "zero": true, "data": false}]
  *** done
 --
-.19.1
+.29.2

-[Qemu-devel] [PULL 36/36] include: Add a comment to explain the origin of sizes' lookup table
+[PULL 4/8] iotests: add findtests.py
-From: Leonid Bloch <lbloch@janustech.com>
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-The lookup table for power-of-two sizes was added in commit 540b8492618eb
+Add python script with new logic of searching for tests:
-for the purpose of having convenient shortcuts for these sizes in cases
-when the literal number has to be present at compile time, and
+Current ./check behavior:
-expressions as '(1 * KiB)' can not be used. One such case is the
+ - tests are named [0-9][0-9][0-9]
-stringification of sizes. Beyond that, it is convenient to use these
+ - tests must be registered in group file (even if test doesn't belong
-shortcuts for all power-of-two sizes, even if they don't have to be
+   to any group, like 142)
-literal numbers.
+Behavior of findtests.py:
-Despite its convenience, this table introduced 55 lines of "dumb" code,
+ - group file is dropped
-the purpose and origin of which are obscure without reading the message
+ - tests are all files in tests/ subdirectory (except for .out files),
-of the commit which introduced it. This patch fixes that by adding a
+   so it's not needed more to "register the test", just create it with
-comment to the code itself with a brief explanation for the reasoning
+   appropriate name in tests/ subdirectory. Old names like
-behind this table. This comment includes the short AWK script that
+   [0-9][0-9][0-9] (in root iotests directory) are supported too, but
-generated the table, so that anyone who's interested could make sure
+   not recommended for new tests
-that the values in it are correct (otherwise these values look as if
+ - groups are parsed from '# group: ' line inside test files
-they were typed manually).
+ - optional file group.local may be used to define some additional
+   groups for downstreams
-Signed-off-by: Leonid Bloch <lbloch@janustech.com>
+ - 'disabled' group is used to temporary disable tests. So instead of
    commenting tests in old 'group' file you now can add them to
    disabled group with help of 'group.local' file
  - selecting test ranges like 5-15 are not supported more
    (to support restarting failed ./check command from the middle of the
     process, new argument is added: --start-from)
 Benefits:
  - no rebase conflicts in group file on patch porting from branch to
    branch
  - no conflicts in upstream, when different series want to occupy same
    test number
  - meaningful names for test files
    For example, with digital number, when some person wants to add some
    test about block-stream, he most probably will just create a new
    test. But if there would be test-block-stream test already, he will
    at first look at it and may be just add a test-case into it.
    And anyway meaningful names are better.
 This commit doesn't update check behavior (which will be done in
 further commit), still, the documentation changed like new behavior is
 already here.  Let's live with this small inconsistency for the
 following few commits, until final change.
 Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Reviewed-by: Eric Blake <eblake@redhat.com>
 Message-Id: <20210125185056.129513-3-vsementsov@virtuozzo.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- include/qemu/units.h | 18 ++++++++++++++++++
+ docs/devel/testing.rst          |  50 +++++++++-
-file changed, 18 insertions(+)
+ tests/qemu-iotests/findtests.py | 159 ++++++++++++++++++++++++++++++++
+files changed, 208 insertions(+), 1 deletion(-)
-diff --git a/include/qemu/units.h b/include/qemu/units.h
+ create mode 100644 tests/qemu-iotests/findtests.py
 diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
 index XXXXXXX..XXXXXXX 100644
---- a/include/qemu/units.h
+--- a/docs/devel/testing.rst
-+++ b/include/qemu/units.h
++++ b/docs/devel/testing.rst
@@ -XXX,XX +XXX,XX @@ check-block
  -----------
  ``make check-block`` runs a subset of the block layer iotests (the tests that
 -are in the "auto" group in ``tests/qemu-iotests/group``).
 +are in the "auto" group).
  See the "QEMU iotests" section below for more information.
  GCC gcov support
@@ -XXX,XX +XXX,XX @@ another application on the host may have locked the file, possibly leading to a
  test failure.  If using such devices are explicitly desired, consider adding
  ``locking=off`` option to disable image locking.
 +Test case groups
 +----------------
 +
 +"Tests may belong to one or more test groups, which are defined in the form
 +of a comment in the test source file. By convention, test groups are listed
 +in the second line of the test file, after the "#!/..." line, like this:
 +
 +.. code::
 +
 +  #!/usr/bin/env python3
 +  # group: auto quick
 +  #
 +  ...
 +
 +Another way of defining groups is creating the tests/qemu-iotests/group.local
 +file. This should be used only for downstream (this file should never appear
 +in upstream). This file may be used for defining some downstream test groups
 +or for temporarily disabling tests, like this:
 +
 +.. code::
 +
 +  # groups for some company downstream process
 +  #
 +  # ci - tests to run on build
 +  # down - our downstream tests, not for upstream
 +  #
 +  # Format of each line is:
 +  # TEST_NAME TEST_GROUP [TEST_GROUP ]...
 +
 +  013 ci
 +  210 disabled
 +  215 disabled
 +  our-ugly-workaround-test down ci
 +
 +Note that the following group names have a special meaning:
 +
 +- quick: Tests in this group should finish within a few seconds.
 +
 +- auto: Tests in this group are used during "make check" and should be
 +  runnable in any case. That means they should run with every QEMU binary
 +  (also non-x86), with every QEMU configuration (i.e. must not fail if
 +  an optional feature is not compiled in - but reporting a "skip" is ok),
 +  work at least with the qcow2 file format, work with all kind of host
 +  filesystems and users (e.g. "nobody" or "root") and must not take too
 +  much memory and disk space (since CI pipelines tend to fail otherwise).
 +
 +- disabled: Tests in this group are disabled and ignored by check.
 +
  .. _docker-ref:
  Docker based tests
 diff --git a/tests/qemu-iotests/findtests.py b/tests/qemu-iotests/findtests.py
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/tests/qemu-iotests/findtests.py
 @@ -XXX,XX +XXX,XX @@
- #define PiB     (INT64_C(1) << 50)
++# TestFinder class, define set of tests to run.
- #define EiB     (INT64_C(1) << 60)
++#
++# Copyright (c) 2020-2021 Virtuozzo International GmbH
-+/*
++#
-+ * The following lookup table is intended to be used when a literal string of
++# This program is free software; you can redistribute it and/or modify
-+ * the number of bytes is required (for example if it needs to be stringified).
++# it under the terms of the GNU General Public License as published by
-+ * It can also be used for generic shortcuts of power-of-two sizes.
++# the Free Software Foundation; either version 2 of the License, or
-+ * This table is generated using the AWK script below:
++# (at your option) any later version.
-+ *
++#
-+ *  BEGIN {
++# This program is distributed in the hope that it will be useful,
-+ *      suffix="KMGTPE";
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *      for(i=10; i<64; i++) {
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *          val=2**i;
++# GNU General Public License for more details.
-+ *          s=substr(suffix, int(i/10), 1);
++#
-+ *          n=2**(i%10);
++# You should have received a copy of the GNU General Public License
-+ *          pad=21-int(log(n)/log(10));
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *          printf("#define S_%d%siB %*d\n", n, s, pad, val);
++#
-+ *      }
++
-+ *  }
++import os
-+ */
++import glob
-+
++import re
- #define S_1KiB                  1024
++from collections import defaultdict
- #define S_2KiB                  2048
++from contextlib import contextmanager
- #define S_4KiB                  4096
++from typing import Optional, List, Iterator, Set
 +
 +
 +@contextmanager
 +def chdir(path: Optional[str] = None) -> Iterator[None]:
 +    if path is None:
 +        yield
 +        return
 +
 +    saved_dir = os.getcwd()
 +    os.chdir(path)
 +    try:
 +        yield
 +    finally:
 +        os.chdir(saved_dir)
 +
 +
 +class TestFinder:
 +    def __init__(self, test_dir: Optional[str] = None) -> None:
 +        self.groups = defaultdict(set)
 +
 +        with chdir(test_dir):
 +            self.all_tests = glob.glob('[0-9][0-9][0-9]')
 +            self.all_tests += [f for f in glob.iglob('tests/*')
 +                               if not f.endswith('.out') and
 +                               os.path.isfile(f + '.out')]
 +
 +            for t in self.all_tests:
 +                with open(t, encoding="utf-8") as f:
 +                    for line in f:
 +                        if line.startswith('# group: '):
 +                            for g in line.split()[2:]:
 +                                self.groups[g].add(t)
 +                            break
 +
 +    def add_group_file(self, fname: str) -> None:
 +        with open(fname, encoding="utf-8") as f:
 +            for line in f:
 +                line = line.strip()
 +
 +                if (not line) or line[0] == '#':
 +                    continue
 +
 +                words = line.split()
 +                test_file = self.parse_test_name(words[0])
 +                groups = words[1:]
 +
 +                for g in groups:
 +                    self.groups[g].add(test_file)
 +
 +    def parse_test_name(self, name: str) -> str:
 +        if '/' in name:
 +            raise ValueError('Paths are unsupported for test selection, '
 +                             f'requiring "{name}" is wrong')
 +
 +        if re.fullmatch(r'\d+', name):
 +            # Numbered tests are old naming convention. We should convert them
 +            # to three-digit-length, like 1 --> 001.
 +            name = f'{int(name):03}'
 +        else:
 +            # Named tests all should be in tests/ subdirectory
 +            name = os.path.join('tests', name)
 +
 +        if name not in self.all_tests:
 +            raise ValueError(f'Test "{name}" is not found')
 +
 +        return name
 +
 +    def find_tests(self, groups: Optional[List[str]] = None,
 +                   exclude_groups: Optional[List[str]] = None,
 +                   tests: Optional[List[str]] = None,
 +                   start_from: Optional[str] = None) -> List[str]:
 +        """Find tests
 +
 +        Algorithm:
 +
 +        1. a. if some @groups specified
 +             a.1 Take all tests from @groups
 +             a.2 Drop tests, which are in at least one of @exclude_groups or in
 +                 'disabled' group (if 'disabled' is not listed in @groups)
 +             a.3 Add tests from @tests (don't exclude anything from them)
 +
 +           b. else, if some @tests specified:
 +             b.1 exclude_groups must be not specified, so just take @tests
 +
 +           c. else (only @exclude_groups list is non-empty):
 +             c.1 Take all tests
 +             c.2 Drop tests, which are in at least one of @exclude_groups or in
 +                 'disabled' group
 +
 +        2. sort
 +
 +        3. If start_from specified, drop tests from first one to @start_from
 +           (not inclusive)
 +        """
 +        if groups is None:
 +            groups = []
 +        if exclude_groups is None:
 +            exclude_groups = []
 +        if tests is None:
 +            tests = []
 +
 +        res: Set[str] = set()
 +        if groups:
 +            # Some groups specified. exclude_groups supported, additionally
 +            # selecting some individual tests supported as well.
 +            res.update(*(self.groups[g] for g in groups))
 +        elif tests:
 +            # Some individual tests specified, but no groups. In this case
 +            # we don't support exclude_groups.
 +            if exclude_groups:
 +                raise ValueError("Can't exclude from individually specified "
 +                                 "tests.")
 +        else:
 +            # No tests no groups: start from all tests, exclude_groups
 +            # supported.
 +            res.update(self.all_tests)
 +
 +        if 'disabled' not in groups and 'disabled' not in exclude_groups:
 +            # Don't want to modify function argument, so create new list.
 +            exclude_groups = exclude_groups + ['disabled']
 +
 +        res = res.difference(*(self.groups[g] for g in exclude_groups))
 +
 +        # We want to add @tests. But for compatibility with old test names,
 +        # we should convert any number < 100 to number padded by
 +        # leading zeroes, like 1 -> 001 and 23 -> 023.
 +        for t in tests:
 +            res.add(self.parse_test_name(t))
 +
 +        sequence = sorted(res)
 +
 +        if start_from is not None:
 +            del sequence[:sequence.index(self.parse_test_name(start_from))]
 +
 +        return sequence
 --
-.19.1
+.29.2

-[Qemu-devel] [PULL 35/36] vdi: Use a literal number of bytes for DEFAULT_CLUSTER_SIZE
+[PULL 5/8] iotests: add testenv.py
-From: Leonid Bloch <lbloch@janustech.com>
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-If an expression is used to define DEFAULT_CLUSTER_SIZE, when compiled,
+Add TestEnv class, which will handle test environment in a new python
-it will be embedded as a literal expression in the binary (as the
+iotests running framework.
-default value) because it is stringified to mark the size of the default
-value. Now this is fixed by using a defined number to define this value.
+Don't add compat=1.1 for qcow2 IMGOPTS, as v3 is default anyway.
-Signed-off-by: Leonid Bloch <lbloch@janustech.com>
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Stefan Weil <sw@weilnetz.de>
+Message-Id: <20210125185056.129513-4-vsementsov@virtuozzo.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- block/vdi.c | 4 ++--
+ tests/qemu-iotests/testenv.py | 281 ++++++++++++++++++++++++++++++++++
-file changed, 2 insertions(+), 2 deletions(-)
+file changed, 281 insertions(+)
+ create mode 100644 tests/qemu-iotests/testenv.py
-diff --git a/block/vdi.c b/block/vdi.c
-index XXXXXXX..XXXXXXX 100644
+diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
---- a/block/vdi.c
+new file mode 100644
-+++ b/block/vdi.c
+index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/tests/qemu-iotests/testenv.py
 @@ -XXX,XX +XXX,XX @@
- #define BLOCK_OPT_STATIC "static"
++# TestEnv class to manage test environment variables.
++#
- #define SECTOR_SIZE 512
++# Copyright (c) 2020-2021 Virtuozzo International GmbH
--#define DEFAULT_CLUSTER_SIZE (1 * MiB)
++#
-+#define DEFAULT_CLUSTER_SIZE S_1MiB
++# 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
- #if defined(CONFIG_VDI_DEBUG)
++# the Free Software Foundation; either version 2 of the License, or
- #define VDI_DEBUG 1
++# (at your option) any later version.
-@@ -XXX,XX +XXX,XX @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,
++#
-         goto fail;
++# This program is distributed in the hope that it will be useful,
-     } else if (header.block_size != DEFAULT_CLUSTER_SIZE) {
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
-         error_setg(errp, "unsupported VDI image (block size %" PRIu32
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--                         " is not %" PRIu64 ")",
++# GNU General Public License for more details.
-+                         " is not %" PRIu32 ")",
++#
-                    header.block_size, DEFAULT_CLUSTER_SIZE);
++# You should have received a copy of the GNU General Public License
-         ret = -ENOTSUP;
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-         goto fail;
++#
 +
 +import os
 +import sys
 +import tempfile
 +from pathlib import Path
 +import shutil
 +import collections
 +import random
 +import subprocess
 +import glob
 +from typing import Dict, Any, Optional, ContextManager
 +
 +
 +def isxfile(path: str) -> bool:
 +    return os.path.isfile(path) and os.access(path, os.X_OK)
 +
 +
 +def get_default_machine(qemu_prog: str) -> str:
 +    outp = subprocess.run([qemu_prog, '-machine', 'help'], check=True,
 +                          universal_newlines=True,
 +                          stdout=subprocess.PIPE).stdout
 +
 +    machines = outp.split('\n')
 +    try:
 +        default_machine = next(m for m in machines if m.endswith(' (default)'))
 +    except StopIteration:
 +        return ''
 +    default_machine = default_machine.split(' ', 1)[0]
 +
 +    alias_suf = ' (alias of {})'.format(default_machine)
 +    alias = next((m for m in machines if m.endswith(alias_suf)), None)
 +    if alias is not None:
 +        default_machine = alias.split(' ', 1)[0]
 +
 +    return default_machine
 +
 +
 +class TestEnv(ContextManager['TestEnv']):
 +    """
 +    Manage system environment for running tests
 +
 +    The following variables are supported/provided. They are represented by
 +    lower-cased TestEnv attributes.
 +    """
 +
 +    # We store environment variables as instance attributes, and there are a
 +    # lot of them. Silence pylint:
 +    # pylint: disable=too-many-instance-attributes
 +
 +    env_variables = ['PYTHONPATH', 'TEST_DIR', 'SOCK_DIR', 'SAMPLE_IMG_DIR',
 +                     'OUTPUT_DIR', 'PYTHON', 'QEMU_PROG', 'QEMU_IMG_PROG',
 +                     'QEMU_IO_PROG', 'QEMU_NBD_PROG', 'QSD_PROG',
 +                     'SOCKET_SCM_HELPER', 'QEMU_OPTIONS', 'QEMU_IMG_OPTIONS',
 +                     'QEMU_IO_OPTIONS', 'QEMU_IO_OPTIONS_NO_FMT',
 +                     'QEMU_NBD_OPTIONS', 'IMGOPTS', 'IMGFMT', 'IMGPROTO',
 +                     'AIOMODE', 'CACHEMODE', 'VALGRIND_QEMU',
 +                     'CACHEMODE_IS_DEFAULT', 'IMGFMT_GENERIC', 'IMGOPTSSYNTAX',
 +                     'IMGKEYSECRET', 'QEMU_DEFAULT_MACHINE', 'MALLOC_PERTURB_']
 +
 +    def get_env(self) -> Dict[str, str]:
 +        env = {}
 +        for v in self.env_variables:
 +            val = getattr(self, v.lower(), None)
 +            if val is not None:
 +                env[v] = val
 +
 +        return env
 +
 +    def init_directories(self) -> None:
 +        """Init directory variables:
 +             PYTHONPATH
 +             TEST_DIR
 +             SOCK_DIR
 +             SAMPLE_IMG_DIR
 +             OUTPUT_DIR
 +        """
 +        self.pythonpath = os.getenv('PYTHONPATH')
 +        if self.pythonpath:
 +            self.pythonpath = self.source_iotests + os.pathsep + \
 +                self.pythonpath
 +        else:
 +            self.pythonpath = self.source_iotests
 +
 +        self.test_dir = os.getenv('TEST_DIR',
 +                                  os.path.join(os.getcwd(), 'scratch'))
 +        Path(self.test_dir).mkdir(parents=True, exist_ok=True)
 +
 +        try:
 +            self.sock_dir = os.environ['SOCK_DIR']
 +            self.tmp_sock_dir = False
 +            Path(self.test_dir).mkdir(parents=True, exist_ok=True)
 +        except KeyError:
 +            self.sock_dir = tempfile.mkdtemp()
 +            self.tmp_sock_dir = True
 +
 +        self.sample_img_dir = os.getenv('SAMPLE_IMG_DIR',
 +                                        os.path.join(self.source_iotests,
 +                                                     'sample_images'))
 +
 +        self.output_dir = os.getcwd()  # OUTPUT_DIR
 +
 +    def init_binaries(self) -> None:
 +        """Init binary path variables:
 +             PYTHON (for bash tests)
 +             QEMU_PROG, QEMU_IMG_PROG, QEMU_IO_PROG, QEMU_NBD_PROG, QSD_PROG
 +             SOCKET_SCM_HELPER
 +        """
 +        self.python = sys.executable
 +
 +        def root(*names: str) -> str:
 +            return os.path.join(self.build_root, *names)
 +
 +        arch = os.uname().machine
 +        if 'ppc64' in arch:
 +            arch = 'ppc64'
 +
 +        self.qemu_prog = os.getenv('QEMU_PROG', root(f'qemu-system-{arch}'))
 +        if not os.path.exists(self.qemu_prog):
 +            pattern = root('qemu-system-*')
 +            try:
 +                progs = glob.iglob(pattern)
 +                self.qemu_prog = next(p for p in progs if isxfile(p))
 +            except StopIteration:
 +                sys.exit("Not found any Qemu executable binary by pattern "
 +                         f"'{pattern}'")
 +
 +        self.qemu_img_prog = os.getenv('QEMU_IMG_PROG', root('qemu-img'))
 +        self.qemu_io_prog = os.getenv('QEMU_IO_PROG', root('qemu-io'))
 +        self.qemu_nbd_prog = os.getenv('QEMU_NBD_PROG', root('qemu-nbd'))
 +        self.qsd_prog = os.getenv('QSD_PROG', root('storage-daemon',
 +                                                   'qemu-storage-daemon'))
 +
 +        for b in [self.qemu_img_prog, self.qemu_io_prog, self.qemu_nbd_prog,
 +                  self.qemu_prog, self.qsd_prog]:
 +            if not os.path.exists(b):
 +                sys.exit('No such file: ' + b)
 +            if not isxfile(b):
 +                sys.exit('Not executable: ' + b)
 +
 +        helper_path = os.path.join(self.build_iotests, 'socket_scm_helper')
 +        if isxfile(helper_path):
 +            self.socket_scm_helper = helper_path  # SOCKET_SCM_HELPER
 +
 +    def __init__(self, imgfmt: str, imgproto: str, aiomode: str,
 +                 cachemode: Optional[str] = None,
 +                 imgopts: Optional[str] = None,
 +                 misalign: bool = False,
 +                 debug: bool = False,
 +                 valgrind: bool = False) -> None:
 +        self.imgfmt = imgfmt
 +        self.imgproto = imgproto
 +        self.aiomode = aiomode
 +        self.imgopts = imgopts
 +        self.misalign = misalign
 +        self.debug = debug
 +
 +        if valgrind:
 +            self.valgrind_qemu = 'y'
 +
 +        if cachemode is None:
 +            self.cachemode_is_default = 'true'
 +            self.cachemode = 'writeback'
 +        else:
 +            self.cachemode_is_default = 'false'
 +            self.cachemode = cachemode
 +
 +        # Initialize generic paths: build_root, build_iotests, source_iotests,
 +        # which are needed to initialize some environment variables. They are
 +        # used by init_*() functions as well.
 +
 +        if os.path.islink(sys.argv[0]):
 +            # called from the build tree
 +            self.source_iotests = os.path.dirname(os.readlink(sys.argv[0]))
 +            self.build_iotests = os.path.dirname(os.path.abspath(sys.argv[0]))
 +        else:
 +            # called from the source tree
 +            self.source_iotests = os.getcwd()
 +            self.build_iotests = self.source_iotests
 +
 +        self.build_root = os.path.join(self.build_iotests, '..', '..')
 +
 +        self.init_directories()
 +        self.init_binaries()
 +
 +        self.malloc_perturb_ = os.getenv('MALLOC_PERTURB_',
 +                                         str(random.randrange(1, 255)))
 +
 +        # QEMU_OPTIONS
 +        self.qemu_options = '-nodefaults -display none -accel qtest'
 +        machine_map = (
 +            ('arm', 'virt'),
 +            ('aarch64', 'virt'),
 +            ('avr', 'mega2560'),
 +            ('rx', 'gdbsim-r5f562n8'),
 +            ('tricore', 'tricore_testboard')
 +        )
 +        for suffix, machine in machine_map:
 +            if self.qemu_prog.endswith(f'qemu-system-{suffix}'):
 +                self.qemu_options += f' -machine {machine}'
 +
 +        # QEMU_DEFAULT_MACHINE
 +        self.qemu_default_machine = get_default_machine(self.qemu_prog)
 +
 +        self.qemu_img_options = os.getenv('QEMU_IMG_OPTIONS')
 +        self.qemu_nbd_options = os.getenv('QEMU_NBD_OPTIONS')
 +
 +        is_generic = self.imgfmt not in ['bochs', 'cloop', 'dmg']
 +        self.imgfmt_generic = 'true' if is_generic else 'false'
 +
 +        self.qemu_io_options = f'--cache {self.cachemode} --aio {self.aiomode}'
 +        if self.misalign:
 +            self.qemu_io_options += ' --misalign'
 +
 +        self.qemu_io_options_no_fmt = self.qemu_io_options
 +
 +        if self.imgfmt == 'luks':
 +            self.imgoptssyntax = 'true'
 +            self.imgkeysecret = '123456'
 +            if not self.imgopts:
 +                self.imgopts = 'iter-time=10'
 +            elif 'iter-time=' not in self.imgopts:
 +                self.imgopts += ',iter-time=10'
 +        else:
 +            self.imgoptssyntax = 'false'
 +            self.qemu_io_options += ' -f ' + self.imgfmt
 +
 +        if self.imgfmt == 'vmdk':
 +            if not self.imgopts:
 +                self.imgopts = 'zeroed_grain=on'
 +            elif 'zeroed_grain=' not in self.imgopts:
 +                self.imgopts += ',zeroed_grain=on'
 +
 +    def close(self) -> None:
 +        if self.tmp_sock_dir:
 +            shutil.rmtree(self.sock_dir)
 +
 +    def __enter__(self) -> 'TestEnv':
 +        return self
 +
 +    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
 +        self.close()
 +
 +    def print_env(self) -> None:
 +        template = """\
 +QEMU          -- "{QEMU_PROG}" {QEMU_OPTIONS}
 +QEMU_IMG      -- "{QEMU_IMG_PROG}" {QEMU_IMG_OPTIONS}
 +QEMU_IO       -- "{QEMU_IO_PROG}" {QEMU_IO_OPTIONS}
 +QEMU_NBD      -- "{QEMU_NBD_PROG}" {QEMU_NBD_OPTIONS}
 +IMGFMT        -- {IMGFMT}{imgopts}
 +IMGPROTO      -- {IMGPROTO}
 +PLATFORM      -- {platform}
 +TEST_DIR      -- {TEST_DIR}
 +SOCK_DIR      -- {SOCK_DIR}
 +SOCKET_SCM_HELPER -- {SOCKET_SCM_HELPER}"""
 +
 +        args = collections.defaultdict(str, self.get_env())
 +
 +        if 'IMGOPTS' in args:
 +            args['imgopts'] = f" ({args['IMGOPTS']})"
 +
 +        u = os.uname()
 +        args['platform'] = f'{u.sysname}/{u.machine} {u.nodename} {u.release}'
 +
 +        print(template.format_map(args))
 --
-.19.1
+.29.2

-[Qemu-devel] [PULL 29/36] qemu-iotests: Test auto-read-only with -drive and -blockdev
+[PULL 6/8] iotests: add testrunner.py
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Add TestRunner class, which will run tests in a new python iotests
+running framework.
+There are some differences with current ./check behavior, most
+significant are:
+- Consider all tests self-executable, just run them, don't run python
+  by hand.
+- Elapsed time is cached in json file
+- Elapsed time precision increased a bit
+- Instead of using "diff -w" which ignores all whitespace differences,
+  manually strip whitespace at line end then use python difflib, which
+  no longer ignores spacing mid-line
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Message-Id: <20210125185056.129513-5-vsementsov@virtuozzo.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
 ---
- tests/qemu-iotests/232     | 147 +++++++++++++++++++++++++++++++++++++
+ tests/qemu-iotests/testrunner.py | 367 +++++++++++++++++++++++++++++++
- tests/qemu-iotests/232.out |  59 +++++++++++++++
+file changed, 367 insertions(+)
- tests/qemu-iotests/group   |   1 +
+ create mode 100644 tests/qemu-iotests/testrunner.py
-files changed, 207 insertions(+)
- create mode 100755 tests/qemu-iotests/232
+diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunner.py
- create mode 100644 tests/qemu-iotests/232.out
+new file mode 100644
 diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
 new file mode 100755
 index XXXXXXX..XXXXXXX
 --- /dev/null
-+++ b/tests/qemu-iotests/232
++++ b/tests/qemu-iotests/testrunner.py
 @@ -XXX,XX +XXX,XX @@
-+#!/bin/bash
++# Class for actually running tests.
 +#
-+# Test for auto-read-only
++# Copyright (c) 2020-2021 Virtuozzo International GmbH
 +#
 +# Copyright (C) 2018 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.
 ...
 +#
 +# 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
++import os
-+owner=kwolf@redhat.com
++from pathlib import Path
-+
++import datetime
-+seq=`basename $0`
++import time
-+echo "QA output created by $seq"
++import difflib
-+
++import subprocess
-+here=`pwd`
++import contextlib
-+status=1    # failure is the default!
++import json
-+
++import termios
-+_cleanup()
++import sys
-+{
++from contextlib import contextmanager
-+    _cleanup_test_img
++from typing import List, Optional, Iterator, Any, Sequence, Dict, \
-+    rm -f $TEST_IMG.snap
++        ContextManager
-+}
++
-+trap "_cleanup; exit \$status" 0 1 2 3 15
++from testenv import TestEnv
 +
-+# get standard environment, filters and checks
++
-+. ./common.rc
++def silent_unlink(path: Path) -> None:
-+. ./common.filter
++    try:
-+
++        path.unlink()
-+_supported_fmt generic
++    except OSError:
-+_supported_proto file
++        pass
-+_supported_os Linux
++
 +
-+function do_run_qemu()
++def file_diff(file1: str, file2: str) -> List[str]:
-+{
++    with open(file1, encoding="utf-8") as f1, \
-+    echo Testing: "$@"
++         open(file2, encoding="utf-8") as f2:
-+    (
++        # We want to ignore spaces at line ends. There are a lot of mess about
-+        if ! test -t 0; then
++        # it in iotests.
-+            while read cmd; do
++        # TODO: fix all tests to not produce extra spaces, fix all .out files
-+                echo $cmd
++        # and use strict diff here!
-+            done
++        seq1 = [line.rstrip() for line in f1]
-+        fi
++        seq2 = [line.rstrip() for line in f2]
-+        echo quit
++        res = [line.rstrip()
-+    ) | $QEMU -nographic -monitor stdio -nodefaults "$@"
++               for line in difflib.unified_diff(seq1, seq2, file1, file2)]
-+    echo
++        return res
-+}
++
 +
-+function run_qemu()
++# We want to save current tty settings during test run,
-+{
++# since an aborting qemu call may leave things screwed up.
-+    do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_hmp |
++@contextmanager
-+        _filter_generated_node_ids | _filter_imgfmt
++def savetty() -> Iterator[None]:
-+}
++    isterm = sys.stdin.isatty()
-+
++    if isterm:
-+function run_qemu_info_block()
++        fd = sys.stdin.fileno()
-+{
++        attr = termios.tcgetattr(fd)
-+    echo "info block -n" | run_qemu "$@" | grep -e "(file" -e "QEMU_PROG"
++
-+}
++    try:
-+
++        yield
-+size=128M
++    finally:
-+
++        if isterm:
-+_make_test_img $size
++            termios.tcsetattr(fd, termios.TCSADRAIN, attr)
 +
-+echo
++
-+echo "=== -drive with read-write image: read-only/auto-read-only combinations ==="
++class LastElapsedTime(ContextManager['LastElapsedTime']):
-+echo
++    """ Cache for elapsed time for tests, to show it during new test run
 +
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on,auto-read-only=off
++    It is safe to use get() at any time.  To use update(), you must either
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on,auto-read-only=on
++    use it inside with-block or use save() after update().
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on
++    """
-+echo
++    def __init__(self, cache_file: str, env: TestEnv) -> None:
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off,auto-read-only=off
++        self.env = env
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off,auto-read-only=on
++        self.cache_file = cache_file
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off
++        self.cache: Dict[str, Dict[str, Dict[str, float]]]
-+echo
++
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,auto-read-only=off
++        try:
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,auto-read-only=on
++            with open(cache_file, encoding="utf-8") as f:
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none
++                self.cache = json.load(f)
-+
++        except (OSError, ValueError):
-+echo
++            self.cache = {}
-+echo "=== -drive with read-only image: read-only/auto-read-only combinations ==="
++
-+echo
++    def get(self, test: str,
-+
++            default: Optional[float] = None) -> Optional[float]:
-+chmod a-w $TEST_IMG
++        if test not in self.cache:
-+
++            return default
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on,auto-read-only=off
++
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on,auto-read-only=on
++        if self.env.imgproto not in self.cache[test]:
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on
++            return default
-+echo
++
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off,auto-read-only=off
++        return self.cache[test][self.env.imgproto].get(self.env.imgfmt,
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off,auto-read-only=on
++                                                       default)
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off
++
-+echo
++    def update(self, test: str, elapsed: float) -> None:
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,auto-read-only=off
++        d = self.cache.setdefault(test, {})
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,auto-read-only=on
++        d.setdefault(self.env.imgproto, {})[self.env.imgfmt] = elapsed
-+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none
++
-+
++    def save(self) -> None:
-+echo
++        with open(self.cache_file, 'w', encoding="utf-8") as f:
-+echo "=== -blockdev with read-write image: read-only/auto-read-only combinations ==="
++            json.dump(self.cache, f)
-+echo
++
-+
++    def __enter__(self) -> 'LastElapsedTime':
-+chmod a+w $TEST_IMG
++        return self
 +
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on,auto-read-only=off
++    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on,auto-read-only=on
++        self.save()
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on
++
-+echo
++
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off,auto-read-only=off
++class TestResult:
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off,auto-read-only=on
++    def __init__(self, status: str, description: str = '',
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off
++                 elapsed: Optional[float] = None, diff: Sequence[str] = (),
-+echo
++                 casenotrun: str = '', interrupted: bool = False) -> None:
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=off
++        self.status = status
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=on
++        self.description = description
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0
++        self.elapsed = elapsed
-+
++        self.diff = diff
-+echo
++        self.casenotrun = casenotrun
-+echo "=== -blockdev with read-only image: read-only/auto-read-only combinations ==="
++        self.interrupted = interrupted
-+echo
++
 +
-+chmod a-w $TEST_IMG
++class TestRunner(ContextManager['TestRunner']):
-+
++    def __init__(self, env: TestEnv, makecheck: bool = False,
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on,auto-read-only=off
++                 color: str = 'auto') -> None:
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on,auto-read-only=on
++        self.env = env
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on
++        self.test_run_env = self.env.get_env()
-+echo
++        self.makecheck = makecheck
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off,auto-read-only=off
++        self.last_elapsed = LastElapsedTime('.last-elapsed-cache', env)
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off,auto-read-only=on
++
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off
++        assert color in ('auto', 'on', 'off')
-+echo
++        self.color = (color == 'on') or (color == 'auto' and
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=off
++                                         sys.stdout.isatty())
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=on
++
-+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0
++        self._stack: contextlib.ExitStack
 +
-+# success, all done
++    def __enter__(self) -> 'TestRunner':
-+echo "*** done"
++        self._stack = contextlib.ExitStack()
-+rm -f $seq.full
++        self._stack.enter_context(self.env)
-+status=0
++        self._stack.enter_context(self.last_elapsed)
-diff --git a/tests/qemu-iotests/232.out b/tests/qemu-iotests/232.out
++        self._stack.enter_context(savetty())
-new file mode 100644
++        return self
-index XXXXXXX..XXXXXXX
++
---- /dev/null
++    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
-+++ b/tests/qemu-iotests/232.out
++        self._stack.close()
-@@ -XXX,XX +XXX,XX @@
++
-+QA output created by 232
++    def test_print_one_line(self, test: str, starttime: str,
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
++                            endtime: Optional[str] = None, status: str = '...',
-+
++                            lasttime: Optional[float] = None,
-+=== -drive with read-write image: read-only/auto-read-only combinations ===
++                            thistime: Optional[float] = None,
-+
++                            description: str = '',
-+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
++                            test_field_width: Optional[int] = None,
-+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
++                            end: str = '\n') -> None:
-+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
++        """ Print short test info before/after test run """
-+
++        test = os.path.basename(test)
-+NODE_NAME: TEST_DIR/t.IMGFMT (file)
++
-+NODE_NAME: TEST_DIR/t.IMGFMT (file)
++        if test_field_width is None:
-+NODE_NAME: TEST_DIR/t.IMGFMT (file)
++            test_field_width = 8
 +
-+NODE_NAME: TEST_DIR/t.IMGFMT (file)
++        if self.makecheck and status != '...':
-+NODE_NAME: TEST_DIR/t.IMGFMT (file)
++            if status and status != 'pass':
-+NODE_NAME: TEST_DIR/t.IMGFMT (file)
++                status = f' [{status}]'
-+
++            else:
-+=== -drive with read-only image: read-only/auto-read-only combinations ===
++                status = ''
 +
-+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
++            print(f'  TEST   iotest-{self.env.imgfmt}: {test}{status}')
-+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
++            return
-+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
++
-+
++        if lasttime:
-+QEMU_PROG: -drive driver=file,file=TEST_DIR/t.IMGFMT,if=none,read-only=off,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
++            lasttime_s = f' (last: {lasttime:.1f}s)'
-+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
++        else:
-+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
++            lasttime_s = ''
-+
++        if thistime:
-+QEMU_PROG: -drive driver=file,file=TEST_DIR/t.IMGFMT,if=none,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
++            thistime_s = f'{thistime:.1f}s'
-+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
++        else:
-+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
++            thistime_s = '...'
 +
-+=== -blockdev with read-write image: read-only/auto-read-only combinations ===
++        if endtime:
-+
++            endtime = f'[{endtime}]'
-+node0: TEST_DIR/t.IMGFMT (file, read-only)
++        else:
-+node0: TEST_DIR/t.IMGFMT (file, read-only)
++            endtime = ''
-+node0: TEST_DIR/t.IMGFMT (file, read-only)
++
-+
++        if self.color:
-+node0: TEST_DIR/t.IMGFMT (file)
++            if status == 'pass':
-+node0: TEST_DIR/t.IMGFMT (file)
++                col = '\033[32m'
-+node0: TEST_DIR/t.IMGFMT (file)
++            elif status == 'fail':
-+
++                col = '\033[1m\033[31m'
-+node0: TEST_DIR/t.IMGFMT (file)
++            elif status == 'not run':
-+node0: TEST_DIR/t.IMGFMT (file)
++                col = '\033[33m'
-+node0: TEST_DIR/t.IMGFMT (file)
++            else:
-+
++                col = ''
-+=== -blockdev with read-only image: read-only/auto-read-only combinations ===
++
-+
++            col_end = '\033[0m'
-+node0: TEST_DIR/t.IMGFMT (file, read-only)
++        else:
-+node0: TEST_DIR/t.IMGFMT (file, read-only)
++            col = ''
-+node0: TEST_DIR/t.IMGFMT (file, read-only)
++            col_end = ''
 +
-+QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0,read-only=off,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
++        print(f'{test:{test_field_width}} {col}{status:10}{col_end} '
-+node0: TEST_DIR/t.IMGFMT (file, read-only)
++              f'[{starttime}] {endtime:13}{thistime_s:5} {lasttime_s:14} '
-+QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0,read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
++              f'{description}', end=end)
 +
-+QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
++    def find_reference(self, test: str) -> str:
-+node0: TEST_DIR/t.IMGFMT (file, read-only)
++        if self.env.cachemode == 'none':
-+QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
++            ref = f'{test}.out.nocache'
-+*** done
++            if os.path.isfile(ref):
-diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
++                return ref
-index XXXXXXX..XXXXXXX 100644
++
---- a/tests/qemu-iotests/group
++        ref = f'{test}.out.{self.env.imgfmt}'
-+++ b/tests/qemu-iotests/group
++        if os.path.isfile(ref):
-@@ -XXX,XX +XXX,XX @@
++            return ref
-auto quick
++
-auto quick
++        ref = f'{test}.{self.env.qemu_default_machine}.out'
-auto quick
++        if os.path.isfile(ref):
-+232 auto quick
++            return ref
 +
 +        return f'{test}.out'
 +
 +    def do_run_test(self, test: str) -> TestResult:
 +        f_test = Path(test)
 +        f_bad = Path(f_test.name + '.out.bad')
 +        f_notrun = Path(f_test.name + '.notrun')
 +        f_casenotrun = Path(f_test.name + '.casenotrun')
 +        f_reference = Path(self.find_reference(test))
 +
 +        if not f_test.exists():
 +            return TestResult(status='fail',
 +                              description=f'No such test file: {f_test}')
 +
 +        if not os.access(str(f_test), os.X_OK):
 +            sys.exit(f'Not executable: {f_test}')
 +
 +        if not f_reference.exists():
 +            return TestResult(status='not run',
 +                              description='No qualified output '
 +                                          f'(expected {f_reference})')
 +
 +        for p in (f_bad, f_notrun, f_casenotrun):
 +            silent_unlink(p)
 +
 +        args = [str(f_test.resolve())]
 +        if self.env.debug:
 +            args.append('-d')
 +
 +        with f_test.open(encoding="utf-8") as f:
 +            try:
 +                if f.readline() == '#!/usr/bin/env python3':
 +                    args.insert(0, self.env.python)
 +            except UnicodeDecodeError:  # binary test? for future.
 +                pass
 +
 +        env = os.environ.copy()
 +        env.update(self.test_run_env)
 +
 +        t0 = time.time()
 +        with f_bad.open('w', encoding="utf-8") as f:
 +            proc = subprocess.Popen(args, cwd=str(f_test.parent), env=env,
 +                                    stdout=f, stderr=subprocess.STDOUT)
 +            try:
 +                proc.wait()
 +            except KeyboardInterrupt:
 +                proc.terminate()
 +                proc.wait()
 +                return TestResult(status='not run',
 +                                  description='Interrupted by user',
 +                                  interrupted=True)
 +            ret = proc.returncode
 +
 +        elapsed = round(time.time() - t0, 1)
 +
 +        if ret != 0:
 +            return TestResult(status='fail', elapsed=elapsed,
 +                              description=f'failed, exit status {ret}',
 +                              diff=file_diff(str(f_reference), str(f_bad)))
 +
 +        if f_notrun.exists():
 +            return TestResult(status='not run',
 +                              description=f_notrun.read_text().strip())
 +
 +        casenotrun = ''
 +        if f_casenotrun.exists():
 +            casenotrun = f_casenotrun.read_text()
 +
 +        diff = file_diff(str(f_reference), str(f_bad))
 +        if diff:
 +            return TestResult(status='fail', elapsed=elapsed,
 +                              description=f'output mismatch (see {f_bad})',
 +                              diff=diff, casenotrun=casenotrun)
 +        else:
 +            f_bad.unlink()
 +            self.last_elapsed.update(test, elapsed)
 +            return TestResult(status='pass', elapsed=elapsed,
 +                              casenotrun=casenotrun)
 +
 +    def run_test(self, test: str,
 +                 test_field_width: Optional[int] = None) -> TestResult:
 +        last_el = self.last_elapsed.get(test)
 +        start = datetime.datetime.now().strftime('%H:%M:%S')
 +
 +        self.test_print_one_line(test=test, starttime=start, lasttime=last_el,
 +                                 end='\r', test_field_width=test_field_width)
 +
 +        res = self.do_run_test(test)
 +
 +        end = datetime.datetime.now().strftime('%H:%M:%S')
 +        self.test_print_one_line(test=test, status=res.status,
 +                                 starttime=start, endtime=end,
 +                                 lasttime=last_el, thistime=res.elapsed,
 +                                 description=res.description,
 +                                 test_field_width=test_field_width)
 +
 +        if res.casenotrun:
 +            print(res.casenotrun)
 +
 +        return res
 +
 +    def run_tests(self, tests: List[str]) -> None:
 +        n_run = 0
 +        failed = []
 +        notrun = []
 +        casenotrun = []
 +
 +        if not self.makecheck:
 +            self.env.print_env()
 +            print()
 +
 +        test_field_width = max(len(os.path.basename(t)) for t in tests) + 2
 +
 +        for t in tests:
 +            name = os.path.basename(t)
 +            res = self.run_test(t, test_field_width=test_field_width)
 +
 +            assert res.status in ('pass', 'fail', 'not run')
 +
 +            if res.casenotrun:
 +                casenotrun.append(t)
 +
 +            if res.status != 'not run':
 +                n_run += 1
 +
 +            if res.status == 'fail':
 +                failed.append(name)
 +                if self.makecheck:
 +                    self.env.print_env()
 +                if res.diff:
 +                    print('\n'.join(res.diff))
 +            elif res.status == 'not run':
 +                notrun.append(name)
 +
 +            if res.interrupted:
 +                break
 +
 +        if notrun:
 +            print('Not run:', ' '.join(notrun))
 +
 +        if casenotrun:
 +            print('Some cases not run in:', ' '.join(casenotrun))
 +
 +        if failed:
 +            print('Failures:', ' '.join(failed))
 +            print(f'Failed {len(failed)} of {n_run} iotests')
 +        else:
 +            print(f'Passed all {n_run} iotests')
 --
-.19.1
+.29.2

-[Qemu-devel] [PULL 14/36] quorum: Remove quorum_err()
+[PULL 7/8] iotests: rewrite check into python
-From: Alberto Garcia <berto@igalia.com>
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-This is a static function with only one caller, so there's no need to
+Just use classes introduced in previous three commits. Behavior
-keep it. Inlining the code in quorum_compare() makes it much simpler.
+difference is described in these three commits.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
+Drop group file, as it becomes unused.
-Reported-by: Markus Armbruster <armbru@redhat.com>
 Drop common.env: now check is in python, and for tests we use same
 python interpreter that runs the check itself. Use build environment
 PYTHON in check-block instead, to keep "make check" use the same
 python.
 Checking for virtio-blk moved to iotests.py, as it actually iotests.py
 dependency. Actually not all python iotests depend on it, so in future
 it may be refactored to checked only when really needed.
 Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Message-Id: <20210125185056.129513-6-vsementsov@virtuozzo.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- block/quorum.c | 24 +++++-------------------
+ tests/qemu-iotests/iotests.py    |    8 +
-file changed, 5 insertions(+), 19 deletions(-)
+ Makefile                         |    1 -
  tests/check-block.sh             |    3 +-
  tests/qemu-iotests/check         | 1095 ++++--------------------------
  tests/qemu-iotests/common.env.in |    3 -
  tests/qemu-iotests/group         |  323 ---------
  tests/qemu-iotests/meson.build   |    3 -
 files changed, 139 insertions(+), 1297 deletions(-)
  delete mode 100644 tests/qemu-iotests/common.env.in
  delete mode 100644 tests/qemu-iotests/group
-diff --git a/block/quorum.c b/block/quorum.c
+diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
 index XXXXXXX..XXXXXXX 100644
---- a/block/quorum.c
+--- a/tests/qemu-iotests/iotests.py
-+++ b/block/quorum.c
++++ b/tests/qemu-iotests/iotests.py
-@@ -XXX,XX +XXX,XX @@ static bool quorum_iovec_compare(QEMUIOVector *a, QEMUIOVector *b)
+@@ -XXX,XX +XXX,XX @@ def _verify_formats(required_formats: Sequence[str] = ()) -> None:
-     return true;
+     if usf_list:
- }
+         notrun(f'formats {usf_list} are not whitelisted')
--static void GCC_FMT_ATTR(2, 3) quorum_err(QuorumAIOCB *acb,
++
--                                          const char *fmt, ...)
++def _verify_virtio_blk() -> None:
 +    out = qemu_pipe('-M', 'none', '-device', 'help')
 +    if 'virtio-blk' not in out:
 +        notrun('Missing virtio-blk in QEMU binary')
 +
 +
  def supports_quorum():
      return 'quorum' in qemu_img_pipe('--help')
@@ -XXX,XX +XXX,XX @@ def execute_setup_common(supported_fmts: Sequence[str] = (),
      _verify_cache_mode(supported_cache_modes)
      _verify_aio_mode(supported_aio_modes)
      _verify_formats(required_fmts)
 +    _verify_virtio_blk()
      return debug
 diff --git a/Makefile b/Makefile
 index XXXXXXX..XXXXXXX 100644
 --- a/Makefile
 +++ b/Makefile
@@ -XXX,XX +XXX,XX @@ distclean: clean
      rm -f config-host.mak config-host.h*
      rm -f tests/tcg/config-*.mak
      rm -f config-all-disas.mak config.status
 -    rm -f tests/qemu-iotests/common.env
      rm -f roms/seabios/config.mak roms/vgabios/config.mak
      rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols
      rm -f *-config-target.h *-config-devices.mak *-config-devices.h
 diff --git a/tests/check-block.sh b/tests/check-block.sh
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/check-block.sh
 +++ b/tests/check-block.sh
@@ -XXX,XX +XXX,XX @@ cd tests/qemu-iotests
  # QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests
  export QEMU_CHECK_BLOCK_AUTO=1
 +export PYTHONUTF8=1
  ret=0
  for fmt in $format_list ; do
 -    ./check -makecheck -$fmt $group || ret=1
 +    ${PYTHON} ./check -makecheck -$fmt $group || ret=1
  done
  exit $ret
 diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/check
 +++ b/tests/qemu-iotests/check
@@ -XXX,XX +XXX,XX @@
 -#!/usr/bin/env bash
 +#!/usr/bin/env python3
  #
 -# Copyright (C) 2009 Red Hat, Inc.
 -# Copyright (c) 2000-2002,2006 Silicon Graphics, Inc.  All Rights Reserved.
 +# Configure environment and run group of tests in it.
 +#
 +# Copyright (c) 2020-2021 Virtuozzo International GmbH
  #
  # This program is free software; you can redistribute it and/or
  # modify it under the terms of the GNU General Public License as
@@ -XXX,XX +XXX,XX @@
  #
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -#
 -#
 -# Control script for QA
 -#
 -
 -status=0
 -needwrap=true
 -try=0
 -n_bad=0
 -bad=""
 -notrun=""
 -casenotrun=""
 -interrupt=true
 -makecheck=false
 -
 -_init_error()
 -{
--    va_list ap;
+-    echo "check: $1" >&2
--
+-    exit 1
 -    va_start(ap, fmt);
 -    fprintf(stderr, "quorum: offset=%" PRIu64 " bytes=%" PRIu64 " ",
 -            acb->offset, acb->bytes);
 -    vfprintf(stderr, fmt, ap);
 -    fprintf(stderr, "\n");
 -    va_end(ap);
 -    exit(1);
 -}
 -
--static bool quorum_compare(QuorumAIOCB *acb,
+-if [ -L "$0" ]
--                           QEMUIOVector *a,
+-then
--                           QEMUIOVector *b)
+-    # called from the build tree
-+static bool quorum_compare(QuorumAIOCB *acb, QEMUIOVector *a, QEMUIOVector *b)
+-    source_iotests=$(dirname "$(readlink "$0")")
- {
+-    if [ -z "$source_iotests" ]
-     BDRVQuorumState *s = acb->bs->opaque;
+-    then
-     ssize_t offset;
+-        _init_error "failed to obtain source tree name from check symlink"
-@@ -XXX,XX +XXX,XX @@ static bool quorum_compare(QuorumAIOCB *acb,
+-    fi
-     if (s->is_blkverify) {
+-    source_iotests=$(cd "$source_iotests"; pwd) || _init_error "failed to enter source tree"
-         offset = qemu_iovec_compare(a, b);
+-    build_iotests=$(cd "$(dirname "$0")"; pwd)
-         if (offset != -1) {
+-else
--            quorum_err(acb, "contents mismatch at offset %" PRIu64,
+-    # called from the source tree
--                       acb->offset + offset);
+-    source_iotests=$PWD
-+            fprintf(stderr, "quorum: offset=%" PRIu64 " bytes=%" PRIu64
+-    # this may be an in-tree build (note that in the following code we may not
-+                    " contents mismatch at offset %" PRIu64 "\n",
+-    # assume that it truly is and have to test whether the build results
-+                    acb->offset, acb->bytes, acb->offset + offset);
+-    # actually exist)
-+            exit(1);
+-    build_iotests=$PWD
-         }
+-fi
-         return true;
+-
-     }
+-build_root="$build_iotests/../.."
 -
 -# we need common.env
 -if ! . "$build_iotests/common.env"
 -then
 -    _init_error "failed to source common.env (make sure the qemu-iotests are run from tests/qemu-iotests in the build tree)"
 -fi
 -
 -# we need common.config
 -if ! . "$source_iotests/common.config"
 -then
 -    _init_error "failed to source common.config"
 -fi
 -
 -_full_imgfmt_details()
 -{
 -    if [ -n "$IMGOPTS" ]; then
 -        echo "$IMGFMT ($IMGOPTS)"
 -    else
 -        echo "$IMGFMT"
 -    fi
 -}
 -
 -_full_platform_details()
 -{
 -    os=$(uname -s)
 -    host=$(hostname -s)
 -    kernel=$(uname -r)
 -    platform=$(uname -m)
 -    echo "$os/$platform $host $kernel"
 -}
 -
 -_full_env_details()
 -{
 -    cat <<EOF
 -QEMU          -- "$QEMU_PROG" $QEMU_OPTIONS
 -QEMU_IMG      -- "$QEMU_IMG_PROG" $QEMU_IMG_OPTIONS
 -QEMU_IO       -- "$QEMU_IO_PROG" $QEMU_IO_OPTIONS
 -QEMU_NBD      -- "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS
 -IMGFMT        -- $FULL_IMGFMT_DETAILS
 -IMGPROTO      -- $IMGPROTO
 -PLATFORM      -- $FULL_HOST_DETAILS
 -TEST_DIR      -- $TEST_DIR
 -SOCK_DIR      -- $SOCK_DIR
 -SOCKET_SCM_HELPER -- $SOCKET_SCM_HELPER
 -
 -EOF
 -}
 -
 -# $1 = prog to look for
 -set_prog_path()
 -{
 -    p=$(command -v $1 2> /dev/null)
 -    if [ -n "$p" -a -x "$p" ]; then
 -        type -p "$p"
 -    else
 -        return 1
 -    fi
 -}
 -
 -if [ -z "$TEST_DIR" ]; then
 -        TEST_DIR=$PWD/scratch
 -fi
 -mkdir -p "$TEST_DIR" || _init_error 'Failed to create TEST_DIR'
 -
 -tmp_sock_dir=false
 -if [ -z "$SOCK_DIR" ]; then
 -    SOCK_DIR=$(mktemp -d)
 -    tmp_sock_dir=true
 -fi
 -mkdir -p "$SOCK_DIR" || _init_error 'Failed to create SOCK_DIR'
 -
 -diff="diff -u"
 -verbose=false
 -debug=false
 -group=false
 -xgroup=false
 -imgopts=false
 -showme=false
 -sortme=false
 -expunge=true
 -have_test_arg=false
 -cachemode=false
 -aiomode=false
 -
 -tmp="${TEST_DIR}"/$$
 -rm -f $tmp.list $tmp.tmp $tmp.sed
 -
 -export IMGFMT=raw
 -export IMGFMT_GENERIC=true
 -export IMGPROTO=file
 -export IMGOPTS=""
 -export CACHEMODE="writeback"
 -export AIOMODE="threads"
 -export QEMU_IO_OPTIONS=""
 -export QEMU_IO_OPTIONS_NO_FMT=""
 -export CACHEMODE_IS_DEFAULT=true
 -export VALGRIND_QEMU=
 -export IMGKEYSECRET=
 -export IMGOPTSSYNTAX=false
 -
 -# Save current tty settings, since an aborting qemu call may leave things
 -# screwed up
 -STTY_RESTORE=
 -if test -t 0; then
 -    STTY_RESTORE=$(stty -g)
 -fi
 -
 -for r
 -do
 -
 -    if $group
 -    then
 -        # arg after -g
 -        group_list=$(sed -n <"$source_iotests/group" -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{
 -s/ .*//p
 -}')
 -        if [ -z "$group_list" ]
 -        then
 -            echo "Group \"$r\" is empty or not defined?"
 -            exit 1
 -        fi
 -        [ ! -s $tmp.list ] && touch $tmp.list
 -        for t in $group_list
 -        do
 -            if grep -s "^$t\$" $tmp.list >/dev/null
 -            then
 -                :
 -            else
 -                echo "$t" >>$tmp.list
 -            fi
 -        done
 -        group=false
 -        continue
 -
 -    elif $xgroup
 -    then
 -        # arg after -x
 -        # Populate $tmp.list with all tests
 -        awk '/^[0-9]{3,}/ {print $1}' "${source_iotests}/group" > $tmp.list 2>/dev/null
 -        group_list=$(sed -n <"$source_iotests/group" -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{
 -s/ .*//p
 -}')
 -        if [ -z "$group_list" ]
 -        then
 -            echo "Group \"$r\" is empty or not defined?"
 -            exit 1
 -        fi
 -        numsed=0
 -        rm -f $tmp.sed
 -        for t in $group_list
 -        do
 -            if [ $numsed -gt 100 ]
 -            then
 -                sed -f $tmp.sed <$tmp.list >$tmp.tmp
 -                mv $tmp.tmp $tmp.list
 -                numsed=0
 -                rm -f $tmp.sed
 -            fi
 -            echo "/^$t\$/d" >>$tmp.sed
 -            numsed=$(expr $numsed + 1)
 -        done
 -        sed -f $tmp.sed <$tmp.list >$tmp.tmp
 -        mv $tmp.tmp $tmp.list
 -        xgroup=false
 -        continue
 -
 -    elif $imgopts
 -    then
 -        IMGOPTS="$r"
 -        imgopts=false
 -        continue
 -    elif $cachemode
 -    then
 -        CACHEMODE="$r"
 -        CACHEMODE_IS_DEFAULT=false
 -        cachemode=false
 -        continue
 -    elif $aiomode
 -    then
 -        AIOMODE="$r"
 -        aiomode=false
 -        continue
 -    fi
 -
 -    xpand=true
 -    case "$r"
 -    in
 -
 -        -\? | -h | --help)        # usage
 -            echo "Usage: $0 [options] [testlist]"'
 -
 -common options
 -    -v                  verbose
 -    -d                  debug
 -
 -image format options
 -    -raw                test raw (default)
 -    -bochs              test bochs
 -    -cloop              test cloop
 -    -parallels          test parallels
 -    -qcow               test qcow
 -    -qcow2              test qcow2
 -    -qed                test qed
 -    -vdi                test vdi
 -    -vpc                test vpc
 -    -vhdx               test vhdx
 -    -vmdk               test vmdk
 -    -luks               test luks
 -    -dmg                test dmg
 -
 -image protocol options
 -    -file               test file (default)
 -    -rbd                test rbd
 -    -sheepdog           test sheepdog
 -    -nbd                test nbd
 -    -fuse               test fuse
 -    -ssh                test ssh
 -    -nfs                test nfs
 -
 -other options
 -    -xdiff              graphical mode diff
 -    -nocache            use O_DIRECT on backing file
 -    -misalign           misalign memory allocations
 -    -n                  show me, do not run tests
 -    -o options          -o options to pass to qemu-img create/convert
 -    -c mode             cache mode
 -    -i mode             AIO mode
 -    -makecheck          pretty print output for make check
 -
 -testlist options
 -    -g group[,group...]        include tests from these groups
 -    -x group[,group...]        exclude tests from these groups
 -    NNN                        include test NNN
 -    NNN-NNN                    include test range (eg. 012-021)
 -'
 -            exit 0
 -            ;;
 -
 -        -raw)
 -            IMGFMT=raw
 -            xpand=false
 -            ;;
 -
 -        -bochs)
 -            IMGFMT=bochs
 -            IMGFMT_GENERIC=false
 -            xpand=false
 -            ;;
 -
 -        -cloop)
 -            IMGFMT=cloop
 -            IMGFMT_GENERIC=false
 -            xpand=false
 -            ;;
 -
 -        -parallels)
 -            IMGFMT=parallels
 -            xpand=false
 -            ;;
 -
 -        -qcow)
 -            IMGFMT=qcow
 -            xpand=false
 -            ;;
 -
 -        -qcow2)
 -            IMGFMT=qcow2
 -            xpand=false
 -            ;;
 -
 -        -luks)
 -            IMGOPTSSYNTAX=true
 -            IMGFMT=luks
 -            IMGKEYSECRET=123456
 -            xpand=false
 -            ;;
 -
 -        -dmg)
 -            IMGFMT=dmg
 -            IMGFMT_GENERIC=false
 -            xpand=false
 -            ;;
 -
 -        -qed)
 -            IMGFMT=qed
 -            xpand=false
 -            ;;
 -
 -        -vdi)
 -            IMGFMT=vdi
 -            xpand=false
 -            ;;
 -
 -        -vmdk)
 -            IMGFMT=vmdk
 -            xpand=false
 -            ;;
 -
 -        -vpc)
 -            IMGFMT=vpc
 -            xpand=false
 -            ;;
 -
 -        -vhdx)
 -            IMGFMT=vhdx
 -            xpand=false
 -            ;;
 -
 -        -file)
 -            IMGPROTO=file
 -            xpand=false
 -            ;;
 -
 -        -rbd)
 -            IMGPROTO=rbd
 -            xpand=false
 -            ;;
 -
 -        -sheepdog)
 -            IMGPROTO=sheepdog
 -            xpand=false
 -            ;;
 -
 -        -nbd)
 -            IMGPROTO=nbd
 -            xpand=false
 -            ;;
 -
 -        -fuse)
 -            IMGPROTO=fuse
 -            xpand=false
 -            ;;
 -
 -        -ssh)
 -            IMGPROTO=ssh
 -            xpand=false
 -            ;;
 -
 -        -nfs)
 -            IMGPROTO=nfs
 -            xpand=false
 -            ;;
 -
 -        -nocache)
 -            CACHEMODE="none"
 -            CACHEMODE_IS_DEFAULT=false
 -            xpand=false
 -            ;;
 -
 -        -misalign)
 -            QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --misalign"
 -            xpand=false
 -            ;;
 -
 -        -valgrind)
 -            VALGRIND_QEMU='y'
 -            xpand=false
 -            ;;
 -
 -        -g)        # -g group ... pick from group file
 -            group=true
 -            xpand=false
 -            ;;
 -
 -        -xdiff)        # graphical diff mode
 -            xpand=false
 -
 -            if [ ! -z "$DISPLAY" ]
 -            then
 -                command -v xdiff >/dev/null 2>&1 && diff=xdiff
 -                command -v gdiff >/dev/null 2>&1 && diff=gdiff
 -                command -v tkdiff >/dev/null 2>&1 && diff=tkdiff
 -                command -v xxdiff >/dev/null 2>&1 && diff=xxdiff
 -            fi
 -            ;;
 -        -makecheck)   # makecheck friendly output
 -            makecheck=true
 -            xpand=false
 -            ;;
 -        -n)        # show me, don't do it
 -            showme=true
 -            xpand=false
 -            ;;
 -        -o)
 -            imgopts=true
 -            xpand=false
 -            ;;
 -        -c)
 -            cachemode=true
 -            xpand=false
 -            ;;
 -        -i)
 -            aiomode=true
 -            xpand=false
 -            ;;
 -        -T)        # deprecated timestamp option
 -            xpand=false
 -            ;;
 -        -v)
 -            verbose=true
 -            xpand=false
 -            ;;
 -        -d)
 -            debug=true
 -            xpand=false
 -            ;;
 -        -x)        # -x group ... exclude from group file
 -            xgroup=true
 -            xpand=false
 -            ;;
 -        '[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]')
 -            echo "No tests?"
 -            status=1
 -            exit $status
 -            ;;
 -
 -        [0-9]*-[0-9]*)
 -            eval $(echo $r | sed -e 's/^/start=/' -e 's/-/ end=/')
 -            ;;
 -
 -        [0-9]*-)
 -            eval $(echo $r | sed -e 's/^/start=/' -e 's/-//')
 -            end=$(echo [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] | sed -e 's/\[0-9]//g' -e 's/  *$//' -e 's/.* //')
 -            if [ -z "$end" ]
 -            then
 -                echo "No tests in range \"$r\"?"
 -                status=1
 -                exit $status
 -            fi
 -            ;;
 -
 -        *)
 -            start=$r
 -            end=$r
 -            ;;
 -
 -    esac
 -
 -    # get rid of leading 0s as can be interpreted as octal
 -    start=$(echo $start | sed 's/^0*//')
 -    end=$(echo $end | sed 's/^0*//')
 -
 -    if $xpand
 -    then
 -        have_test_arg=true
 -        awk </dev/null '
 -BEGIN        { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
 -        | while read id
 -        do
 -            if grep -s "^$id\( \|\$\)" "$source_iotests/group" >/dev/null
 -            then
 -                # in group file ... OK
 -                echo $id >>$tmp.list
 -            else
 -                if [ -f expunged ] && $expunge && egrep "^$id([         ]|\$)" expunged >/dev/null
 -                then
 -                    # expunged ... will be reported, but not run, later
 -                    echo $id >>$tmp.list
 -                else
 -                    # oops
 -                    if [ "$start" == "$end" -a "$id" == "$end" ]
 -                    then
 -                        echo "$id - unknown test"
 -                        exit 1
 -                    else
 -                        echo "$id - unknown test, ignored"
 -                    fi
 -                fi
 -            fi
 -        done || exit 1
 -    fi
 -
 -done
 -
 -# Set qemu-io cache mode with $CACHEMODE we have
 -QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --cache $CACHEMODE"
 -# Set qemu-io aio mode with $AIOMODE we have
 -QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --aio $AIOMODE"
 -
 -QEMU_IO_OPTIONS_NO_FMT="$QEMU_IO_OPTIONS"
 -if [ "$IMGOPTSSYNTAX" != "true" ]; then
 -    QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS -f $IMGFMT"
 -fi
 -
 -# Set default options for qemu-img create -o if they were not specified
 -if [ "$IMGFMT" == "qcow2" ] && ! (echo "$IMGOPTS" | grep "compat=" > /dev/null); then
 -    IMGOPTS=$(_optstr_add "$IMGOPTS" "compat=1.1")
 -fi
 -if [ "$IMGFMT" == "luks" ] && ! (echo "$IMGOPTS" | grep "iter-time=" > /dev/null); then
 -    IMGOPTS=$(_optstr_add "$IMGOPTS" "iter-time=10")
 -fi
 -if [ "$IMGFMT" == "vmdk" ] && ! (echo "$IMGOPTS" | grep "zeroed_grain=" > /dev/null); then
 -    IMGOPTS=$(_optstr_add "$IMGOPTS" "zeroed_grain=on")
 -fi
 -
 -if [ -z "$SAMPLE_IMG_DIR" ]; then
 -        SAMPLE_IMG_DIR="$source_iotests/sample_images"
 -fi
 -
 -export TEST_DIR
 -export SOCK_DIR
 -export SAMPLE_IMG_DIR
 -
 -if [ -s $tmp.list ]
 -then
 -    # found some valid test numbers ... this is good
 -    :
 -else
 -    if $have_test_arg
 -    then
 -        # had test numbers, but none in group file ... do nothing
 -        touch $tmp.list
 -    else
 -        # no test numbers, do everything from group file
 -        sed -n -e '/^[0-9][0-9][0-9]*/s/^\([0-9]*\).*/\1/p' <"$source_iotests/group" >$tmp.list
 -    fi
 -fi
 -
 -# should be sort -n, but this did not work for Linux when this
 -# was ported from IRIX
 -#
 -list=$(sort $tmp.list)
 -rm -f $tmp.list $tmp.tmp $tmp.sed
 -
 -if [ -z "$QEMU_PROG" ]
 -then
 -    if [ -x "$build_iotests/qemu" ]; then
 -        export QEMU_PROG="$build_iotests/qemu"
 -    elif [ -x "$build_root/qemu-system-${qemu_arch}" ]; then
 -        export QEMU_PROG="$build_root/qemu-system-${qemu_arch}"
 -    else
 -        pushd "$build_root" > /dev/null
 -        for binary in qemu-system-*
 -        do
 -            if [ -x "$binary" ]
 -            then
 -                export QEMU_PROG="$build_root/$binary"
 -                break
 -            fi
 -        done
 -        popd > /dev/null
 -        [ "$QEMU_PROG" = "" ] && _init_error "qemu not found"
 -    fi
 -fi
 -export QEMU_PROG="$(type -p "$QEMU_PROG")"
 -
 -export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
 -case "$QEMU_PROG" in
 -    *qemu-system-arm|*qemu-system-aarch64)
 -        export QEMU_OPTIONS="$QEMU_OPTIONS -machine virt"
 -        ;;
 -    *qemu-system-avr)
 -        export QEMU_OPTIONS="$QEMU_OPTIONS -machine mega2560"
 -        ;;
 -    *qemu-system-rx)
 -        export QEMU_OPTIONS="$QEMU_OPTIONS -machine gdbsim-r5f562n8"
 -        ;;
 -    *qemu-system-tricore)
 -        export QEMU_OPTIONS="-$QEMU_OPTIONS -machine tricore_testboard"
 -        ;;
 -esac
 -
 -if [ -z "$QEMU_IMG_PROG" ]; then
 -    if [ -x "$build_iotests/qemu-img" ]; then
 -        export QEMU_IMG_PROG="$build_iotests/qemu-img"
 -    elif [ -x "$build_root/qemu-img" ]; then
 -        export QEMU_IMG_PROG="$build_root/qemu-img"
 -    else
 -        _init_error "qemu-img not found"
 -    fi
 -fi
 -export QEMU_IMG_PROG="$(type -p "$QEMU_IMG_PROG")"
 -
 -if [ -z "$QEMU_IO_PROG" ]; then
 -    if [ -x "$build_iotests/qemu-io" ]; then
 -        export QEMU_IO_PROG="$build_iotests/qemu-io"
 -    elif [ -x "$build_root/qemu-io" ]; then
 -        export QEMU_IO_PROG="$build_root/qemu-io"
 -    else
 -        _init_error "qemu-io not found"
 -    fi
 -fi
 -export QEMU_IO_PROG="$(type -p "$QEMU_IO_PROG")"
 -
 -if [ -z $QEMU_NBD_PROG ]; then
 -    if [ -x "$build_iotests/qemu-nbd" ]; then
 -        export QEMU_NBD_PROG="$build_iotests/qemu-nbd"
 -    elif [ -x "$build_root/qemu-nbd" ]; then
 -        export QEMU_NBD_PROG="$build_root/qemu-nbd"
 -    else
 -        _init_error "qemu-nbd not found"
 -    fi
 -fi
 -export QEMU_NBD_PROG="$(type -p "$QEMU_NBD_PROG")"
 -
 -if [ -z "$QSD_PROG" ]; then
 -    if [ -x "$build_iotests/qemu-storage-daemon" ]; then
 -        export QSD_PROG="$build_iotests/qemu-storage-daemon"
 -    elif [ -x "$build_root/storage-daemon/qemu-storage-daemon" ]; then
 -        export QSD_PROG="$build_root/storage-daemon/qemu-storage-daemon"
 -    else
 -        _init_error "qemu-storage-daemon not found"
 -    fi
 -fi
 -export QSD_PROG="$(type -p "$QSD_PROG")"
 -
 -if [ -x "$build_iotests/socket_scm_helper" ]
 -then
 -    export SOCKET_SCM_HELPER="$build_iotests/socket_scm_helper"
 -fi
 -
 -python_usable=false
 -if $PYTHON -c 'import sys; sys.exit(0 if sys.version_info >= (3,6) else 1)'
 -then
 -    # Our python framework also requires virtio-blk
 -    if "$QEMU_PROG" -M none -device help | grep -q virtio-blk >/dev/null 2>&1
 -    then
 -        python_usable=true
 -    else
 -        python_unusable_because="Missing virtio-blk in QEMU binary"
 -    fi
 -else
 -    python_unusable_because="Unsupported Python version"
 -fi
 -
 -default_machine=$($QEMU_PROG -machine help | sed -n '/(default)/ s/ .*//p')
 -default_alias_machine=$($QEMU_PROG -machine help | \
 -   sed -n "/(alias of $default_machine)/ { s/ .*//p; q; }")
 -if [[ "$default_alias_machine" ]]; then
 -    default_machine="$default_alias_machine"
 -fi
 -
 -export QEMU_DEFAULT_MACHINE="$default_machine"
 -
 -TIMESTAMP_FILE=check.time-$IMGPROTO-$IMGFMT
 -
 -_wallclock()
 -{
 -    date "+%H %M %S" | awk '{ print $1*3600 + $2*60 + $3 }'
 -}
 -
 -_wrapup()
 -{
 -    if $showme
 -    then
 -        :
 -    elif $needwrap
 -    then
 -        if [ -f $TIMESTAMP_FILE -a -f $tmp.time ]
 -        then
 -            cat $TIMESTAMP_FILE $tmp.time \
 -            | awk '
 -        { t[$1] = $2 }
 -END        { if (NR > 0) {
 -            for (i in t) print i " " t[i]
 -          }
 -        }' \
 -            | sort -n >$tmp.out
 -            mv $tmp.out $TIMESTAMP_FILE
 -        fi
 -
 -        if [ -f $tmp.expunged ]
 -        then
 -            notrun=$(wc -l <$tmp.expunged | sed -e 's/  *//g')
 -            try=$(expr $try - $notrun)
 -            list=$(echo "$list" | sed -f $tmp.expunged)
 -        fi
 -
 -        echo "" >>check.log
 -        date >>check.log
 -        echo $list | fmt | sed -e 's/^/    /' >>check.log
 -        $interrupt && echo "Interrupted!" >>check.log
 -
 -        if [ ! -z "$notrun" ]
 -        then
 -            echo "Not run:$notrun"
 -            echo "Not run:$notrun" >>check.log
 -        fi
 -        if [ ! -z "$casenotrun" ]
 -        then
 -            echo "Some cases not run in:$casenotrun"
 -            echo "Some cases not run in:$casenotrun" >>check.log
 -        fi
 -        if [ ! -z "$n_bad" -a $n_bad != 0 ]
 -        then
 -            echo "Failures:$bad"
 -            echo "Failed $n_bad of $try iotests"
 -            echo "Failures:$bad" | fmt >>check.log
 -            echo "Failed $n_bad of $try iotests" >>check.log
 -        else
 -            echo "Passed all $try iotests"
 -            echo "Passed all $try iotests" >>check.log
 -        fi
 -        needwrap=false
 -    fi
 -
 -    if test -n "$STTY_RESTORE"; then
 -        stty $STTY_RESTORE
 -    fi
 -    rm -f "${TEST_DIR}"/*.out "${TEST_DIR}"/*.err "${TEST_DIR}"/*.time
 -    rm -f "${TEST_DIR}"/check.pid "${TEST_DIR}"/check.sts
 -    rm -f $tmp.*
 -
 -    if $tmp_sock_dir
 -    then
 -        rm -rf "$SOCK_DIR"
 -    fi
 -}
 -
 -trap "_wrapup; exit \$status" 0 1 2 3 15
 -
 -# Report the test start and results. For makecheck we want to pretty
 -# print the whole report at the end of the execution.
 -# args: $seq, $starttime, $lasttime
 -_report_test_start()
 -{
 -    if ! $makecheck; then
 -        if [ -n "$3" ]; then
 -            local lasttime=" (last: $3s)"
 -        fi
 -        printf "%-8s %-10s [%s]            %4s%-14s\r" "$1" "..." "$2" "..." "$lasttime"
 -    fi
 -}
 -# args:$seq $status $starttime $lasttime $thistime $details
 -_report_test_result()
 -{
 -    local status lasttime thistime
 -    if $makecheck; then
 -        if [ -n "$2" ] && [ "$2" != "pass" ]; then
 -            status=" [$2]"
 -        fi
 -        printf "  TEST    iotest-$IMGFMT: %s%s\n" "$1" "$status"
 -        return
 -    fi
 -
 -    if [ -n "$4" ]; then
 -        lasttime=" (last: $4s)"
 -    fi
 -    if [ -n "$5" ]; then
 -        thistime=" $5s"
 -    fi
 -    case "$2" in
 -        "pass")     status=$(printf "\e[32m%-10s\e[0m" "$2") ;;
 -        "fail")     status=$(printf "\e[1m\e[31m%-10s\e[0m" "$2") ;;
 -        "not run")  status=$(printf "\e[33m%-10s\e[0m" "$2") ;;
 -        *)          status=$(printf "%-10s" "$2") ;;
 -    esac
 -
 -    printf "%-8s %s [%s] [%s] %4s%-14s %s\n" "$1" "$status" "$3" "$(date '+%T')" "$thistime" "$lasttime" "$6"
 -}
 -
 -[ -f $TIMESTAMP_FILE ] || touch $TIMESTAMP_FILE
 -
 -FULL_IMGFMT_DETAILS=$(_full_imgfmt_details)
 -FULL_HOST_DETAILS=$(_full_platform_details)
 -
 -if ! $makecheck; then
 -    _full_env_details
 -fi
 -
 -seq="check"
 -
 -[ -n "$TESTS_REMAINING_LOG" ] && echo $list > $TESTS_REMAINING_LOG
 -
 -for seq in $list
 -do
 -    err=false       # error flag
 -    printdiff=false # show diff to reference output?
 -    status=""       # test result summary
 -    results=""      # test result details
 -    thistime=""     # time the test took
 -
 -    if [ -n "$TESTS_REMAINING_LOG" ] ; then
 -        sed -e "s/$seq//" -e 's/  / /' -e 's/^ *//' $TESTS_REMAINING_LOG > $TESTS_REMAINING_LOG.tmp
 -        mv $TESTS_REMAINING_LOG.tmp $TESTS_REMAINING_LOG
 -        sync
 -    fi
 -
 -    lasttime=$(sed -n -e "/^$seq /s/.* //p" <$TIMESTAMP_FILE)
 -    starttime=$(date "+%T")
 -    _report_test_start $seq $starttime $lasttime
 -
 -    if $showme
 -    then
 -        status="not run"
 -    elif [ -f expunged ] && $expunge && egrep "^$seq([         ]|\$)" expunged >/dev/null
 -    then
 -        status="not run"
 -        results="expunged"
 -        rm -f $seq.out.bad
 -        echo "/^$seq\$/d" >>$tmp.expunged
 -    elif [ ! -f "$source_iotests/$seq" ]
 -    then
 -        status="not run"
 -        results="no such test?"
 -        echo "/^$seq\$/d" >>$tmp.expunged
 -    else
 -        # really going to try and run this one
 -        #
 -        rm -f $seq.out.bad
 -        rm -f core $seq.notrun
 -        rm -f $seq.casenotrun
 -
 -        start=$(_wallclock)
 -
 -        if [ "$(head -n 1 "$source_iotests/$seq")" == "#!/usr/bin/env python3" ]; then
 -            if $python_usable; then
 -                run_command="$PYTHON $seq"
 -            else
 -                run_command="false"
 -                echo "$python_unusable_because" > $seq.notrun
 -            fi
 -        else
 -            run_command="./$seq"
 -        fi
 -        export OUTPUT_DIR=$PWD
 -        if $debug; then
 -            (cd "$source_iotests";
 -            MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \
 -                    $run_command -d 2>&1 | tee $tmp.out)
 -        else
 -            (cd "$source_iotests";
 -            MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \
 -                    $run_command >$tmp.out 2>&1)
 -        fi
 -        sts=$?
 -        stop=$(_wallclock)
 -
 -        if [ -f core ]
 -        then
 -            mv core $seq.core
 -            status="fail"
 -            results="[dumped core] $seq.core"
 -            err=true
 -        fi
 -
 -        if [ -f $seq.notrun ]
 -        then
 -            # overwrites timestamp output
 -            status="not run"
 -            results="$(cat $seq.notrun)"
 -        else
 -            if [ $sts -ne 0 ]
 -            then
 -                status="fail"
 -                results=$(printf %s "[failed, exit status $sts]")
 -                err=true
 -            fi
 -
 -            reference="$source_iotests/$seq.out"
 -            reference_machine="$source_iotests/$seq.$QEMU_DEFAULT_MACHINE.out"
 -            if [ -f "$reference_machine" ]; then
 -                reference="$reference_machine"
 -            fi
 -
 -            reference_format="$source_iotests/$seq.out.$IMGFMT"
 -            if [ -f "$reference_format" ]; then
 -                reference="$reference_format"
 -            fi
 -
 -            if [ "$CACHEMODE" = "none" ]; then
 -                [ -f "$source_iotests/$seq.out.nocache" ] && reference="$source_iotests/$seq.out.nocache"
 -            fi
 -
 -            if [ ! -f "$reference" ]
 -            then
 -                status="fail"
 -                results="no qualified output"
 -                err=true
 -            else
 -                if diff -w "$reference" $tmp.out >/dev/null 2>&1
 -                then
 -                    if ! $err; then
 -                        status="pass"
 -                        thistime=$(expr $stop - $start)
 -                        echo "$seq $thistime" >>$tmp.time
 -                    fi
 -                else
 -                    mv $tmp.out $seq.out.bad
 -                    status="fail"
 -                    results="output mismatch (see $seq.out.bad)"
 -                    printdiff=true
 -                    err=true
 -                fi
 -            fi
 -        fi
 -        if [ -f $seq.casenotrun ]
 -        then
 -            cat $seq.casenotrun
 -            casenotrun="$casenotrun $seq"
 -        fi
 -    fi
 -
 -    # come here for each test, except when $showme is true
 -    #
 -    _report_test_result $seq "$status" "$starttime" "$lasttime" "$thistime" "$results"
 -    case "$status" in
 -        "pass")
 -            try=$(expr $try + 1)
 -            ;;
 -        "fail")
 -            try=$(expr $try + 1)
 -            if $makecheck; then
 -                _full_env_details
 -            fi
 -            if $printdiff; then
 -                $diff -w "$reference" "$PWD"/$seq.out.bad
 -            fi
 -            bad="$bad $seq"
 -            n_bad=$(expr $n_bad + 1)
 -            quick=false
 -            ;;
 -        "not run")
 -            notrun="$notrun $seq"
 -            ;;
 -    esac
 -
 -    seq="after_$seq"
 -done
 -interrupt=false
 -status=$(expr $n_bad)
 -exit
 +import os
 +import sys
 +import argparse
 +from findtests import TestFinder
 +from testenv import TestEnv
 +from testrunner import TestRunner
 +
 +
 +def make_argparser() -> argparse.ArgumentParser:
 +    p = argparse.ArgumentParser(description="Test run options")
 +
 +    p.add_argument('-n', '--dry-run', action='store_true',
 +                   help='show me, do not run tests')
 +    p.add_argument('-makecheck', action='store_true',
 +                   help='pretty print output for make check')
 +
 +    p.add_argument('-d', dest='debug', action='store_true', help='debug')
 +    p.add_argument('-misalign', action='store_true',
 +                   help='misalign memory allocations')
 +    p.add_argument('--color', choices=['on', 'off', 'auto'],
 +                   default='auto', help="use terminal colors. The default "
 +                   "'auto' value means use colors if terminal stdout detected")
 +
 +    g_env = p.add_argument_group('test environment options')
 +    mg = g_env.add_mutually_exclusive_group()
 +    # We don't set default for cachemode, as we need to distinguish default
 +    # from user input later.
 +    mg.add_argument('-nocache', dest='cachemode', action='store_const',
 +                    const='none', help='set cache mode "none" (O_DIRECT), '
 +                    'sets CACHEMODE environment variable')
 +    mg.add_argument('-c', dest='cachemode',
 +                    help='sets CACHEMODE environment variable')
 +
 +    g_env.add_argument('-i', dest='aiomode', default='threads',
 +                       help='sets AIOMODE environment variable')
 +
 +    p.set_defaults(imgfmt='raw', imgproto='file')
 +
 +    format_list = ['raw', 'bochs', 'cloop', 'parallels', 'qcow', 'qcow2',
 +                   'qed', 'vdi', 'vpc', 'vhdx', 'vmdk', 'luks', 'dmg']
 +    g_fmt = p.add_argument_group(
 +        '  image format options',
 +        'The following options set the IMGFMT environment variable. '
 +        'At most one choice is allowed, default is "raw"')
 +    mg = g_fmt.add_mutually_exclusive_group()
 +    for fmt in format_list:
 +        mg.add_argument('-' + fmt, dest='imgfmt', action='store_const',
 +                        const=fmt, help=f'test {fmt}')
 +
 +    protocol_list = ['file', 'rbd', 'sheepdog', 'nbd', 'ssh', 'nfs',
 +                     'fuse']
 +    g_prt = p.add_argument_group(
 +        '  image protocol options',
 +        'The following options set the IMGPROTO environment variable. '
 +        'At most one choice is allowed, default is "file"')
 +    mg = g_prt.add_mutually_exclusive_group()
 +    for prt in protocol_list:
 +        mg.add_argument('-' + prt, dest='imgproto', action='store_const',
 +                        const=prt, help=f'test {prt}')
 +
 +    g_bash = p.add_argument_group('bash tests options',
 +                                  'The following options are ignored by '
 +                                  'python tests.')
 +    # TODO: make support for the following options in iotests.py
 +    g_bash.add_argument('-o', dest='imgopts',
 +                        help='options to pass to qemu-img create/convert, '
 +                        'sets IMGOPTS environment variable')
 +    g_bash.add_argument('-valgrind', action='store_true',
 +                        help='use valgrind, sets VALGRIND_QEMU environment '
 +                        'variable')
 +
 +    g_sel = p.add_argument_group('test selecting options',
 +                                 'The following options specify test set '
 +                                 'to run.')
 +    g_sel.add_argument('-g', '--groups', metavar='group1,...',
 +                       help='include tests from these groups')
 +    g_sel.add_argument('-x', '--exclude-groups', metavar='group1,...',
 +                       help='exclude tests from these groups')
 +    g_sel.add_argument('--start-from', metavar='TEST',
 +                       help='Start from specified test: make sorted sequence '
 +                       'of tests as usual and then drop tests from the first '
 +                       'one to TEST (not inclusive). This may be used to '
 +                       'rerun failed ./check command, starting from the '
 +                       'middle of the process.')
 +    g_sel.add_argument('tests', metavar='TEST_FILES', nargs='*',
 +                       help='tests to run')
 +
 +    return p
 +
 +
 +if __name__ == '__main__':
 +    args = make_argparser().parse_args()
 +
 +    env = TestEnv(imgfmt=args.imgfmt, imgproto=args.imgproto,
 +                  aiomode=args.aiomode, cachemode=args.cachemode,
 +                  imgopts=args.imgopts, misalign=args.misalign,
 +                  debug=args.debug, valgrind=args.valgrind)
 +
 +    testfinder = TestFinder(test_dir=env.source_iotests)
 +
 +    groups = args.groups.split(',') if args.groups else None
 +    x_groups = args.exclude_groups.split(',') if args.exclude_groups else None
 +
 +    group_local = os.path.join(env.source_iotests, 'group.local')
 +    if os.path.isfile(group_local):
 +        try:
 +            testfinder.add_group_file(group_local)
 +        except ValueError as e:
 +            sys.exit(f"Failed to parse group file '{group_local}': {e}")
 +
 +    try:
 +        tests = testfinder.find_tests(groups=groups, exclude_groups=x_groups,
 +                                      tests=args.tests,
 +                                      start_from=args.start_from)
 +        if not tests:
 +            raise ValueError('No tests selected')
 +    except ValueError as e:
 +        sys.exit(e)
 +
 +    if args.dry_run:
 +        print('\n'.join(tests))
 +    else:
 +        with TestRunner(env, makecheck=args.makecheck,
 +                        color=args.color) as tr:
 +            tr.run_tests([os.path.join(env.source_iotests, t) for t in tests])
 diff --git a/tests/qemu-iotests/common.env.in b/tests/qemu-iotests/common.env.in
 deleted file mode 100644
 index XXXXXXX..XXXXXXX
 --- a/tests/qemu-iotests/common.env.in
 +++ /dev/null
@@ -XXX,XX +XXX,XX @@
 -# Automatically generated by configure - do not modify
 -
 -export PYTHON='@PYTHON@'
 diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
 deleted file mode 100644
 index XXXXXXX..XXXXXXX
 --- a/tests/qemu-iotests/group
 +++ /dev/null
@@ -XXX,XX +XXX,XX @@
 -#
 -# QA groups control file
 -# Defines test groups
 -#
 -# Some notes about the groups:
 -#
 -# - do not start group names with a digit
 -#
 -# - quick : Tests in this group should finish within some few seconds.
 -#
 -# - img : Tests in this group can be used to excercise the qemu-img tool.
 -#
 -# - auto : Tests in this group are used during "make check" and should be
 -#   runnable in any case. That means they should run with every QEMU binary
 -#   (also non-x86), with every QEMU configuration (i.e. must not fail if
 -#   an optional feature is not compiled in - but reporting a "skip" is ok),
 -#   work at least with the qcow2 file format, work with all kind of host
 -#   filesystems and users (e.g. "nobody" or "root") and must not take too
 -#   much memory and disk space (since CI pipelines tend to fail otherwise).
 -#
 -
 -#
 -# test-group association ... one line per test
 -#
 -001 rw auto quick
 -002 rw auto quick
 -003 rw auto
 -004 rw auto quick
 -005 img auto quick
 -# 006 was removed, do not reuse
 -007 snapshot auto
 -008 rw auto quick
 -009 rw auto quick
 -010 rw auto quick
 -011 rw auto quick
 -012 auto quick
 -013 rw auto
 -014 rw
 -015 rw snapshot
 -# 016 was removed, do not reuse
 -017 rw backing auto quick
 -018 rw backing auto quick
 -019 rw backing auto quick
 -020 rw backing auto quick
 -021 io auto quick
 -022 rw snapshot auto
 -023 rw
 -024 rw backing auto quick
 -025 rw auto quick
 -026 rw blkdbg
 -027 rw auto quick
 -028 rw backing quick
 -029 rw auto quick
 -030 rw auto backing
 -031 rw auto quick
 -032 rw auto quick
 -033 rw auto quick
 -034 rw auto backing quick
 -035 rw auto quick
 -036 rw auto quick
 -037 rw auto backing quick
 -038 rw auto backing quick
 -039 rw auto quick
 -040 rw auto
 -041 rw auto backing
 -042 rw auto quick
 -043 rw auto backing
 -044 rw
 -045 rw quick
 -046 rw auto aio quick
 -047 rw auto quick
 -048 img auto quick
 -049 rw auto
 -050 rw auto backing quick
 -051 rw
 -052 rw auto backing quick
 -053 rw auto quick
 -054 rw auto quick
 -055 rw
 -056 rw backing
 -057 rw
 -058 rw quick
 -059 rw quick
 -060 rw auto quick
 -061 rw auto
 -062 rw auto quick
 -063 rw auto quick
 -064 rw quick
 -065 rw quick
 -066 rw auto quick
 -# 067 was removed, do not reuse
 -068 rw quick
 -069 rw auto quick
 -070 rw quick
 -071 rw auto quick
 -072 rw auto quick
 -073 rw auto quick
 -074 rw auto quick
 -075 rw quick
 -076 io
 -077 rw quick
 -078 rw quick
 -079 rw auto
 -080 rw auto
 -081 rw quick
 -082 rw quick
 -083 rw
 -084 img quick
 -085 rw
 -086 rw auto quick
 -087 rw quick
 -088 rw quick
 -089 rw auto quick
 -090 rw auto quick
 -091 rw migration quick
 -092 rw quick
 -093 throttle
 -094 rw quick
 -095 rw quick
 -096 rw quick
 -097 rw auto backing
 -098 rw auto backing quick
 -099 rw auto quick
 -# 100 was removed, do not reuse
 -101 rw quick
 -102 rw quick
 -103 rw auto quick
 -104 rw auto
 -105 rw auto quick
 -106 rw quick
 -107 rw auto quick
 -108 rw auto quick
 -109 rw
 -110 rw auto backing quick
 -111 rw auto quick
 -112 rw
 -113 rw quick
 -114 rw auto quick
 -115 rw
 -116 rw quick
 -117 rw auto
 -118 rw
 -119 rw quick
 -120 rw auto quick
 -121 rw
 -122 rw
 -123 rw quick
 -124 rw backing
 -125 rw
 -126 rw auto backing
 -127 rw auto backing quick
 -128 rw quick
 -129 rw quick
 -130 rw quick
 -131 rw quick
 -132 rw quick
 -133 auto quick
 -134 rw auto quick
 -135 rw
 -136 rw
 -137 rw auto
 -138 rw auto quick
 -139 rw quick
 -140 rw auto quick
 -141 rw auto quick
 -142
 -143 auto quick
 -144 rw quick
 -145 quick
 -146 quick
 -147 img
 -148 rw quick
 -149 rw sudo
 -150 rw auto quick
 -151 rw
 -152 rw quick
 -153 rw quick
 -154 rw auto backing quick
 -155 rw
 -156 rw auto quick
 -157 quick
 -158 rw auto quick
 -159 rw auto quick
 -160 rw quick
 -161 rw auto quick
 -162 quick
 -163 rw
 -165 rw quick
 -169 rw migration
 -170 rw auto quick
 -171 rw quick
 -172 auto
 -173 rw
 -174 auto
 -175 quick
 -176 rw auto backing
 -177 rw auto quick
 -178 img
 -179 rw auto quick
 -181 rw auto migration quick
 -182 rw quick
 -183 rw migration quick
 -184 rw auto quick
 -185 rw
 -186 rw auto
 -187 rw auto
 -188 rw quick
 -189 rw
 -190 rw auto quick
 -191 rw auto
 -192 rw auto quick
 -194 rw migration quick
 -195 rw auto quick
 -196 rw quick migration
 -197 rw quick
 -198 rw
 -199 rw migration
 -200 rw
 -201 rw migration quick
 -202 rw quick
 -203 rw auto migration quick
 -204 rw quick
 -205 rw quick
 -206 rw
 -207 rw
 -208 rw quick
 -209 rw quick
 -210 rw
 -211 rw quick
 -212 rw quick
 -213 rw quick
 -214 rw auto
 -215 rw quick
 -216 rw quick
 -217 rw auto quick
 -218 rw quick
 -219 rw
 -220 rw auto
 -221 rw quick
 -222 rw quick
 -223 rw quick
 -224 rw quick
 -225 rw quick
 -226 auto quick
 -227 quick
 -228 rw quick
 -229 auto quick
 -231 quick
 -232 quick
 -233 quick
 -234 quick migration
 -235 quick
 -236 quick
 -237 rw quick
 -238 quick
 -239 rw quick
 -240 quick
 -241 rw quick
 -242 rw quick
 -243 rw quick
 -244 rw auto quick
 -245 rw
 -246 rw quick
 -247 rw quick
 -248 rw quick
 -249 rw auto quick
 -250 rw quick
 -251 rw auto quick
 -252 rw auto backing quick
 -253 rw quick
 -254 rw backing quick
 -255 rw quick
 -256 rw auto quick
 -257 rw
 -258 rw quick
 -259 rw auto quick
 -260 rw quick
 -261 rw
 -262 rw quick migration
 -263 rw quick
 -264 rw
 -265 rw auto quick
 -266 rw quick
 -267 rw auto quick snapshot
 -268 rw auto quick
 -270 rw backing quick
 -271 rw auto
 -272 rw
 -273 backing quick
 -274 rw backing
 -277 rw quick
 -279 rw backing quick
 -280 rw migration quick
 -281 rw quick
 -282 rw img quick
 -283 auto quick
 -284 rw
 -286 rw quick
 -287 auto quick
 -288 quick
 -289 rw quick
 -290 rw auto quick
 -291 rw quick
 -292 rw auto quick
 -293 rw
 -294 rw quick
 -295 rw
 -296 rw
 -297 meta
 -298
 -299 auto quick
 -300 migration
 -301 backing quick
 -302 quick
 -303 rw quick
 -304 rw quick
 -305 rw quick
 -307 rw quick export
 -308 rw
 -309 rw auto quick
 -310 rw quick
 -312 rw quick
 -313 rw auto quick
 diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/meson.build
 +++ b/tests/qemu-iotests/meson.build
@@ -XXX,XX +XXX,XX @@ if 'CONFIG_LINUX' in config_host
  else
      socket_scm_helper = []
  endif
 -configure_file(output: 'common.env',
 -               input: files('common.env.in'),
 -               configuration: {'PYTHON': python.full_path()})
 --
-.19.1
+.29.2

-[Qemu-devel] [PULL 15/36] quorum: Return an error if the blkverify mode has invalid settings
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-The blkverify mode of Quorum can only be enabled if the number of
-children is exactly two and the value of vote-threshold is also two.
-If the user tries to enable it but the other settings are incorrect
-then QEMU simply prints an error message to stderr and carries on
-disabling the blkverify setting.
-This patch makes quorum_open() fail and return an error in this case.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Reported-by: Markus Armbruster <armbru@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/quorum.c | 13 ++++++-------
-file changed, 6 insertions(+), 7 deletions(-)
-diff --git a/block/quorum.c b/block/quorum.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/quorum.c
-+++ b/block/quorum.c
-@@ -XXX,XX +XXX,XX @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags,
-     s->read_pattern = ret;
-     if (s->read_pattern == QUORUM_READ_PATTERN_QUORUM) {
--        /* is the driver in blkverify mode */
--        if (qemu_opt_get_bool(opts, QUORUM_OPT_BLKVERIFY, false) &&
--            s->num_children == 2 && s->threshold == 2) {
--            s->is_blkverify = true;
--        } else if (qemu_opt_get_bool(opts, QUORUM_OPT_BLKVERIFY, false)) {
--            fprintf(stderr, "blkverify mode is set by setting blkverify=on "
--                    "and using two files with vote_threshold=2\n");
-+        s->is_blkverify = qemu_opt_get_bool(opts, QUORUM_OPT_BLKVERIFY, false);
-+        if (s->is_blkverify && (s->num_children != 2 || s->threshold != 2)) {
-+            error_setg(&local_err, "blkverify=on can only be set if there are "
-+                       "exactly two files and vote-threshold is 2");
-+            ret = -EINVAL;
-+            goto exit;
-         }
-         s->rewrite_corrupted = qemu_opt_get_bool(opts, QUORUM_OPT_REWRITE,
---
-.19.1

-[Qemu-devel] [PULL 17/36] quorum: Forbid adding children in blkverify mode
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-The blkverify mode of Quorum only works when the number of children is
-exactly two, so any attempt to add a new one must return an error.
-quorum_del_child() on the other hand doesn't need any additional check
-because decreasing the number of children would make it go under the
-vote threshold.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Reported-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/quorum.c | 8 ++++++++
-file changed, 8 insertions(+)
-diff --git a/block/quorum.c b/block/quorum.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/quorum.c
-+++ b/block/quorum.c
-@@ -XXX,XX +XXX,XX @@ static void quorum_add_child(BlockDriverState *bs, BlockDriverState *child_bs,
-     char indexstr[32];
-     int ret;
-+    if (s->is_blkverify) {
-+        error_setg(errp, "Cannot add a child to a quorum in blkverify mode");
-+        return;
-+    }
-+
-     assert(s->num_children <= INT_MAX / sizeof(BdrvChild *));
-     if (s->num_children == INT_MAX / sizeof(BdrvChild *) ||
-         s->next_child_index == UINT_MAX) {
-@@ -XXX,XX +XXX,XX @@ static void quorum_del_child(BlockDriverState *bs, BdrvChild *child,
-         return;
-     }
-+    /* We know now that num_children > threshold, so blkverify must be false */
-+    assert(!s->is_blkverify);
-+
-     bdrv_drained_begin(bs);
-     /* We can safely remove this child now */
---
-.19.1

-[Qemu-devel] [PULL 18/36] iotest: Test x-blockdev-change on a Quorum
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-This patch tests that you can add and remove drives from a Quorum
-using the x-blockdev-change command.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/081     | 86 ++++++++++++++++++++++++++++++++++++++
- tests/qemu-iotests/081.out | 54 ++++++++++++++++++++++++
-files changed, 140 insertions(+)
-diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/081
-+++ b/tests/qemu-iotests/081
-@@ -XXX,XX +XXX,XX @@ quorum="$quorum,file.children.2.driver=raw"
- $QEMU_IO -c "open -o $quorum" | _filter_qemu_io
-+echo
-+echo "== dynamically adding a child to a quorum =="
-+
-+for verify in false true; do
-+    run_qemu <<EOF
-+    { "execute": "qmp_capabilities" }
-+    { "execute": "blockdev-add",
-+        "arguments": {
-+            "driver": "quorum",
-+            "node-name": "drive0-quorum",
-+            "vote-threshold": 2,
-+            "blkverify": ${verify},
-+            "children": [
-+                {
-+                    "driver": "$IMGFMT",
-+                    "file": {
-+                        "driver": "file",
-+                        "filename": "$TEST_DIR/1.raw"
-+                    }
-+                },
-+                {
-+                    "driver": "$IMGFMT",
-+                    "file": {
-+                        "driver": "file",
-+                        "filename": "$TEST_DIR/2.raw"
-+                    }
-+                }
-+            ]
-+        }
-+    }
-+    { "execute": "blockdev-add",
-+        "arguments": {
-+            "node-name": "drive3",
-+            "driver": "$IMGFMT",
-+            "file": {
-+                "driver": "file",
-+                "filename": "$TEST_DIR/2.raw"
-+            }
-+        }
-+    }
-+    { "execute": "x-blockdev-change",
-+      "arguments": { "parent": "drive0-quorum",
-+                     "node": "drive3" } }
-+    { "execute": "quit" }
-+EOF
-+done
-+
-+echo
-+echo "== dynamically removing a child from a quorum =="
-+
-+for verify in false true; do
-+    for vote_threshold in 1 2; do
-+        run_qemu <<EOF
-+        { "execute": "qmp_capabilities" }
-+        { "execute": "blockdev-add",
-+            "arguments": {
-+                "driver": "quorum",
-+                "node-name": "drive0-quorum",
-+                "vote-threshold": ${vote_threshold},
-+                "blkverify": ${verify},
-+                "children": [
-+                    {
-+                        "driver": "$IMGFMT",
-+                        "file": {
-+                            "driver": "file",
-+                            "filename": "$TEST_DIR/1.raw"
-+                        }
-+                    },
-+                    {
-+                        "driver": "$IMGFMT",
-+                        "file": {
-+                            "driver": "file",
-+                            "filename": "$TEST_DIR/2.raw"
-+                        }
-+                    }
-+                ]
-+            }
-+        }
-+        { "execute": "x-blockdev-change",
-+          "arguments": { "parent": "drive0-quorum",
-+                         "child": "children.1" } }
-+        { "execute": "quit" }
-+EOF
-+    done
-+done
-+
- # success, all done
- echo "*** done"
- rm -f $seq.full
-diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/081.out
-+++ b/tests/qemu-iotests/081.out
-@@ -XXX,XX +XXX,XX @@ read 10485760/10485760 bytes at offset 0
- == checking the blkverify mode with invalid settings ==
- can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
-+
-+== dynamically adding a child to a quorum ==
-+Testing:
-+QMP_VERSION
-+{"return": {}}
-+{"return": {}}
-+{"return": {}}
-+{"return": {}}
-+{"return": {}}
-+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
-+
-+Testing:
-+QMP_VERSION
-+{"return": {}}
-+{"return": {}}
-+{"return": {}}
-+{"error": {"class": "GenericError", "desc": "Cannot add a child to a quorum in blkverify mode"}}
-+{"return": {}}
-+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
-+
-+
-+== dynamically removing a child from a quorum ==
-+Testing:
-+QMP_VERSION
-+{"return": {}}
-+{"return": {}}
-+{"return": {}}
-+{"return": {}}
-+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
-+
-+Testing:
-+QMP_VERSION
-+{"return": {}}
-+{"return": {}}
-+{"error": {"class": "GenericError", "desc": "The number of children cannot be lower than the vote threshold 2"}}
-+{"return": {}}
-+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
-+
-+Testing:
-+QMP_VERSION
-+{"return": {}}
-+{"error": {"class": "GenericError", "desc": "blkverify=on can only be set if there are exactly two files and vote-threshold is 2"}}
-+{"error": {"class": "GenericError", "desc": "Cannot find device=drive0-quorum nor node_name=drive0-quorum"}}
-+{"return": {}}
-+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
-+
-+Testing:
-+QMP_VERSION
-+{"return": {}}
-+{"return": {}}
-+{"error": {"class": "GenericError", "desc": "The number of children cannot be lower than the vote threshold 2"}}
-+{"return": {}}
-+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
-+
- *** done
---
-.19.1

-[Qemu-devel] [PULL 19/36] block: Update flags in bdrv_set_read_only()
+Deleted patch
-To fully change the read-only state of a node, we must not only change
-bs->read_only, but also update bs->open_flags.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
----
- block.c | 7 +++++++
-file changed, 7 insertions(+)
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
-     }
-     bs->read_only = read_only;
-+
-+    if (read_only) {
-+        bs->open_flags &= ~BDRV_O_RDWR;
-+    } else {
-+        bs->open_flags |= BDRV_O_RDWR;
-+    }
-+
-     return 0;
- }
---
-.19.1

-[Qemu-devel] [PULL 20/36] block: Add auto-read-only option
+Deleted patch
-If a management application builds the block graph node by node, the
-protocol layer doesn't inherit its read-only option from the format
-layer any more, so it must be set explicitly.
-Backing files should work on read-only storage, but at the same time, a
-block job like commit should be able to reopen them read-write if they
-are on read-write storage. However, without option inheritance, reopen
-only changes the read-only option for the root node (typically the
-format layer), but not the protocol layer, so reopening fails (the
-format layer wants to get write permissions, but the protocol layer is
-still read-only).
-A simple workaround for the problem in the management tool would be to
-open the protocol layer always read-write and to make only the format
-layer read-only for backing files. However, sometimes the file is
-actually stored on read-only storage and we don't know whether the image
-can be opened read-write (for example, for NBD it depends on the server
-we're trying to connect to). This adds an option that makes QEMU try to
-open the image read-write, but allows it to degrade to a read-only mode
-without returning an error.
-The documentation for this option is consciously phrased in a way that
-allows QEMU to switch to a better model eventually: Instead of trying
-when the image is first opened, making the read-only flag dynamic and
-changing it automatically whenever the first BLK_PERM_WRITE user is
-attached or the last one is detached would be much more useful
-behaviour.
-Unfortunately, this more useful behaviour is also a lot harder to
-implement, and libvirt needs a solution now before it can switch to
--blockdev, so let's start with this easier approach for now.
-Instead of adding a new auto-read-only option, turning the existing
-read-only into an enum (with a bool alternate for compatibility) was
-considered, but it complicated the implementation to the point that it
-didn't seem to be worth it.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- qapi/block-core.json  |  7 +++++++
- include/block/block.h |  2 ++
- block.c               | 17 +++++++++++++++++
- block/vvfat.c         |  1 +
- blockdev.c            |  2 +-
-files changed, 28 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 @@
- #                 either generally or in certain configurations. In this case,
- #                 the default value does not work and the option must be
- #                 specified explicitly.
-+# @auto-read-only: if true and @read-only is false, QEMU may automatically
-+#                  decide not to open the image read-write as requested, but
-+#                  fall back to read-only instead (and switch between the modes
-+#                  later), e.g. depending on whether the image file is writable
-+#                  or whether a writing user is attached to the node
-+#                  (default: false, since 3.1)
- # @detect-zeroes: detect and optimize zero writes (Since 2.1)
- #                 (default: off)
- # @force-share:   force share all permission on added nodes.
-@@ -XXX,XX +XXX,XX @@
-             '*discard': 'BlockdevDiscardOptions',
-             '*cache': 'BlockdevCacheOptions',
-             '*read-only': 'bool',
-+            '*auto-read-only': 'bool',
-             '*force-share': 'bool',
-             '*detect-zeroes': 'BlockdevDetectZeroesOptions' },
-   'discriminator': 'driver',
-diff --git a/include/block/block.h b/include/block/block.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/block.h
-+++ b/include/block/block.h
-@@ -XXX,XX +XXX,XX @@ typedef struct HDGeometry {
-                                       select an appropriate protocol driver,
-                                       ignoring the format layer */
- #define BDRV_O_NO_IO       0x10000 /* don't initialize for I/O */
-+#define BDRV_O_AUTO_RDONLY 0x20000 /* degrade to read-only if opening read-write fails */
- #define BDRV_O_CACHE_MASK  (BDRV_O_NOCACHE | BDRV_O_NO_FLUSH)
-@@ -XXX,XX +XXX,XX @@ typedef struct HDGeometry {
- #define BDRV_OPT_CACHE_DIRECT   "cache.direct"
- #define BDRV_OPT_CACHE_NO_FLUSH "cache.no-flush"
- #define BDRV_OPT_READ_ONLY      "read-only"
-+#define BDRV_OPT_AUTO_READ_ONLY "auto-read-only"
- #define BDRV_OPT_DISCARD        "discard"
- #define BDRV_OPT_FORCE_SHARE    "force-share"
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ static void bdrv_inherited_options(int *child_flags, QDict *child_options,
-     /* Inherit the read-only option from the parent if it's not set */
-     qdict_copy_default(child_options, parent_options, BDRV_OPT_READ_ONLY);
-+    qdict_copy_default(child_options, parent_options, BDRV_OPT_AUTO_READ_ONLY);
-     /* Our block drivers take care to send flushes and respect unmap policy,
-      * so we can default to enable both on lower layers regardless of the
-@@ -XXX,XX +XXX,XX @@ static void bdrv_backing_options(int *child_flags, QDict *child_options,
-     /* backing files always opened read-only */
-     qdict_set_default_str(child_options, BDRV_OPT_READ_ONLY, "on");
-+    qdict_set_default_str(child_options, BDRV_OPT_AUTO_READ_ONLY, "off");
-     flags &= ~BDRV_O_COPY_ON_READ;
-     /* snapshot=on is handled on the top layer */
-@@ -XXX,XX +XXX,XX @@ static void update_flags_from_options(int *flags, QemuOpts *opts)
-         *flags |= BDRV_O_RDWR;
-     }
-+    assert(qemu_opt_find(opts, BDRV_OPT_AUTO_READ_ONLY));
-+    if (qemu_opt_get_bool_del(opts, BDRV_OPT_AUTO_READ_ONLY, false)) {
-+        *flags |= BDRV_O_AUTO_RDONLY;
-+    }
- }
- static void update_options_from_flags(QDict *options, int flags)
-@@ -XXX,XX +XXX,XX @@ static void update_options_from_flags(QDict *options, int flags)
-     if (!qdict_haskey(options, BDRV_OPT_READ_ONLY)) {
-         qdict_put_bool(options, BDRV_OPT_READ_ONLY, !(flags & BDRV_O_RDWR));
-     }
-+    if (!qdict_haskey(options, BDRV_OPT_AUTO_READ_ONLY)) {
-+        qdict_put_bool(options, BDRV_OPT_AUTO_READ_ONLY,
-+                       flags & BDRV_O_AUTO_RDONLY);
-+    }
- }
- static void bdrv_assign_node_name(BlockDriverState *bs,
-@@ -XXX,XX +XXX,XX @@ QemuOptsList bdrv_runtime_opts = {
-             .type = QEMU_OPT_BOOL,
-             .help = "Node is opened in read-only mode",
-         },
-+        {
-+            .name = BDRV_OPT_AUTO_READ_ONLY,
-+            .type = QEMU_OPT_BOOL,
-+            .help = "Node can become read-only if opening read-write fails",
-+        },
-         {
-             .name = "detect-zeroes",
-             .type = QEMU_OPT_STRING,
-@@ -XXX,XX +XXX,XX @@ BlockDriverState *bdrv_open_blockdev_ref(BlockdevRef *ref, Error **errp)
-         qdict_set_default_str(qdict, BDRV_OPT_CACHE_DIRECT, "off");
-         qdict_set_default_str(qdict, BDRV_OPT_CACHE_NO_FLUSH, "off");
-         qdict_set_default_str(qdict, BDRV_OPT_READ_ONLY, "off");
-+        qdict_set_default_str(qdict, BDRV_OPT_AUTO_READ_ONLY, "off");
-+
-     }
-     bs = bdrv_open_inherit(NULL, reference, qdict, 0, NULL, NULL, errp);
-diff --git a/block/vvfat.c b/block/vvfat.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vvfat.c
-+++ b/block/vvfat.c
-@@ -XXX,XX +XXX,XX @@ static void vvfat_qcow_options(int *child_flags, QDict *child_options,
-                                int parent_flags, QDict *parent_options)
- {
-     qdict_set_default_str(child_options, BDRV_OPT_READ_ONLY, "off");
-+    qdict_set_default_str(child_options, BDRV_OPT_AUTO_READ_ONLY, "off");
-     qdict_set_default_str(child_options, BDRV_OPT_CACHE_NO_FLUSH, "on");
- }
-diff --git a/blockdev.c b/blockdev.c
-index XXXXXXX..XXXXXXX 100644
---- a/blockdev.c
-+++ b/blockdev.c
-@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_change_medium(bool has_device, const char *device,
-     bdrv_flags = blk_get_open_flags_from_root_state(blk);
-     bdrv_flags &= ~(BDRV_O_TEMPORARY | BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING |
--        BDRV_O_PROTOCOL);
-+        BDRV_O_PROTOCOL | BDRV_O_AUTO_RDONLY);
-     if (!has_read_only) {
-         read_only = BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN;
---
-.19.1

-[Qemu-devel] [PULL 21/36] rbd: Close image in qemu_rbd_open() error path
+Deleted patch
-Commit e2b8247a322 introduced an error path in qemu_rbd_open() after
-calling rbd_open(), but neglected to close the image again in this error
-path. The error path should contain everything that the regular close
-function qemu_rbd_close() contains.
-This adds the missing rbd_close() call.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- block/rbd.c | 1 +
-file changed, 1 insertion(+)
-diff --git a/block/rbd.c b/block/rbd.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/rbd.c
-+++ b/block/rbd.c
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
-                          "automatically marking the image read-only.");
-             r = bdrv_set_read_only(bs, true, &local_err);
-             if (r < 0) {
-+                rbd_close(s->image);
-                 error_propagate(errp, local_err);
-                 goto failed_open;
-             }
---
-.19.1

-[Qemu-devel] [PULL 22/36] block: Require auto-read-only for existing fallbacks
+Deleted patch
-Some block drivers have traditionally changed their node to read-only
-mode without asking the user. This behaviour has been marked deprecated
-since 2.11, expecting users to provide an explicit read-only=on option.
-Now that we have auto-read-only=on, enable these drivers to make use of
-the option.
-This is the only use of bdrv_set_read_only(), so we can make it a bit
-more specific and turn it into a bdrv_apply_auto_read_only() that is
-more convenient for drivers to use.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- include/block/block.h |  3 ++-
- block.c               | 42 +++++++++++++++++++++++++++---------------
- block/bochs.c         | 17 ++++++-----------
- block/cloop.c         | 16 +++++-----------
- block/dmg.c           | 16 +++++-----------
- block/rbd.c           | 15 ++++-----------
- block/vvfat.c         | 10 ++--------
-files changed, 51 insertions(+), 68 deletions(-)
-diff --git a/include/block/block.h b/include/block/block.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/block.h
-+++ b/include/block/block.h
-@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
- bool bdrv_is_read_only(BlockDriverState *bs);
- int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only,
-                            bool ignore_allow_rdw, Error **errp);
--int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
-+int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
-+                              Error **errp);
- bool bdrv_is_writable(BlockDriverState *bs);
- bool bdrv_is_sg(BlockDriverState *bs);
- bool bdrv_is_inserted(BlockDriverState *bs);
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only,
-     return 0;
- }
--/* TODO Remove (deprecated since 2.11)
-- * Block drivers are not supposed to automatically change bs->read_only.
-- * Instead, they should just check whether they can provide what the user
-- * explicitly requested and error out if read-write is requested, but they can
-- * only provide read-only access. */
--int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
-+/*
-+ * Called by a driver that can only provide a read-only image.
-+ *
-+ * Returns 0 if the node is already read-only or it could switch the node to
-+ * read-only because BDRV_O_AUTO_RDONLY is set.
-+ *
-+ * Returns -EACCES if the node is read-write and BDRV_O_AUTO_RDONLY is not set
-+ * or bdrv_can_set_read_only() forbids making the node read-only. If @errmsg
-+ * is not NULL, it is used as the error message for the Error object.
-+ */
-+int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
-+                              Error **errp)
- {
-     int ret = 0;
--    ret = bdrv_can_set_read_only(bs, read_only, false, errp);
--    if (ret < 0) {
--        return ret;
-+    if (!(bs->open_flags & BDRV_O_RDWR)) {
-+        return 0;
-+    }
-+    if (!(bs->open_flags & BDRV_O_AUTO_RDONLY)) {
-+        goto fail;
-     }
--    bs->read_only = read_only;
--
--    if (read_only) {
--        bs->open_flags &= ~BDRV_O_RDWR;
--    } else {
--        bs->open_flags |= BDRV_O_RDWR;
-+    ret = bdrv_can_set_read_only(bs, true, false, NULL);
-+    if (ret < 0) {
-+        goto fail;
-     }
-+    bs->read_only = true;
-+    bs->open_flags &= ~BDRV_O_RDWR;
-+
-     return 0;
-+
-+fail:
-+    error_setg(errp, "%s", errmsg ?: "Image is read-only");
-+    return -EACCES;
- }
- void bdrv_get_full_backing_filename_from_filename(const char *backed,
-diff --git a/block/bochs.c b/block/bochs.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/bochs.c
-+++ b/block/bochs.c
-@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
-     struct bochs_header bochs;
-     int ret;
-+    /* No write support yet */
-+    ret = bdrv_apply_auto_read_only(bs, NULL, errp);
-+    if (ret < 0) {
-+        return ret;
-+    }
-+
-     bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,
-                                false, errp);
-     if (!bs->file) {
-         return -EINVAL;
-     }
--    if (!bdrv_is_read_only(bs)) {
--        error_report("Opening bochs images without an explicit read-only=on "
--                     "option is deprecated. Future versions will refuse to "
--                     "open the image instead of automatically marking the "
--                     "image read-only.");
--        ret = bdrv_set_read_only(bs, true, errp); /* no write support yet */
--        if (ret < 0) {
--            return ret;
--        }
--    }
--
-     ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));
-     if (ret < 0) {
-         return ret;
-diff --git a/block/cloop.c b/block/cloop.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/cloop.c
-+++ b/block/cloop.c
-@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
-     uint32_t offsets_size, max_compressed_block_size = 1, i;
-     int ret;
-+    ret = bdrv_apply_auto_read_only(bs, NULL, errp);
-+    if (ret < 0) {
-+        return ret;
-+    }
-+
-     bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,
-                                false, errp);
-     if (!bs->file) {
-         return -EINVAL;
-     }
--    if (!bdrv_is_read_only(bs)) {
--        error_report("Opening cloop images without an explicit read-only=on "
--                     "option is deprecated. Future versions will refuse to "
--                     "open the image instead of automatically marking the "
--                     "image read-only.");
--        ret = bdrv_set_read_only(bs, true, errp);
--        if (ret < 0) {
--            return ret;
--        }
--    }
--
-     /* read header */
-     ret = bdrv_pread(bs->file, 128, &s->block_size, 4);
-     if (ret < 0) {
-diff --git a/block/dmg.c b/block/dmg.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/dmg.c
-+++ b/block/dmg.c
-@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
-     int64_t offset;
-     int ret;
-+    ret = bdrv_apply_auto_read_only(bs, NULL, errp);
-+    if (ret < 0) {
-+        return ret;
-+    }
-+
-     bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,
-                                false, errp);
-     if (!bs->file) {
-         return -EINVAL;
-     }
--    if (!bdrv_is_read_only(bs)) {
--        error_report("Opening dmg images without an explicit read-only=on "
--                     "option is deprecated. Future versions will refuse to "
--                     "open the image instead of automatically marking the "
--                     "image read-only.");
--        ret = bdrv_set_read_only(bs, true, errp);
--        if (ret < 0) {
--            return ret;
--        }
--    }
--
-     block_module_load_one("dmg-bz2");
-     s->n_chunks = 0;
-diff --git a/block/rbd.c b/block/rbd.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/rbd.c
-+++ b/block/rbd.c
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
-     /* If we are using an rbd snapshot, we must be r/o, otherwise
-      * leave as-is */
-     if (s->snap != NULL) {
--        if (!bdrv_is_read_only(bs)) {
--            error_report("Opening rbd snapshots without an explicit "
--                         "read-only=on option is deprecated. Future versions "
--                         "will refuse to open the image instead of "
--                         "automatically marking the image read-only.");
--            r = bdrv_set_read_only(bs, true, &local_err);
--            if (r < 0) {
--                rbd_close(s->image);
--                error_propagate(errp, local_err);
--                goto failed_open;
--            }
-+        r = bdrv_apply_auto_read_only(bs, "rbd snapshots are read-only", errp);
-+        if (r < 0) {
-+            rbd_close(s->image);
-+            goto failed_open;
-         }
-     }
-diff --git a/block/vvfat.c b/block/vvfat.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vvfat.c
-+++ b/block/vvfat.c
-@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
-                        "Unable to set VVFAT to 'rw' when drive is read-only");
-             goto fail;
-         }
--    } else  if (!bdrv_is_read_only(bs)) {
--        error_report("Opening non-rw vvfat images without an explicit "
--                     "read-only=on option is deprecated. Future versions "
--                     "will refuse to open the image instead of "
--                     "automatically marking the image read-only.");
--        /* read only is the default for safety */
--        ret = bdrv_set_read_only(bs, true, &local_err);
-+    } else {
-+        ret = bdrv_apply_auto_read_only(bs, NULL, errp);
-         if (ret < 0) {
--            error_propagate(errp, local_err);
-             goto fail;
-         }
-     }
---
-.19.1

-[Qemu-devel] [PULL 23/36] nbd: Support auto-read-only option
+Deleted patch
-If read-only=off, but auto-read-only=on is given, open a read-write NBD
-connection if the server provides a read-write export, but instead of
-erroring out for read-only exports, just degrade to read-only.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- block/nbd-client.c | 10 +++++-----
-file changed, 5 insertions(+), 5 deletions(-)
-diff --git a/block/nbd-client.c b/block/nbd-client.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/nbd-client.c
-+++ b/block/nbd-client.c
-@@ -XXX,XX +XXX,XX @@ int nbd_client_init(BlockDriverState *bs,
-         logout("Failed to negotiate with the NBD server\n");
-         return ret;
-     }
--    if (client->info.flags & NBD_FLAG_READ_ONLY &&
--        !bdrv_is_read_only(bs)) {
--        error_setg(errp,
--                   "request for write access conflicts with read-only export");
--        return -EACCES;
-+    if (client->info.flags & NBD_FLAG_READ_ONLY) {
-+        ret = bdrv_apply_auto_read_only(bs, "NBD export is read-only", errp);
-+        if (ret < 0) {
-+            return ret;
-+        }
-     }
-     if (client->info.flags & NBD_FLAG_SEND_FUA) {
-         bs->supported_write_flags = BDRV_REQ_FUA;
---
-.19.1

-[Qemu-devel] [PULL 24/36] file-posix: Support auto-read-only option
+Deleted patch
-If read-only=off, but auto-read-only=on is given, open the file
-read-write if we have the permissions, but instead of erroring out for
-read-only files, just degrade to read-only.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- block/file-posix.c | 19 ++++++++++++++++---
-file changed, 16 insertions(+), 3 deletions(-)
-diff --git a/block/file-posix.c b/block/file-posix.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
-+++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
-     s->fd = -1;
-     fd = qemu_open(filename, s->open_flags, 0644);
--    if (fd < 0) {
--        ret = -errno;
--        error_setg_errno(errp, errno, "Could not open '%s'", filename);
-+    ret = fd < 0 ? -errno : 0;
-+
-+    if (ret == -EACCES || ret == -EROFS) {
-+        /* Try to degrade to read-only, but if it doesn't work, still use the
-+         * normal error message. */
-+        if (bdrv_apply_auto_read_only(bs, NULL, NULL) == 0) {
-+            bdrv_flags &= ~BDRV_O_RDWR;
-+            raw_parse_flags(bdrv_flags, &s->open_flags);
-+            assert(!(s->open_flags & O_CREAT));
-+            fd = qemu_open(filename, s->open_flags);
-+            ret = fd < 0 ? -errno : 0;
-+        }
-+    }
-+
-+    if (ret < 0) {
-+        error_setg_errno(errp, -ret, "Could not open '%s'", filename);
-         if (ret == -EROFS) {
-             ret = -EACCES;
-         }
---
-.19.1

-[Qemu-devel] [PULL 25/36] curl: Support auto-read-only option
+Deleted patch
-If read-only=off, but auto-read-only=on is given, just degrade to
-read-only.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- block/curl.c | 8 ++++----
-file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/block/curl.c b/block/curl.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/curl.c
-+++ b/block/curl.c
-@@ -XXX,XX +XXX,XX @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,
-     const char *protocol_delimiter;
-     int ret;
--
--    if (flags & BDRV_O_RDWR) {
--        error_setg(errp, "curl block device does not support writes");
--        return -EROFS;
-+    ret = bdrv_apply_auto_read_only(bs, "curl driver does not support writes",
-+                                    errp);
-+    if (ret < 0) {
-+        return ret;
-     }
-     if (!libcurl_initialized) {
---
-.19.1

-[Qemu-devel] [PULL 26/36] gluster: Support auto-read-only option
+Deleted patch
-If read-only=off, but auto-read-only=on is given, open the file
-read-write if we have the permissions, but instead of erroring out for
-read-only files, just degrade to read-only.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Niels de Vos <ndevos@redhat.com>
----
- block/gluster.c | 12 ++++++++++--
-file changed, 10 insertions(+), 2 deletions(-)
-diff --git a/block/gluster.c b/block/gluster.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/gluster.c
-+++ b/block/gluster.c
-@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_open(BlockDriverState *bs,  QDict *options,
-     qemu_gluster_parse_flags(bdrv_flags, &open_flags);
-     s->fd = glfs_open(s->glfs, gconf->path, open_flags);
--    if (!s->fd) {
--        ret = -errno;
-+    ret = s->fd ? 0 : -errno;
-+
-+    if (ret == -EACCES || ret == -EROFS) {
-+        /* Try to degrade to read-only, but if it doesn't work, still use the
-+         * normal error message. */
-+        if (bdrv_apply_auto_read_only(bs, NULL, NULL) == 0) {
-+            open_flags = (open_flags & ~O_RDWR) | O_RDONLY;
-+            s->fd = glfs_open(s->glfs, gconf->path, open_flags);
-+            ret = s->fd ? 0 : -errno;
-+        }
-     }
-     s->supports_seek_data = qemu_gluster_test_seek(s->fd);
---
-.19.1

-[Qemu-devel] [PULL 27/36] iscsi: Support auto-read-only option
+Deleted patch
-If read-only=off, but auto-read-only=on is given, open the volume
-read-write if we have the permissions, but instead of erroring out for
-read-only volumes, just degrade to read-only.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- block/iscsi.c | 8 +++++---
-file changed, 5 insertions(+), 3 deletions(-)
-diff --git a/block/iscsi.c b/block/iscsi.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/iscsi.c
-+++ b/block/iscsi.c
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-     /* Check the write protect flag of the LUN if we want to write */
-     if (iscsilun->type == TYPE_DISK && (flags & BDRV_O_RDWR) &&
-         iscsilun->write_protected) {
--        error_setg(errp, "Cannot open a write protected LUN as read-write");
--        ret = -EACCES;
--        goto out;
-+        ret = bdrv_apply_auto_read_only(bs, "LUN is write protected", errp);
-+        if (ret < 0) {
-+            goto out;
-+        }
-+        flags &= ~BDRV_O_RDWR;
-     }
-     iscsi_readcapacity_sync(iscsilun, &local_err);
---
-.19.1

-[Qemu-devel] [PULL 28/36] block: Make auto-read-only=on default for -drive
+Deleted patch
-While we want machine interfaces like -blockdev and QMP blockdev-add to
-add as little auto-detection as possible so that management tools are
-explicit about their needs, -drive is a convenience option for human
-users. Enabling auto-read-only=on by default there enables users to use
-read-only images for read-only guest devices without having to specify
-read-only=on explicitly. If they try to attach the image to a read-write
-device, they will still get an error message.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- blockdev.c | 1 +
-file changed, 1 insertion(+)
-diff --git a/blockdev.c b/blockdev.c
-index XXXXXXX..XXXXXXX 100644
---- a/blockdev.c
-+++ b/blockdev.c
-@@ -XXX,XX +XXX,XX @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts,
-         qdict_set_default_str(bs_opts, BDRV_OPT_CACHE_NO_FLUSH, "off");
-         qdict_set_default_str(bs_opts, BDRV_OPT_READ_ONLY,
-                               read_only ? "on" : "off");
-+        qdict_set_default_str(bs_opts, BDRV_OPT_AUTO_READ_ONLY, "on");
-         assert((bdrv_flags & BDRV_O_CACHE_MASK) == 0);
-         if (runstate_check(RUN_STATE_INMIGRATE)) {
---
-.19.1

-[Qemu-devel] [PULL 30/36] option: Make option help nicer to read
+Deleted patch
-From: Max Reitz <mreitz@redhat.com>
-This adds some whitespace into the option help (including indentation)
-and puts angle brackets around the type names.  Furthermore, the list
-name is no longer printed as part of every line, but only once in
-advance, and only if the caller did not print a caption already.
-This patch also restores the description alignment we had before commit
-cbef9d68ee1d8d0, just at 24 instead of 16 characters like we used to.
-This increase is because now we have the type and two spaces of
-indentation before the description, and with a usual type name length of
-three chracters, this sums up to eight additional characters -- which
-means that we now need 24 characters to get the same amount of padding
-for most options.  Also, 24 is a third of 80, which makes it kind of a
-round number in terminal terms.
-Finally, this patch amends the reference output of iotest 082 to match
-the changes (and thus makes it pass again).
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- include/qemu/option.h      |   2 +-
- qemu-img.c                 |   4 +-
- util/qemu-option.c         |  32 +-
- tests/qemu-iotests/082.out | 956 ++++++++++++++++++-------------------
-files changed, 507 insertions(+), 487 deletions(-)
-diff --git a/include/qemu/option.h b/include/qemu/option.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/qemu/option.h
-+++ b/include/qemu/option.h
-@@ -XXX,XX +XXX,XX @@ typedef int (*qemu_opts_loopfunc)(void *opaque, QemuOpts *opts, Error **errp);
- int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func,
-                       void *opaque, Error **errp);
- void qemu_opts_print(QemuOpts *opts, const char *sep);
--void qemu_opts_print_help(QemuOptsList *list);
-+void qemu_opts_print_help(QemuOptsList *list, bool print_caption);
- void qemu_opts_free(QemuOptsList *list);
- QemuOptsList *qemu_opts_append(QemuOptsList *dst, QemuOptsList *list);
-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 int print_block_option_help(const char *filename, const char *fmt)
-     }
-     printf("Supported options:\n");
--    qemu_opts_print_help(create_opts);
-+    qemu_opts_print_help(create_opts, false);
-     qemu_opts_free(create_opts);
-     return 0;
- }
-@@ -XXX,XX +XXX,XX @@ static int print_amend_option_help(const char *format)
-     assert(drv->create_opts);
-     printf("Creation options for '%s':\n", format);
--    qemu_opts_print_help(drv->create_opts);
-+    qemu_opts_print_help(drv->create_opts, false);
-     printf("\nNote that not all of these options may be amendable.\n");
-     return 0;
- }
-diff --git a/util/qemu-option.c b/util/qemu-option.c
-index XXXXXXX..XXXXXXX 100644
---- a/util/qemu-option.c
-+++ b/util/qemu-option.c
-@@ -XXX,XX +XXX,XX @@ static const char *opt_type_to_string(enum QemuOptType type)
-     g_assert_not_reached();
- }
--void qemu_opts_print_help(QemuOptsList *list)
-+/**
-+ * Print the list of options available in the given list.  If
-+ * @print_caption is true, a caption (including the list name, if it
-+ * exists) is printed.  The options itself will be indented, so
-+ * @print_caption should only be set to false if the caller prints its
-+ * own custom caption (so that the indentation makes sense).
-+ */
-+void qemu_opts_print_help(QemuOptsList *list, bool print_caption)
- {
-     QemuOptDesc *desc;
-     int i;
-@@ -XXX,XX +XXX,XX @@ void qemu_opts_print_help(QemuOptsList *list)
-     desc = list->desc;
-     while (desc && desc->name) {
-         GString *str = g_string_new(NULL);
--        if (list->name) {
--            g_string_append_printf(str, "%s.", list->name);
--        }
--        g_string_append_printf(str, "%s=%s", desc->name,
-+        g_string_append_printf(str, "  %s=<%s>", desc->name,
-                                opt_type_to_string(desc->type));
-         if (desc->help) {
-+            if (str->len < 24) {
-+                g_string_append_printf(str, "%*s", 24 - (int)str->len, "");
-+            }
-             g_string_append_printf(str, " - %s", desc->help);
-         }
-         g_ptr_array_add(array, g_string_free(str, false));
-@@ -XXX,XX +XXX,XX @@ void qemu_opts_print_help(QemuOptsList *list)
-     }
-     g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0);
-+    if (print_caption && array->len > 0) {
-+        if (list->name) {
-+            printf("%s options:\n", list->name);
-+        } else {
-+            printf("Options:\n");
-+        }
-+    } else if (array->len == 0) {
-+        if (list->name) {
-+            printf("There are no options for %s.\n", list->name);
-+        } else {
-+            printf("No options available.\n");
-+        }
-+    }
-     for (i = 0; i < array->len; i++) {
-         printf("%s\n", (char *)array->pdata[i]);
-     }
-@@ -XXX,XX +XXX,XX @@ QemuOpts *qemu_opts_parse_noisily(QemuOptsList *list, const char *params,
-     opts = opts_parse(list, params, permit_abbrev, false, &invalidp, &err);
-     if (err) {
-         if (invalidp && has_help_option(params)) {
--            qemu_opts_print_help(list);
-+            qemu_opts_print_help(list, true);
-             error_free(err);
-         } else {
-             error_report_err(err);
-diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/082.out
-+++ b/tests/qemu-iotests/082.out
-@@ -XXX,XX +XXX,XX @@ cluster_size: 8192
- Testing: create -f qcow2 -o help TEST_DIR/t.qcow2 128M
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: create -f qcow2 -o ? TEST_DIR/t.qcow2 128M
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: create -f qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2 128M
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: create -f qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2 128M
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: create -f qcow2 -o help,cluster_size=4k TEST_DIR/t.qcow2 128M
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: create -f qcow2 -o ?,cluster_size=4k TEST_DIR/t.qcow2 128M
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: create -f qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2 128M
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: create -f qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2 128M
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: create -f qcow2 -u -o backing_file=TEST_DIR/t.qcow2,,help TEST_DIR/t.qcow2 128M
- Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 backing_file=TEST_DIR/t.qcow2,,help cluster_size=65536 lazy_refcounts=off refcount_bits=16
-@@ -XXX,XX +XXX,XX @@ qemu-img: Invalid option list: ,,
- Testing: create -f qcow2 -o help
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: create -o help
- Supported options:
--size             Virtual disk size
-+  size=<size>            - Virtual disk size
- Testing: create -f bochs -o help
- qemu-img: Format driver 'bochs' does not support image creation
-@@ -XXX,XX +XXX,XX @@ cluster_size: 8192
- Testing: convert -O qcow2 -o help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: convert -O qcow2 -o ? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: convert -O qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: convert -O qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: convert -O qcow2 -o help,cluster_size=4k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: convert -O qcow2 -o ?,cluster_size=4k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: convert -O qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: convert -O qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
--nocow            Turn off copy-on-write (valid only on btrfs)
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: convert -O qcow2 -o backing_file=TEST_DIR/t.qcow2,,help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- qemu-img: Could not open 'TEST_DIR/t.qcow2.base': Could not open backing file: Could not open 'TEST_DIR/t.qcow2,help': No such file or directory
-@@ -XXX,XX +XXX,XX @@ qemu-img: Invalid option list: ,,
- Testing: convert -O qcow2 -o help
- Supported options:
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Testing: convert -o help
- Supported options:
--size             Virtual disk size
-+  size=<size>            - Virtual disk size
- Testing: convert -O bochs -o help
- qemu-img: Format driver 'bochs' does not support image creation
-@@ -XXX,XX +XXX,XX @@ cluster_size: 65536
- Testing: amend -f qcow2 -o help TEST_DIR/t.qcow2
- Creation options for 'qcow2':
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Note that not all of these options may be amendable.
- Testing: amend -f qcow2 -o ? TEST_DIR/t.qcow2
- Creation options for 'qcow2':
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Note that not all of these options may be amendable.
- Testing: amend -f qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2
- Creation options for 'qcow2':
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Note that not all of these options may be amendable.
- Testing: amend -f qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2
- Creation options for 'qcow2':
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Note that not all of these options may be amendable.
- Testing: amend -f qcow2 -o help,cluster_size=4k TEST_DIR/t.qcow2
- Creation options for 'qcow2':
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Note that not all of these options may be amendable.
- Testing: amend -f qcow2 -o ?,cluster_size=4k TEST_DIR/t.qcow2
- Creation options for 'qcow2':
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Note that not all of these options may be amendable.
- Testing: amend -f qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2
- Creation options for 'qcow2':
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Note that not all of these options may be amendable.
- Testing: amend -f qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2
- Creation options for 'qcow2':
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Note that not all of these options may be amendable.
-@@ -XXX,XX +XXX,XX @@ qemu-img: Invalid option list: ,,
- Testing: amend -f qcow2 -o help
- Creation options for 'qcow2':
--size             Virtual disk size
--compat           Compatibility level (0.10 or 1.1)
--backing_file     File name of a base image
--backing_fmt      Image format of the base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
--encrypt.cipher-alg Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
--encrypt.ivgen-alg Name of IV generator algorithm
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
--encrypt.hash-alg Name of encryption hash algorithm
--encrypt.iter-time Time to spend in PBKDF in milliseconds
--cluster_size     qcow2 cluster size
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
--lazy_refcounts   Postpone refcount updates
--refcount_bits    Width of a reference count entry in bits
-+  backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
-+  size=<size>            - Virtual disk size
- Note that not all of these options may be amendable.
- Testing: convert -o help
- Supported options:
--size             Virtual disk size
-+  size=<size>            - Virtual disk size
- Testing: amend -f bochs -o help
- qemu-img: Format driver 'bochs' does not support option amendment
---
-.19.1

-[Qemu-devel] [PULL 31/36] chardev: Indent list of chardevs
+Deleted patch
-From: Max Reitz <mreitz@redhat.com>
-Following the example of qemu_opts_print_help(), indent all entries in
-the list of character devices.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- chardev/char.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/chardev/char.c b/chardev/char.c
-index XXXXXXX..XXXXXXX 100644
---- a/chardev/char.c
-+++ b/chardev/char.c
-@@ -XXX,XX +XXX,XX @@ help_string_append(const char *name, void *opaque)
- {
-     GString *str = opaque;
--    g_string_append_printf(str, "\n%s", name);
-+    g_string_append_printf(str, "\n  %s", name);
- }
- static const char *chardev_alias_translate(const char *name)
---
-.19.1

-[Qemu-devel] [PULL 32/36] qdev-monitor: Make device options help nicer
+Deleted patch
-From: Max Reitz <mreitz@redhat.com>
-Just like in qemu_opts_print_help(), print the device name as a caption
-instead of on every single line, indent all options, add angle brackets
-around types, and align the descriptions after 24 characters.  Also,
-separate the descriptions with " - " instead of putting them in
-parentheses, because that is what we do everywhere else.  This does look
-a bit funny here because basically all bits have the description
-"on/off", but funny does not mean it is less readable.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- qdev-monitor.c | 13 +++++++++++--
-file changed, 11 insertions(+), 2 deletions(-)
-diff --git a/qdev-monitor.c b/qdev-monitor.c
-index XXXXXXX..XXXXXXX 100644
---- a/qdev-monitor.c
-+++ b/qdev-monitor.c
-@@ -XXX,XX +XXX,XX @@ int qdev_device_help(QemuOpts *opts)
-         goto error;
-     }
-+    if (prop_list) {
-+        out_printf("%s options:\n", driver);
-+    } else {
-+        out_printf("There are no options for %s.\n", driver);
-+    }
-     for (prop = prop_list; prop; prop = prop->next) {
--        out_printf("%s.%s=%s", driver, prop->value->name, prop->value->type);
-+        int len;
-+        out_printf("  %s=<%s>%n", prop->value->name, prop->value->type, &len);
-         if (prop->value->has_description) {
--            out_printf(" (%s)\n", prop->value->description);
-+            if (len < 24) {
-+                out_printf("%*s", 24 - len, "");
-+            }
-+            out_printf(" - %s\n", prop->value->description);
-         } else {
-             out_printf("\n");
-         }
---
-.19.1

-[Qemu-devel] [PULL 33/36] object: Make option help nicer to read
+Deleted patch
-From: Max Reitz <mreitz@redhat.com>
-Just like in qemu_opts_print_help(), print the object name as a caption
-instead of on every single line, indent all options, add angle brackets
-around types, and align the descriptions after 24 characters.
-Also, indent every object name in the list of available objects.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- vl.c | 13 ++++++++++---
-file changed, 10 insertions(+), 3 deletions(-)
-diff --git a/vl.c b/vl.c
-index XXXXXXX..XXXXXXX 100644
---- a/vl.c
-+++ b/vl.c
-@@ -XXX,XX +XXX,XX @@ static bool object_create_initial(const char *type, QemuOpts *opts)
-         list = object_class_get_list_sorted(TYPE_USER_CREATABLE, false);
-         for (l = list; l != NULL; l = l->next) {
-             ObjectClass *oc = OBJECT_CLASS(l->data);
--            printf("%s\n", object_class_get_name(oc));
-+            printf("  %s\n", object_class_get_name(oc));
-         }
-         g_slist_free(list);
-         exit(0);
-@@ -XXX,XX +XXX,XX @@ static bool object_create_initial(const char *type, QemuOpts *opts)
-             }
-             str = g_string_new(NULL);
--            g_string_append_printf(str, "%s.%s=%s", type,
--                                   prop->name, prop->type);
-+            g_string_append_printf(str, "  %s=<%s>", prop->name, prop->type);
-             if (prop->description) {
-+                if (str->len < 24) {
-+                    g_string_append_printf(str, "%*s", 24 - (int)str->len, "");
-+                }
-                 g_string_append_printf(str, " - %s", prop->description);
-             }
-             g_ptr_array_add(array, g_string_free(str, false));
-         }
-         g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0);
-+        if (array->len > 0) {
-+            printf("%s options:\n", type);
-+        } else {
-+            printf("There are no options for %s.\n", type);
-+        }
-         for (i = 0; i < array->len; i++) {
-             printf("%s\n", (char *)array->pdata[i]);
-         }
---
-.19.1

-[Qemu-devel] [PULL 34/36] fw_cfg: Drop newline in @file description
+[PULL 8/8] iotests: rename and move 169 and 199 tests
-From: Max Reitz <mreitz@redhat.com>
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-There is no good reason why there should be a newline in this
+Rename bitmaps migration tests and move them to tests subdirectory to
-description, so remove it.
+demonstrate new human-friendly test naming.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Message-Id: <20210125185056.129513-7-vsementsov@virtuozzo.com>
 Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- vl.c | 2 +-
+ tests/qemu-iotests/{199 => tests/migrate-bitmaps-postcopy-test}   | 0
-file changed, 1 insertion(+), 1 deletion(-)
+ .../{199.out => tests/migrate-bitmaps-postcopy-test.out}          | 0
  tests/qemu-iotests/{169 => tests/migrate-bitmaps-test}            | 0
  tests/qemu-iotests/{169.out => tests/migrate-bitmaps-test.out}    | 0
 files changed, 0 insertions(+), 0 deletions(-)
  rename tests/qemu-iotests/{199 => tests/migrate-bitmaps-postcopy-test} (100%)
  rename tests/qemu-iotests/{199.out => tests/migrate-bitmaps-postcopy-test.out} (100%)
  rename tests/qemu-iotests/{169 => tests/migrate-bitmaps-test} (100%)
  rename tests/qemu-iotests/{169.out => tests/migrate-bitmaps-test.out} (100%)
-diff --git a/vl.c b/vl.c
+diff --git a/tests/qemu-iotests/199 b/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test
-index XXXXXXX..XXXXXXX 100644
+similarity index 100%
---- a/vl.c
+rename from tests/qemu-iotests/199
-+++ b/vl.c
+rename to tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test
-@@ -XXX,XX +XXX,XX @@ static QemuOptsList qemu_fw_cfg_opts = {
+diff --git a/tests/qemu-iotests/199.out b/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test.out
-         }, {
+similarity index 100%
-             .name = "file",
+rename from tests/qemu-iotests/199.out
-             .type = QEMU_OPT_STRING,
+rename to tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test.out
--            .help = "Sets the name of the file from which\n"
+diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/tests/migrate-bitmaps-test
-+            .help = "Sets the name of the file from which "
+similarity index 100%
-                     "the fw_cfg blob will be loaded",
+rename from tests/qemu-iotests/169
-         }, {
+rename to tests/qemu-iotests/tests/migrate-bitmaps-test
-             .name = "string",
+diff --git a/tests/qemu-iotests/169.out b/tests/qemu-iotests/tests/migrate-bitmaps-test.out
 similarity index 100%
 rename from tests/qemu-iotests/169.out
 rename to tests/qemu-iotests/tests/migrate-bitmaps-test.out
 --
-.19.1
+.29.2

The following changes since commit b2f7a038bb4c4fc5ce6b8486e8513dfd97665e2a:

Merge remote-tracking branch 'remotes/rth/tags/pull-softfloat-20181104' into staging (2018-11-05 10:32:49 +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 1240ac558d348f6c7a5752b1a57c1da58e4efe3e:

include: Add a comment to explain the origin of sizes' lookup table (2018-11-05 15:29:59 +0100)

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

- auto-read-only option to fix commit job when used with -blockdev
- Fix help text related qemu-iotests failure (by improving the help text
  and updating the reference output)
- quorum: Add missing checks when adding/removing child nodes
- Don't take address of fields in packed structs
- vvfat: Fix crash when reporting error about too many files in directory

----------------------------------------------------------------
Alberto Garcia (7):
      block: replace "discard" literal with BDRV_OPT_DISCARD macro
      qcow2: Get the request alignment for encrypted images from QCryptoBlock
      quorum: Remove quorum_err()
      quorum: Return an error if the blkverify mode has invalid settings
      iotest: Test the blkverify mode of the Quorum driver
      quorum: Forbid adding children in blkverify mode
      iotest: Test x-blockdev-change on a Quorum

Cleber Rosa (1):
      iotests: make 083 specific to raw

Daniel P. Berrangé (1):
      crypto: initialize sector size even when opening with no IO flag

Kevin Wolf (12):
      vpc: Don't leak opts in vpc_open()
      block: Update flags in bdrv_set_read_only()
      block: Add auto-read-only option
      rbd: Close image in qemu_rbd_open() error path
      block: Require auto-read-only for existing fallbacks
      nbd: Support auto-read-only option
      file-posix: Support auto-read-only option
      curl: Support auto-read-only option
      gluster: Support auto-read-only option
      iscsi: Support auto-read-only option
      block: Make auto-read-only=on default for -drive
      qemu-iotests: Test auto-read-only with -drive and -blockdev

Leonid Bloch (2):
      vdi: Use a literal number of bytes for DEFAULT_CLUSTER_SIZE
      include: Add a comment to explain the origin of sizes' lookup table

Li Qiang (1):
      block: change some function return type to bool

Max Reitz (5):
      option: Make option help nicer to read
      chardev: Indent list of chardevs
      qdev-monitor: Make device options help nicer
      object: Make option help nicer to read
      fw_cfg: Drop newline in @file description

Peter Maydell (5):
      block/qcow2: Don't take address of fields in packed structs
      block/qcow: Don't take address of fields in packed structs
      block/qcow2-bitmap: Don't take address of fields in packed structs
      block/vhdx: Don't take address of fields in packed structs
      block/vdi: Don't take address of fields in packed structs

Stefan Weil (1):
      qemu-io-cmds: Fix two format strings

Thomas Huth (1):
      block/vvfat: Fix crash when reporting error about too many files in directory

From: Thomas Huth <thuth@redhat.com>

When using the vvfat driver with a directory that contains too many files,
QEMU currently crashes. This can be triggered like this for example:

mkdir /tmp/vvfattest
 cd /tmp/vvfattest
 for ((x=0;x<=513;x++)); do mkdir $x; done
 qemu-system-x86_64 -drive \
   file.driver=vvfat,file.dir=.,read-only=on,media=cdrom

Seems like read_directory() is changing the mapping->path variable. Make
sure we use the right pointer instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/vvfat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/vvfat.c b/block/vvfat.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -XXX,XX +XXX,XX @@ static int init_directories(BDRVVVFATState* s,
         mapping = array_get(&(s->mapping), i);
 
         if (mapping->mode & MODE_DIRECTORY) {
+            char *path = mapping->path;
             mapping->begin = cluster;
             if(read_directory(s, i)) {
-                error_setg(errp, "Could not read directory %s",
-                           mapping->path);
+                error_setg(errp, "Could not read directory %s", path);
                 return -1;
             }
             mapping = array_get(&(s->mapping), i);
-- 
2.19.1

From: Alberto Garcia <berto@igalia.com>

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ QemuOptsList bdrv_runtime_opts = {
             .help = "try to optimize zero writes (off, on, unmap)",
         },
         {
-            .name = "discard",
+            .name = BDRV_OPT_DISCARD,
             .type = QEMU_OPT_STRING,
             .help = "discard operation (ignore/off, unmap/on)",
         },
@@ -XXX,XX +XXX,XX @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
         }
     }
 
-    discard = qemu_opt_get(opts, "discard");
+    discard = qemu_opt_get(opts, BDRV_OPT_DISCARD);
     if (discard != NULL) {
         if (bdrv_parse_discard_flags(discard, &bs->open_flags) != 0) {
             error_setg(errp, "Invalid discard option");
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
 
     update_flags_from_options(&reopen_state->flags, opts);
 
-    discard = qemu_opt_get_del(opts, "discard");
+    discard = qemu_opt_get_del(opts, BDRV_OPT_DISCARD);
     if (discard != NULL) {
         if (bdrv_parse_discard_flags(discard, &reopen_state->flags) != 0) {
             error_setg(errp, "Invalid discard option");
-- 
2.19.1

From: Stefan Weil <sw@weilnetz.de>

Use %zu instead of %zd for unsigned numbers.

This fixes two error messages from the LSTM static code analyzer:

This argument should be of type 'ssize_t' but is of type 'unsigned long'

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qemu-io-cmds.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index XXXXXXX..XXXXXXX 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -XXX,XX +XXX,XX @@ static int readv_f(BlockBackend *blk, int argc, char **argv)
         memset(cmp_buf, pattern, qiov.size);
         if (memcmp(buf, cmp_buf, qiov.size)) {
             printf("Pattern verification failed at offset %"
-                   PRId64 ", %zd bytes\n", offset, qiov.size);
+                   PRId64 ", %zu bytes\n", offset, qiov.size);
             ret = -EINVAL;
         }
         g_free(cmp_buf);
@@ -XXX,XX +XXX,XX @@ static void aio_read_done(void *opaque, int ret)
         memset(cmp_buf, ctx->pattern, ctx->qiov.size);
         if (memcmp(ctx->buf, cmp_buf, ctx->qiov.size)) {
             printf("Pattern verification failed at offset %"
-                   PRId64 ", %zd bytes\n", ctx->offset, ctx->qiov.size);
+                   PRId64 ", %zu bytes\n", ctx->offset, ctx->qiov.size);
         }
         g_free(cmp_buf);
     }
-- 
2.19.1

From: Peter Maydell <peter.maydell@linaro.org>

Taking the address of a field in a packed struct is a bad idea, because
it might not be actually aligned enough for that pointer type (and
thus cause a crash on dereference on some host architectures). Newer
versions of clang warn about this. Avoid the bug by not using the
"modify in place" byte swapping functions.

There are a few places where the in-place swap function is
used on something other than a packed struct field; we convert
those anyway, for consistency.

This patch was produced with the following spatch script
(and hand-editing to fold a few resulting overlength lines):

@@
expression E;
@@
-be16_to_cpus(&E);
+E = be16_to_cpu(E);
@@
expression E;
@@
-be32_to_cpus(&E);
+E = be32_to_cpu(E);
@@
expression E;
@@
-be64_to_cpus(&E);
+E = be64_to_cpu(E);
@@
expression E;
@@
-cpu_to_be16s(&E);
+E = cpu_to_be16(E);
@@
expression E;
@@
-cpu_to_be32s(&E);
+E = cpu_to_be32(E);
@@
expression E;
@@
-cpu_to_be64s(&E);
+E = cpu_to_be64(E);

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: John Snow <jsnow@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.c | 64 +++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 30 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,
                              "pread fail from offset %" PRIu64, offset);
             return 1;
         }
-        be32_to_cpus(&ext.magic);
-        be32_to_cpus(&ext.len);
+        ext.magic = be32_to_cpu(ext.magic);
+        ext.len = be32_to_cpu(ext.len);
         offset += sizeof(ext);
 #ifdef DEBUG_EXT
         printf("ext.magic = 0x%x\n", ext.magic);
@@ -XXX,XX +XXX,XX @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
                                  "Unable to read CRYPTO header extension");
                 return ret;
             }
-            be64_to_cpus(&s->crypto_header.offset);
-            be64_to_cpus(&s->crypto_header.length);
+            s->crypto_header.offset = be64_to_cpu(s->crypto_header.offset);
+            s->crypto_header.length = be64_to_cpu(s->crypto_header.length);
 
             if ((s->crypto_header.offset % s->cluster_size) != 0) {
                 error_setg(errp, "Encryption header offset '%" PRIu64 "' is "
@@ -XXX,XX +XXX,XX @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
                 return -EINVAL;
             }
 
-            be32_to_cpus(&bitmaps_ext.nb_bitmaps);
-            be64_to_cpus(&bitmaps_ext.bitmap_directory_size);
-            be64_to_cpus(&bitmaps_ext.bitmap_directory_offset);
+            bitmaps_ext.nb_bitmaps = be32_to_cpu(bitmaps_ext.nb_bitmaps);
+            bitmaps_ext.bitmap_directory_size =
+                be64_to_cpu(bitmaps_ext.bitmap_directory_size);
+            bitmaps_ext.bitmap_directory_offset =
+                be64_to_cpu(bitmaps_ext.bitmap_directory_offset);
 
             if (bitmaps_ext.nb_bitmaps > QCOW2_MAX_BITMAPS) {
                 error_setg(errp,
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
         error_setg_errno(errp, -ret, "Could not read qcow2 header");
         goto fail;
     }
-    be32_to_cpus(&header.magic);
-    be32_to_cpus(&header.version);
-    be64_to_cpus(&header.backing_file_offset);
-    be32_to_cpus(&header.backing_file_size);
-    be64_to_cpus(&header.size);
-    be32_to_cpus(&header.cluster_bits);
-    be32_to_cpus(&header.crypt_method);
-    be64_to_cpus(&header.l1_table_offset);
-    be32_to_cpus(&header.l1_size);
-    be64_to_cpus(&header.refcount_table_offset);
-    be32_to_cpus(&header.refcount_table_clusters);
-    be64_to_cpus(&header.snapshots_offset);
-    be32_to_cpus(&header.nb_snapshots);
+    header.magic = be32_to_cpu(header.magic);
+    header.version = be32_to_cpu(header.version);
+    header.backing_file_offset = be64_to_cpu(header.backing_file_offset);
+    header.backing_file_size = be32_to_cpu(header.backing_file_size);
+    header.size = be64_to_cpu(header.size);
+    header.cluster_bits = be32_to_cpu(header.cluster_bits);
+    header.crypt_method = be32_to_cpu(header.crypt_method);
+    header.l1_table_offset = be64_to_cpu(header.l1_table_offset);
+    header.l1_size = be32_to_cpu(header.l1_size);
+    header.refcount_table_offset = be64_to_cpu(header.refcount_table_offset);
+    header.refcount_table_clusters =
+        be32_to_cpu(header.refcount_table_clusters);
+    header.snapshots_offset = be64_to_cpu(header.snapshots_offset);
+    header.nb_snapshots = be32_to_cpu(header.nb_snapshots);
 
     if (header.magic != QCOW_MAGIC) {
         error_setg(errp, "Image is not in qcow2 format");
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
         header.refcount_order           = 4;
         header.header_length            = 72;
     } else {
-        be64_to_cpus(&header.incompatible_features);
-        be64_to_cpus(&header.compatible_features);
-        be64_to_cpus(&header.autoclear_features);
-        be32_to_cpus(&header.refcount_order);
-        be32_to_cpus(&header.header_length);
+        header.incompatible_features =
+            be64_to_cpu(header.incompatible_features);
+        header.compatible_features = be64_to_cpu(header.compatible_features);
+        header.autoclear_features = be64_to_cpu(header.autoclear_features);
+        header.refcount_order = be32_to_cpu(header.refcount_order);
+        header.header_length = be32_to_cpu(header.header_length);
 
         if (header.header_length < 104) {
             error_setg(errp, "qcow2 header too short");
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
             goto fail;
         }
         for(i = 0;i < s->l1_size; i++) {
-            be64_to_cpus(&s->l1_table[i]);
+            s->l1_table[i] = be64_to_cpu(s->l1_table[i]);
         }
     }
 
@@ -XXX,XX +XXX,XX @@ int qcow2_update_header(BlockDriverState *bs)
 
     /* Full disk encryption header pointer extension */
     if (s->crypto_header.offset != 0) {
-        cpu_to_be64s(&s->crypto_header.offset);
-        cpu_to_be64s(&s->crypto_header.length);
+        s->crypto_header.offset = cpu_to_be64(s->crypto_header.offset);
+        s->crypto_header.length = cpu_to_be64(s->crypto_header.length);
         ret = header_ext_add(buf, QCOW2_EXT_MAGIC_CRYPTO_HEADER,
                              &s->crypto_header, sizeof(s->crypto_header),
                              buflen);
-        be64_to_cpus(&s->crypto_header.offset);
-        be64_to_cpus(&s->crypto_header.length);
+        s->crypto_header.offset = be64_to_cpu(s->crypto_header.offset);
+        s->crypto_header.length = be64_to_cpu(s->crypto_header.length);
         if (ret < 0) {
             goto fail;
         }
-- 
2.19.1

From: Peter Maydell <peter.maydell@linaro.org>

There are a few places where the in-place swap function is
used on something other than a packed struct field; we convert
those anyway, for consistency.

This patch was produced with the following spatch script:

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: John Snow <jsnow@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/block/qcow.c b/block/qcow.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -XXX,XX +XXX,XX @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
     if (ret < 0) {
         goto fail;
     }
-    be32_to_cpus(&header.magic);
-    be32_to_cpus(&header.version);
-    be64_to_cpus(&header.backing_file_offset);
-    be32_to_cpus(&header.backing_file_size);
-    be32_to_cpus(&header.mtime);
-    be64_to_cpus(&header.size);
-    be32_to_cpus(&header.crypt_method);
-    be64_to_cpus(&header.l1_table_offset);
+    header.magic = be32_to_cpu(header.magic);
+    header.version = be32_to_cpu(header.version);
+    header.backing_file_offset = be64_to_cpu(header.backing_file_offset);
+    header.backing_file_size = be32_to_cpu(header.backing_file_size);
+    header.mtime = be32_to_cpu(header.mtime);
+    header.size = be64_to_cpu(header.size);
+    header.crypt_method = be32_to_cpu(header.crypt_method);
+    header.l1_table_offset = be64_to_cpu(header.l1_table_offset);
 
     if (header.magic != QCOW_MAGIC) {
         error_setg(errp, "Image not in qcow format");
@@ -XXX,XX +XXX,XX @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     for(i = 0;i < s->l1_size; i++) {
-        be64_to_cpus(&s->l1_table[i]);
+        s->l1_table[i] = be64_to_cpu(s->l1_table[i]);
     }
 
     /* alloc L2 cache (max. 64k * 16 * 8 = 8 MB) */
-- 
2.19.1

From: Peter Maydell <peter.maydell@linaro.org>

There are a few places where the in-place swap function is
used on something other than a packed struct field; we convert
those anyway, for consistency.

This patch was produced with the following spatch script:

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: John Snow <jsnow@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2-bitmap.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -XXX,XX +XXX,XX @@ static inline void bitmap_table_to_be(uint64_t *bitmap_table, size_t size)
     size_t i;
 
     for (i = 0; i < size; ++i) {
-        cpu_to_be64s(&bitmap_table[i]);
+        bitmap_table[i] = cpu_to_be64(bitmap_table[i]);
     }
 }
 
@@ -XXX,XX +XXX,XX @@ static int bitmap_table_load(BlockDriverState *bs, Qcow2BitmapTable *tb,
     }
 
     for (i = 0; i < tb->size; ++i) {
-        be64_to_cpus(&table[i]);
+        table[i] = be64_to_cpu(table[i]);
         ret = check_table_entry(table[i], s->cluster_size);
         if (ret < 0) {
             goto fail;
@@ -XXX,XX +XXX,XX @@ fail:
 
 static inline void bitmap_dir_entry_to_cpu(Qcow2BitmapDirEntry *entry)
 {
-    be64_to_cpus(&entry->bitmap_table_offset);
-    be32_to_cpus(&entry->bitmap_table_size);
-    be32_to_cpus(&entry->flags);
-    be16_to_cpus(&entry->name_size);
-    be32_to_cpus(&entry->extra_data_size);
+    entry->bitmap_table_offset = be64_to_cpu(entry->bitmap_table_offset);
+    entry->bitmap_table_size = be32_to_cpu(entry->bitmap_table_size);
+    entry->flags = be32_to_cpu(entry->flags);
+    entry->name_size = be16_to_cpu(entry->name_size);
+    entry->extra_data_size = be32_to_cpu(entry->extra_data_size);
 }
 
 static inline void bitmap_dir_entry_to_be(Qcow2BitmapDirEntry *entry)
 {
-    cpu_to_be64s(&entry->bitmap_table_offset);
-    cpu_to_be32s(&entry->bitmap_table_size);
-    cpu_to_be32s(&entry->flags);
-    cpu_to_be16s(&entry->name_size);
-    cpu_to_be32s(&entry->extra_data_size);
+    entry->bitmap_table_offset = cpu_to_be64(entry->bitmap_table_offset);
+    entry->bitmap_table_size = cpu_to_be32(entry->bitmap_table_size);
+    entry->flags = cpu_to_be32(entry->flags);
+    entry->name_size = cpu_to_be16(entry->name_size);
+    entry->extra_data_size = cpu_to_be32(entry->extra_data_size);
 }
 
 static inline int calc_dir_entry_size(size_t name_size, size_t extra_data_size)
-- 
2.19.1

From: Alberto Garcia <berto@igalia.com>

This doesn't have any practical effect at the moment because the
values of BDRV_SECTOR_SIZE, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE and
QCRYPTO_BLOCK_QCOW_SECTOR_SIZE are all the same (512 bytes), but
future encryption methods could have different requirements.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.c | 2 +-
 1 file changed, 1 insertion(+), 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 void qcow2_refresh_limits(BlockDriverState *bs, Error **errp)
 
     if (bs->encrypted) {
         /* Encryption works on a sector granularity */
-        bs->bl.request_alignment = BDRV_SECTOR_SIZE;
+        bs->bl.request_alignment = qcrypto_block_get_sector_size(s->crypto);
     }
     bs->bl.pwrite_zeroes_alignment = s->cluster_size;
     bs->bl.pdiscard_alignment = s->cluster_size;
-- 
2.19.1

From: Li Qiang <liq3ea@163.com>

Signed-off-by: Li Qiang <liq3ea@163.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/sysemu/block-backend.h | 6 +++---
 block/block-backend.c          | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

From: Cleber Rosa <crosa@redhat.com>

While testing the Python 3 changes which touch the 083 test, I noticed
that it would fail with qcow2.  Expanding the testing, I noticed it
had nothing to do with the Python 3 changes, and in fact, it would not
pass on anything but raw:

raw: pass
 bochs: not generic
 cloop: not generic
 parallels: fail
 qcow: fail
 qcow2: fail
 qed: fail
 vdi: fail
 vhdx: fail
 vmdk: fail
 vpc: fail
 luks: fail

The errors are a mixture I/O and "image not in xxx format", such as:

=== Check disconnect before data ===

Unexpected end-of-file before all bytes were read
 -read failed: Input/output error
 +can't open device nbd+tcp://127.0.0.1:PORT/foo: Could not open 'nbd://127.0.0.1:PORT/foo': Input/output error

=== Check disconnect after data ===

-read 512/512 bytes at offset 0
 -512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 +can't open device nbd+tcp://127.0.0.1:PORT/foo: Image not in qcow format

I'm not aware if there's a quick fix, so, for the time being, it looks
like the honest approach is to make the test known to work on raw
only.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/083 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/083
+++ b/tests/qemu-iotests/083
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-_supported_fmt generic
+_supported_fmt raw
 _supported_proto nbd
 _supported_os Linux
 
-- 
2.19.1

From: Peter Maydell <peter.maydell@linaro.org>

There are a few places where the in-place swap function is
used on something other than a packed struct field; we convert
those anyway, for consistency.

Patch produced with scripts/coccinelle/inplace-byteswaps.cocci.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/vhdx.h        |  12 ++---
 block/vhdx-endian.c | 118 ++++++++++++++++++++++----------------------
 block/vhdx-log.c    |   4 +-
 block/vhdx.c        |  18 +++----
 4 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/block/vhdx.h b/block/vhdx.h
index XXXXXXX..XXXXXXX 100644
--- a/block/vhdx.h
+++ b/block/vhdx.h
@@ -XXX,XX +XXX,XX @@ int vhdx_log_write_and_flush(BlockDriverState *bs, BDRVVHDXState *s,
 
 static inline void leguid_to_cpus(MSGUID *guid)
 {
-    le32_to_cpus(&guid->data1);
-    le16_to_cpus(&guid->data2);
-    le16_to_cpus(&guid->data3);
+    guid->data1 = le32_to_cpu(guid->data1);
+    guid->data2 = le16_to_cpu(guid->data2);
+    guid->data3 = le16_to_cpu(guid->data3);
 }
 
 static inline void cpu_to_leguids(MSGUID *guid)
 {
-    cpu_to_le32s(&guid->data1);
-    cpu_to_le16s(&guid->data2);
-    cpu_to_le16s(&guid->data3);
+    guid->data1 = cpu_to_le32(guid->data1);
+    guid->data2 = cpu_to_le16(guid->data2);
+    guid->data3 = cpu_to_le16(guid->data3);
 }
 
 void vhdx_header_le_import(VHDXHeader *h);
diff --git a/block/vhdx-endian.c b/block/vhdx-endian.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vhdx-endian.c
+++ b/block/vhdx-endian.c
@@ -XXX,XX +XXX,XX @@ void vhdx_header_le_import(VHDXHeader *h)
 {
     assert(h != NULL);
 
-    le32_to_cpus(&h->signature);
-    le32_to_cpus(&h->checksum);
-    le64_to_cpus(&h->sequence_number);
+    h->signature = le32_to_cpu(h->signature);
+    h->checksum = le32_to_cpu(h->checksum);
+    h->sequence_number = le64_to_cpu(h->sequence_number);
 
     leguid_to_cpus(&h->file_write_guid);
     leguid_to_cpus(&h->data_write_guid);
     leguid_to_cpus(&h->log_guid);
 
-    le16_to_cpus(&h->log_version);
-    le16_to_cpus(&h->version);
-    le32_to_cpus(&h->log_length);
-    le64_to_cpus(&h->log_offset);
+    h->log_version = le16_to_cpu(h->log_version);
+    h->version = le16_to_cpu(h->version);
+    h->log_length = le32_to_cpu(h->log_length);
+    h->log_offset = le64_to_cpu(h->log_offset);
 }
 
 void vhdx_header_le_export(VHDXHeader *orig_h, VHDXHeader *new_h)
@@ -XXX,XX +XXX,XX @@ void vhdx_log_desc_le_import(VHDXLogDescriptor *d)
 {
     assert(d != NULL);
 
-    le32_to_cpus(&d->signature);
-    le64_to_cpus(&d->file_offset);
-    le64_to_cpus(&d->sequence_number);
+    d->signature = le32_to_cpu(d->signature);
+    d->file_offset = le64_to_cpu(d->file_offset);
+    d->sequence_number = le64_to_cpu(d->sequence_number);
 }
 
 void vhdx_log_desc_le_export(VHDXLogDescriptor *d)
 {
     assert(d != NULL);
 
-    cpu_to_le32s(&d->signature);
-    cpu_to_le32s(&d->trailing_bytes);
-    cpu_to_le64s(&d->leading_bytes);
-    cpu_to_le64s(&d->file_offset);
-    cpu_to_le64s(&d->sequence_number);
+    d->signature = cpu_to_le32(d->signature);
+    d->trailing_bytes = cpu_to_le32(d->trailing_bytes);
+    d->leading_bytes = cpu_to_le64(d->leading_bytes);
+    d->file_offset = cpu_to_le64(d->file_offset);
+    d->sequence_number = cpu_to_le64(d->sequence_number);
 }
 
 void vhdx_log_data_le_import(VHDXLogDataSector *d)
 {
     assert(d != NULL);
 
-    le32_to_cpus(&d->data_signature);
-    le32_to_cpus(&d->sequence_high);
-    le32_to_cpus(&d->sequence_low);
+    d->data_signature = le32_to_cpu(d->data_signature);
+    d->sequence_high = le32_to_cpu(d->sequence_high);
+    d->sequence_low = le32_to_cpu(d->sequence_low);
 }
 
 void vhdx_log_data_le_export(VHDXLogDataSector *d)
 {
     assert(d != NULL);
 
-    cpu_to_le32s(&d->data_signature);
-    cpu_to_le32s(&d->sequence_high);
-    cpu_to_le32s(&d->sequence_low);
+    d->data_signature = cpu_to_le32(d->data_signature);
+    d->sequence_high = cpu_to_le32(d->sequence_high);
+    d->sequence_low = cpu_to_le32(d->sequence_low);
 }
 
 void vhdx_log_entry_hdr_le_import(VHDXLogEntryHeader *hdr)
 {
     assert(hdr != NULL);
 
-    le32_to_cpus(&hdr->signature);
-    le32_to_cpus(&hdr->checksum);
-    le32_to_cpus(&hdr->entry_length);
-    le32_to_cpus(&hdr->tail);
-    le64_to_cpus(&hdr->sequence_number);
-    le32_to_cpus(&hdr->descriptor_count);
+    hdr->signature = le32_to_cpu(hdr->signature);
+    hdr->checksum = le32_to_cpu(hdr->checksum);
+    hdr->entry_length = le32_to_cpu(hdr->entry_length);
+    hdr->tail = le32_to_cpu(hdr->tail);
+    hdr->sequence_number = le64_to_cpu(hdr->sequence_number);
+    hdr->descriptor_count = le32_to_cpu(hdr->descriptor_count);
     leguid_to_cpus(&hdr->log_guid);
-    le64_to_cpus(&hdr->flushed_file_offset);
-    le64_to_cpus(&hdr->last_file_offset);
+    hdr->flushed_file_offset = le64_to_cpu(hdr->flushed_file_offset);
+    hdr->last_file_offset = le64_to_cpu(hdr->last_file_offset);
 }
 
 void vhdx_log_entry_hdr_le_export(VHDXLogEntryHeader *hdr)
 {
     assert(hdr != NULL);
 
-    cpu_to_le32s(&hdr->signature);
-    cpu_to_le32s(&hdr->checksum);
-    cpu_to_le32s(&hdr->entry_length);
-    cpu_to_le32s(&hdr->tail);
-    cpu_to_le64s(&hdr->sequence_number);
-    cpu_to_le32s(&hdr->descriptor_count);
+    hdr->signature = cpu_to_le32(hdr->signature);
+    hdr->checksum = cpu_to_le32(hdr->checksum);
+    hdr->entry_length = cpu_to_le32(hdr->entry_length);
+    hdr->tail = cpu_to_le32(hdr->tail);
+    hdr->sequence_number = cpu_to_le64(hdr->sequence_number);
+    hdr->descriptor_count = cpu_to_le32(hdr->descriptor_count);
     cpu_to_leguids(&hdr->log_guid);
-    cpu_to_le64s(&hdr->flushed_file_offset);
-    cpu_to_le64s(&hdr->last_file_offset);
+    hdr->flushed_file_offset = cpu_to_le64(hdr->flushed_file_offset);
+    hdr->last_file_offset = cpu_to_le64(hdr->last_file_offset);
 }
 
 
@@ -XXX,XX +XXX,XX @@ void vhdx_region_header_le_import(VHDXRegionTableHeader *hdr)
 {
     assert(hdr != NULL);
 
-    le32_to_cpus(&hdr->signature);
-    le32_to_cpus(&hdr->checksum);
-    le32_to_cpus(&hdr->entry_count);
+    hdr->signature = le32_to_cpu(hdr->signature);
+    hdr->checksum = le32_to_cpu(hdr->checksum);
+    hdr->entry_count = le32_to_cpu(hdr->entry_count);
 }
 
 void vhdx_region_header_le_export(VHDXRegionTableHeader *hdr)
 {
     assert(hdr != NULL);
 
-    cpu_to_le32s(&hdr->signature);
-    cpu_to_le32s(&hdr->checksum);
-    cpu_to_le32s(&hdr->entry_count);
+    hdr->signature = cpu_to_le32(hdr->signature);
+    hdr->checksum = cpu_to_le32(hdr->checksum);
+    hdr->entry_count = cpu_to_le32(hdr->entry_count);
 }
 
 void vhdx_region_entry_le_import(VHDXRegionTableEntry *e)
@@ -XXX,XX +XXX,XX @@ void vhdx_region_entry_le_import(VHDXRegionTableEntry *e)
     assert(e != NULL);
 
     leguid_to_cpus(&e->guid);
-    le64_to_cpus(&e->file_offset);
-    le32_to_cpus(&e->length);
-    le32_to_cpus(&e->data_bits);
+    e->file_offset = le64_to_cpu(e->file_offset);
+    e->length = le32_to_cpu(e->length);
+    e->data_bits = le32_to_cpu(e->data_bits);
 }
 
 void vhdx_region_entry_le_export(VHDXRegionTableEntry *e)
@@ -XXX,XX +XXX,XX @@ void vhdx_region_entry_le_export(VHDXRegionTableEntry *e)
     assert(e != NULL);
 
     cpu_to_leguids(&e->guid);
-    cpu_to_le64s(&e->file_offset);
-    cpu_to_le32s(&e->length);
-    cpu_to_le32s(&e->data_bits);
+    e->file_offset = cpu_to_le64(e->file_offset);
+    e->length = cpu_to_le32(e->length);
+    e->data_bits = cpu_to_le32(e->data_bits);
 }
 
 
@@ -XXX,XX +XXX,XX @@ void vhdx_metadata_header_le_import(VHDXMetadataTableHeader *hdr)
 {
     assert(hdr != NULL);
 
-    le64_to_cpus(&hdr->signature);
-    le16_to_cpus(&hdr->entry_count);
+    hdr->signature = le64_to_cpu(hdr->signature);
+    hdr->entry_count = le16_to_cpu(hdr->entry_count);
 }
 
 void vhdx_metadata_header_le_export(VHDXMetadataTableHeader *hdr)
 {
     assert(hdr != NULL);
 
-    cpu_to_le64s(&hdr->signature);
-    cpu_to_le16s(&hdr->entry_count);
+    hdr->signature = cpu_to_le64(hdr->signature);
+    hdr->entry_count = cpu_to_le16(hdr->entry_count);
 }
 
 void vhdx_metadata_entry_le_import(VHDXMetadataTableEntry *e)
@@ -XXX,XX +XXX,XX @@ void vhdx_metadata_entry_le_import(VHDXMetadataTableEntry *e)
     assert(e != NULL);
 
     leguid_to_cpus(&e->item_id);
-    le32_to_cpus(&e->offset);
-    le32_to_cpus(&e->length);
-    le32_to_cpus(&e->data_bits);
+    e->offset = le32_to_cpu(e->offset);
+    e->length = le32_to_cpu(e->length);
+    e->data_bits = le32_to_cpu(e->data_bits);
 }
 void vhdx_metadata_entry_le_export(VHDXMetadataTableEntry *e)
 {
     assert(e != NULL);
 
     cpu_to_leguids(&e->item_id);
-    cpu_to_le32s(&e->offset);
-    cpu_to_le32s(&e->length);
-    cpu_to_le32s(&e->data_bits);
+    e->offset = cpu_to_le32(e->offset);
+    e->length = cpu_to_le32(e->length);
+    e->data_bits = cpu_to_le32(e->data_bits);
 }
diff --git a/block/vhdx-log.c b/block/vhdx-log.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vhdx-log.c
+++ b/block/vhdx-log.c
@@ -XXX,XX +XXX,XX @@ static void vhdx_log_raw_to_le_sector(VHDXLogDescriptor *desc,
     /* 8 + 4084 + 4 = 4096, 1 log sector */
     memcpy(&desc->leading_bytes, data, 8);
     data += 8;
-    cpu_to_le64s(&desc->leading_bytes);
+    desc->leading_bytes = cpu_to_le64(desc->leading_bytes);
     memcpy(sector->data, data, 4084);
     data += 4084;
     memcpy(&desc->trailing_bytes, data, 4);
-    cpu_to_le32s(&desc->trailing_bytes);
+    desc->trailing_bytes = cpu_to_le32(desc->trailing_bytes);
     data += 4;
 
     sector->sequence_high  = (uint32_t) (seq >> 32);
diff --git a/block/vhdx.c b/block/vhdx.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -XXX,XX +XXX,XX @@ uint32_t vhdx_update_checksum(uint8_t *buf, size_t size, int crc_offset)
 
     memset(buf + crc_offset, 0, sizeof(crc));
     crc =  crc32c(0xffffffff, buf, size);
-    cpu_to_le32s(&crc);
+    crc = cpu_to_le32(crc);
     memcpy(buf + crc_offset, &crc, sizeof(crc));
 
     return crc;
@@ -XXX,XX +XXX,XX @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s)
         goto exit;
     }
 
-    le32_to_cpus(&s->params.block_size);
-    le32_to_cpus(&s->params.data_bits);
+    s->params.block_size = le32_to_cpu(s->params.block_size);
+    s->params.data_bits = le32_to_cpu(s->params.data_bits);
 
 
     /* We now have the file parameters, so we can tell if this is a
@@ -XXX,XX +XXX,XX @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s)
         goto exit;
     }
 
-    le64_to_cpus(&s->virtual_disk_size);
-    le32_to_cpus(&s->logical_sector_size);
-    le32_to_cpus(&s->physical_sector_size);
+    s->virtual_disk_size = le64_to_cpu(s->virtual_disk_size);
+    s->logical_sector_size = le32_to_cpu(s->logical_sector_size);
+    s->physical_sector_size = le32_to_cpu(s->physical_sector_size);
 
     if (s->params.block_size < VHDX_BLOCK_SIZE_MIN ||
         s->params.block_size > VHDX_BLOCK_SIZE_MAX) {
@@ -XXX,XX +XXX,XX @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags,
     /* endian convert, and verify populated BAT field file offsets against
      * region table and log entries */
     for (i = 0; i < s->bat_entries; i++) {
-        le64_to_cpus(&s->bat[i]);
+        s->bat[i] = le64_to_cpu(s->bat[i]);
         if (payblocks--) {
             /* payload bat entries */
             if ((s->bat[i] & VHDX_BAT_STATE_BIT_MASK) ==
@@ -XXX,XX +XXX,XX @@ static int vhdx_create_new_metadata(BlockBackend *blk,
     mt_file_params->block_size = cpu_to_le32(block_size);
     if (type == VHDX_TYPE_FIXED) {
         mt_file_params->data_bits |= VHDX_PARAMS_LEAVE_BLOCKS_ALLOCED;
-        cpu_to_le32s(&mt_file_params->data_bits);
+        mt_file_params->data_bits = cpu_to_le32(mt_file_params->data_bits);
     }
 
     vhdx_guid_generate(&mt_page83->page_83_data);
@@ -XXX,XX +XXX,XX @@ static int vhdx_create_bat(BlockBackend *blk, BDRVVHDXState *s,
             sinfo.file_offset = ROUND_UP(sinfo.file_offset, MiB);
             vhdx_update_bat_table_entry(blk_bs(blk), s, &sinfo, &unused, &unused,
                                         block_state);
-            cpu_to_le64s(&s->bat[sinfo.bat_idx]);
+            s->bat[sinfo.bat_idx] = cpu_to_le64(s->bat[sinfo.bat_idx]);
             sector_num += s->sectors_per_block;
         }
         ret = blk_pwrite(blk, file_offset, s->bat, length, 0);
-- 
2.19.1

From: Peter Maydell <peter.maydell@linaro.org>

There are a few places where the in-place swap function is
used on something other than a packed struct field; we convert
those anyway, for consistency.

Patch produced with scripts/coccinelle/inplace-byteswaps.cocci.

There are other places where we take the address of a packed member
in this file for other purposes than passing it to a byteswap
function (all the calls to qemu_uuid_*()); we leave those for now.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/vdi.c | 64 ++++++++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/block/vdi.c b/block/vdi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -XXX,XX +XXX,XX @@ typedef struct {
 
 static void vdi_header_to_cpu(VdiHeader *header)
 {
-    le32_to_cpus(&header->signature);
-    le32_to_cpus(&header->version);
-    le32_to_cpus(&header->header_size);
-    le32_to_cpus(&header->image_type);
-    le32_to_cpus(&header->image_flags);
-    le32_to_cpus(&header->offset_bmap);
-    le32_to_cpus(&header->offset_data);
-    le32_to_cpus(&header->cylinders);
-    le32_to_cpus(&header->heads);
-    le32_to_cpus(&header->sectors);
-    le32_to_cpus(&header->sector_size);
-    le64_to_cpus(&header->disk_size);
-    le32_to_cpus(&header->block_size);
-    le32_to_cpus(&header->block_extra);
-    le32_to_cpus(&header->blocks_in_image);
-    le32_to_cpus(&header->blocks_allocated);
+    header->signature = le32_to_cpu(header->signature);
+    header->version = le32_to_cpu(header->version);
+    header->header_size = le32_to_cpu(header->header_size);
+    header->image_type = le32_to_cpu(header->image_type);
+    header->image_flags = le32_to_cpu(header->image_flags);
+    header->offset_bmap = le32_to_cpu(header->offset_bmap);
+    header->offset_data = le32_to_cpu(header->offset_data);
+    header->cylinders = le32_to_cpu(header->cylinders);
+    header->heads = le32_to_cpu(header->heads);
+    header->sectors = le32_to_cpu(header->sectors);
+    header->sector_size = le32_to_cpu(header->sector_size);
+    header->disk_size = le64_to_cpu(header->disk_size);
+    header->block_size = le32_to_cpu(header->block_size);
+    header->block_extra = le32_to_cpu(header->block_extra);
+    header->blocks_in_image = le32_to_cpu(header->blocks_in_image);
+    header->blocks_allocated = le32_to_cpu(header->blocks_allocated);
     qemu_uuid_bswap(&header->uuid_image);
     qemu_uuid_bswap(&header->uuid_last_snap);
     qemu_uuid_bswap(&header->uuid_link);
@@ -XXX,XX +XXX,XX @@ static void vdi_header_to_cpu(VdiHeader *header)
 
 static void vdi_header_to_le(VdiHeader *header)
 {
-    cpu_to_le32s(&header->signature);
-    cpu_to_le32s(&header->version);
-    cpu_to_le32s(&header->header_size);
-    cpu_to_le32s(&header->image_type);
-    cpu_to_le32s(&header->image_flags);
-    cpu_to_le32s(&header->offset_bmap);
-    cpu_to_le32s(&header->offset_data);
-    cpu_to_le32s(&header->cylinders);
-    cpu_to_le32s(&header->heads);
-    cpu_to_le32s(&header->sectors);
-    cpu_to_le32s(&header->sector_size);
-    cpu_to_le64s(&header->disk_size);
-    cpu_to_le32s(&header->block_size);
-    cpu_to_le32s(&header->block_extra);
-    cpu_to_le32s(&header->blocks_in_image);
-    cpu_to_le32s(&header->blocks_allocated);
+    header->signature = cpu_to_le32(header->signature);
+    header->version = cpu_to_le32(header->version);
+    header->header_size = cpu_to_le32(header->header_size);
+    header->image_type = cpu_to_le32(header->image_type);
+    header->image_flags = cpu_to_le32(header->image_flags);
+    header->offset_bmap = cpu_to_le32(header->offset_bmap);
+    header->offset_data = cpu_to_le32(header->offset_data);
+    header->cylinders = cpu_to_le32(header->cylinders);
+    header->heads = cpu_to_le32(header->heads);
+    header->sectors = cpu_to_le32(header->sectors);
+    header->sector_size = cpu_to_le32(header->sector_size);
+    header->disk_size = cpu_to_le64(header->disk_size);
+    header->block_size = cpu_to_le32(header->block_size);
+    header->block_extra = cpu_to_le32(header->block_extra);
+    header->blocks_in_image = cpu_to_le32(header->blocks_in_image);
+    header->blocks_allocated = cpu_to_le32(header->blocks_allocated);
     qemu_uuid_bswap(&header->uuid_image);
     qemu_uuid_bswap(&header->uuid_last_snap);
     qemu_uuid_bswap(&header->uuid_link);
-- 
2.19.1

From: Alberto Garcia <berto@igalia.com>

This is a static function with only one caller, so there's no need to
keep it. Inlining the code in quorum_compare() makes it much simpler.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/quorum.c | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/block/quorum.c b/block/quorum.c
index XXXXXXX..XXXXXXX 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -XXX,XX +XXX,XX @@ static bool quorum_iovec_compare(QEMUIOVector *a, QEMUIOVector *b)
     return true;
 }
 
-static void GCC_FMT_ATTR(2, 3) quorum_err(QuorumAIOCB *acb,
-                                          const char *fmt, ...)
-{
-    va_list ap;
-
-    va_start(ap, fmt);
-    fprintf(stderr, "quorum: offset=%" PRIu64 " bytes=%" PRIu64 " ",
-            acb->offset, acb->bytes);
-    vfprintf(stderr, fmt, ap);
-    fprintf(stderr, "\n");
-    va_end(ap);
-    exit(1);
-}
-
-static bool quorum_compare(QuorumAIOCB *acb,
-                           QEMUIOVector *a,
-                           QEMUIOVector *b)
+static bool quorum_compare(QuorumAIOCB *acb, QEMUIOVector *a, QEMUIOVector *b)
 {
     BDRVQuorumState *s = acb->bs->opaque;
     ssize_t offset;
@@ -XXX,XX +XXX,XX @@ static bool quorum_compare(QuorumAIOCB *acb,
     if (s->is_blkverify) {
         offset = qemu_iovec_compare(a, b);
         if (offset != -1) {
-            quorum_err(acb, "contents mismatch at offset %" PRIu64,
-                       acb->offset + offset);
+            fprintf(stderr, "quorum: offset=%" PRIu64 " bytes=%" PRIu64
+                    " contents mismatch at offset %" PRIu64 "\n",
+                    acb->offset, acb->bytes, acb->offset + offset);
+            exit(1);
         }
         return true;
     }
-- 
2.19.1

From: Alberto Garcia <berto@igalia.com>

The blkverify mode of Quorum can only be enabled if the number of
children is exactly two and the value of vote-threshold is also two.

If the user tries to enable it but the other settings are incorrect
then QEMU simply prints an error message to stderr and carries on
disabling the blkverify setting.

This patch makes quorum_open() fail and return an error in this case.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/quorum.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/block/quorum.c b/block/quorum.c
index XXXXXXX..XXXXXXX 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -XXX,XX +XXX,XX @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags,
     s->read_pattern = ret;
 
     if (s->read_pattern == QUORUM_READ_PATTERN_QUORUM) {
-        /* is the driver in blkverify mode */
-        if (qemu_opt_get_bool(opts, QUORUM_OPT_BLKVERIFY, false) &&
-            s->num_children == 2 && s->threshold == 2) {
-            s->is_blkverify = true;
-        } else if (qemu_opt_get_bool(opts, QUORUM_OPT_BLKVERIFY, false)) {
-            fprintf(stderr, "blkverify mode is set by setting blkverify=on "
-                    "and using two files with vote_threshold=2\n");
+        s->is_blkverify = qemu_opt_get_bool(opts, QUORUM_OPT_BLKVERIFY, false);
+        if (s->is_blkverify && (s->num_children != 2 || s->threshold != 2)) {
+            error_setg(&local_err, "blkverify=on can only be set if there are "
+                       "exactly two files and vote-threshold is 2");
+            ret = -EINVAL;
+            goto exit;
         }
 
         s->rewrite_corrupted = qemu_opt_get_bool(opts, QUORUM_OPT_REWRITE,
-- 
2.19.1

From: Alberto Garcia <berto@igalia.com>

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/081     | 30 ++++++++++++++++++++++++++++++
 tests/qemu-iotests/081.out | 16 ++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/081
+++ b/tests/qemu-iotests/081
@@ -XXX,XX +XXX,XX @@ echo "== checking that quorum is broken =="
 
 $QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size" | _filter_qemu_io
 
+echo
+echo "== checking the blkverify mode with broken content =="
+
+quorum="driver=raw,file.driver=quorum,file.vote-threshold=2,file.blkverify=on"
+quorum="$quorum,file.children.0.file.filename=$TEST_DIR/1.raw"
+quorum="$quorum,file.children.1.file.filename=$TEST_DIR/2.raw"
+quorum="$quorum,file.children.0.driver=raw"
+quorum="$quorum,file.children.1.driver=raw"
+
+$QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size" | _filter_qemu_io
+
+echo
+echo "== writing the same data to both files =="
+
+$QEMU_IO -c "write -P 0x32 0 $size" "$TEST_DIR/1.raw" | _filter_qemu_io
+$QEMU_IO -c "write -P 0x32 0 $size" "$TEST_DIR/2.raw" | _filter_qemu_io
+
+echo
+echo "== checking the blkverify mode with valid content =="
+
+$QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size" | _filter_qemu_io
+
+echo
+echo "== checking the blkverify mode with invalid settings =="
+
+quorum="$quorum,file.children.2.file.filename=$TEST_DIR/3.raw"
+quorum="$quorum,file.children.2.driver=raw"
+
+$QEMU_IO -c "open -o $quorum" | _filter_qemu_io
+
 # success, all done
 echo "*** done"
 rm -f $seq.full
diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/081.out
+++ b/tests/qemu-iotests/081.out
@@ -XXX,XX +XXX,XX @@ wrote 10485760/10485760 bytes at offset 0
 
 == checking that quorum is broken ==
 read failed: Input/output error
+
+== checking the blkverify mode with broken content ==
+quorum: offset=0 bytes=10485760 contents mismatch at offset 0
+
+== writing the same data to both files ==
+wrote 10485760/10485760 bytes at offset 0
+10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 10485760/10485760 bytes at offset 0
+10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+== checking the blkverify mode with valid content ==
+read 10485760/10485760 bytes at offset 0
+10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+== checking the blkverify mode with invalid settings ==
+can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
 *** done
-- 
2.19.1

From: Alberto Garcia <berto@igalia.com>

The blkverify mode of Quorum only works when the number of children is
exactly two, so any attempt to add a new one must return an error.

quorum_del_child() on the other hand doesn't need any additional check
because decreasing the number of children would make it go under the
vote threshold.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/quorum.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/block/quorum.c b/block/quorum.c
index XXXXXXX..XXXXXXX 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -XXX,XX +XXX,XX @@ static void quorum_add_child(BlockDriverState *bs, BlockDriverState *child_bs,
     char indexstr[32];
     int ret;
 
+    if (s->is_blkverify) {
+        error_setg(errp, "Cannot add a child to a quorum in blkverify mode");
+        return;
+    }
+
     assert(s->num_children <= INT_MAX / sizeof(BdrvChild *));
     if (s->num_children == INT_MAX / sizeof(BdrvChild *) ||
         s->next_child_index == UINT_MAX) {
@@ -XXX,XX +XXX,XX @@ static void quorum_del_child(BlockDriverState *bs, BdrvChild *child,
         return;
     }
 
+    /* We know now that num_children > threshold, so blkverify must be false */
+    assert(!s->is_blkverify);
+
     bdrv_drained_begin(bs);
 
     /* We can safely remove this child now */
-- 
2.19.1

From: Alberto Garcia <berto@igalia.com>

This patch tests that you can add and remove drives from a Quorum
using the x-blockdev-change command.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/081     | 86 ++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/081.out | 54 ++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/081
+++ b/tests/qemu-iotests/081
@@ -XXX,XX +XXX,XX @@ quorum="$quorum,file.children.2.driver=raw"
 
 $QEMU_IO -c "open -o $quorum" | _filter_qemu_io
 
+echo
+echo "== dynamically adding a child to a quorum =="
+
+for verify in false true; do
+    run_qemu <<EOF
+    { "execute": "qmp_capabilities" }
+    { "execute": "blockdev-add",
+        "arguments": {
+            "driver": "quorum",
+            "node-name": "drive0-quorum",
+            "vote-threshold": 2,
+            "blkverify": ${verify},
+            "children": [
+                {
+                    "driver": "$IMGFMT",
+                    "file": {
+                        "driver": "file",
+                        "filename": "$TEST_DIR/1.raw"
+                    }
+                },
+                {
+                    "driver": "$IMGFMT",
+                    "file": {
+                        "driver": "file",
+                        "filename": "$TEST_DIR/2.raw"
+                    }
+                }
+            ]
+        }
+    }
+    { "execute": "blockdev-add",
+        "arguments": {
+            "node-name": "drive3",
+            "driver": "$IMGFMT",
+            "file": {
+                "driver": "file",
+                "filename": "$TEST_DIR/2.raw"
+            }
+        }
+    }
+    { "execute": "x-blockdev-change",
+      "arguments": { "parent": "drive0-quorum",
+                     "node": "drive3" } }
+    { "execute": "quit" }
+EOF
+done
+
+echo
+echo "== dynamically removing a child from a quorum =="
+
+for verify in false true; do
+    for vote_threshold in 1 2; do
+        run_qemu <<EOF
+        { "execute": "qmp_capabilities" }
+        { "execute": "blockdev-add",
+            "arguments": {
+                "driver": "quorum",
+                "node-name": "drive0-quorum",
+                "vote-threshold": ${vote_threshold},
+                "blkverify": ${verify},
+                "children": [
+                    {
+                        "driver": "$IMGFMT",
+                        "file": {
+                            "driver": "file",
+                            "filename": "$TEST_DIR/1.raw"
+                        }
+                    },
+                    {
+                        "driver": "$IMGFMT",
+                        "file": {
+                            "driver": "file",
+                            "filename": "$TEST_DIR/2.raw"
+                        }
+                    }
+                ]
+            }
+        }
+        { "execute": "x-blockdev-change",
+          "arguments": { "parent": "drive0-quorum",
+                         "child": "children.1" } }
+        { "execute": "quit" }
+EOF
+    done
+done
+
 # success, all done
 echo "*** done"
 rm -f $seq.full
diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/081.out
+++ b/tests/qemu-iotests/081.out
@@ -XXX,XX +XXX,XX @@ read 10485760/10485760 bytes at offset 0
 
 == checking the blkverify mode with invalid settings ==
 can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
+
+== dynamically adding a child to a quorum ==
+Testing:
+QMP_VERSION
+{"return": {}}
+{"return": {}}
+{"return": {}}
+{"return": {}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
+
+Testing:
+QMP_VERSION
+{"return": {}}
+{"return": {}}
+{"return": {}}
+{"error": {"class": "GenericError", "desc": "Cannot add a child to a quorum in blkverify mode"}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
+
+
+== dynamically removing a child from a quorum ==
+Testing:
+QMP_VERSION
+{"return": {}}
+{"return": {}}
+{"return": {}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
+
+Testing:
+QMP_VERSION
+{"return": {}}
+{"return": {}}
+{"error": {"class": "GenericError", "desc": "The number of children cannot be lower than the vote threshold 2"}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
+
+Testing:
+QMP_VERSION
+{"return": {}}
+{"error": {"class": "GenericError", "desc": "blkverify=on can only be set if there are exactly two files and vote-threshold is 2"}}
+{"error": {"class": "GenericError", "desc": "Cannot find device=drive0-quorum nor node_name=drive0-quorum"}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
+
+Testing:
+QMP_VERSION
+{"return": {}}
+{"return": {}}
+{"error": {"class": "GenericError", "desc": "The number of children cannot be lower than the vote threshold 2"}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
+
 *** done
-- 
2.19.1

If a management application builds the block graph node by node, the
protocol layer doesn't inherit its read-only option from the format
layer any more, so it must be set explicitly.

Backing files should work on read-only storage, but at the same time, a
block job like commit should be able to reopen them read-write if they
are on read-write storage. However, without option inheritance, reopen
only changes the read-only option for the root node (typically the
format layer), but not the protocol layer, so reopening fails (the
format layer wants to get write permissions, but the protocol layer is
still read-only).

A simple workaround for the problem in the management tool would be to
open the protocol layer always read-write and to make only the format
layer read-only for backing files. However, sometimes the file is
actually stored on read-only storage and we don't know whether the image
can be opened read-write (for example, for NBD it depends on the server
we're trying to connect to). This adds an option that makes QEMU try to
open the image read-write, but allows it to degrade to a read-only mode
without returning an error.

The documentation for this option is consciously phrased in a way that
allows QEMU to switch to a better model eventually: Instead of trying
when the image is first opened, making the read-only flag dynamic and
changing it automatically whenever the first BLK_PERM_WRITE user is
attached or the last one is detached would be much more useful
behaviour.

Unfortunately, this more useful behaviour is also a lot harder to
implement, and libvirt needs a solution now before it can switch to
-blockdev, so let's start with this easier approach for now.

Instead of adding a new auto-read-only option, turning the existing
read-only into an enum (with a bool alternate for compatibility) was
considered, but it complicated the implementation to the point that it
didn't seem to be worth it.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 qapi/block-core.json  |  7 +++++++
 include/block/block.h |  2 ++
 block.c               | 17 +++++++++++++++++
 block/vvfat.c         |  1 +
 blockdev.c            |  2 +-
 5 files changed, 28 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 @@
 #                 either generally or in certain configurations. In this case,
 #                 the default value does not work and the option must be
 #                 specified explicitly.
+# @auto-read-only: if true and @read-only is false, QEMU may automatically
+#                  decide not to open the image read-write as requested, but
+#                  fall back to read-only instead (and switch between the modes
+#                  later), e.g. depending on whether the image file is writable
+#                  or whether a writing user is attached to the node
+#                  (default: false, since 3.1)
 # @detect-zeroes: detect and optimize zero writes (Since 2.1)
 #                 (default: off)
 # @force-share:   force share all permission on added nodes.
@@ -XXX,XX +XXX,XX @@
             '*discard': 'BlockdevDiscardOptions',
             '*cache': 'BlockdevCacheOptions',
             '*read-only': 'bool',
+            '*auto-read-only': 'bool',
             '*force-share': 'bool',
             '*detect-zeroes': 'BlockdevDetectZeroesOptions' },
   'discriminator': 'driver',
diff --git a/include/block/block.h b/include/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ typedef struct HDGeometry {
                                       select an appropriate protocol driver,
                                       ignoring the format layer */
 #define BDRV_O_NO_IO       0x10000 /* don't initialize for I/O */
+#define BDRV_O_AUTO_RDONLY 0x20000 /* degrade to read-only if opening read-write fails */
 
 #define BDRV_O_CACHE_MASK  (BDRV_O_NOCACHE | BDRV_O_NO_FLUSH)
 
@@ -XXX,XX +XXX,XX @@ typedef struct HDGeometry {
 #define BDRV_OPT_CACHE_DIRECT   "cache.direct"
 #define BDRV_OPT_CACHE_NO_FLUSH "cache.no-flush"
 #define BDRV_OPT_READ_ONLY      "read-only"
+#define BDRV_OPT_AUTO_READ_ONLY "auto-read-only"
 #define BDRV_OPT_DISCARD        "discard"
 #define BDRV_OPT_FORCE_SHARE    "force-share"
 
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ static void bdrv_inherited_options(int *child_flags, QDict *child_options,
 
     /* Inherit the read-only option from the parent if it's not set */
     qdict_copy_default(child_options, parent_options, BDRV_OPT_READ_ONLY);
+    qdict_copy_default(child_options, parent_options, BDRV_OPT_AUTO_READ_ONLY);
 
     /* Our block drivers take care to send flushes and respect unmap policy,
      * so we can default to enable both on lower layers regardless of the
@@ -XXX,XX +XXX,XX @@ static void bdrv_backing_options(int *child_flags, QDict *child_options,
 
     /* backing files always opened read-only */
     qdict_set_default_str(child_options, BDRV_OPT_READ_ONLY, "on");
+    qdict_set_default_str(child_options, BDRV_OPT_AUTO_READ_ONLY, "off");
     flags &= ~BDRV_O_COPY_ON_READ;
 
     /* snapshot=on is handled on the top layer */
@@ -XXX,XX +XXX,XX @@ static void update_flags_from_options(int *flags, QemuOpts *opts)
         *flags |= BDRV_O_RDWR;
     }
 
+    assert(qemu_opt_find(opts, BDRV_OPT_AUTO_READ_ONLY));
+    if (qemu_opt_get_bool_del(opts, BDRV_OPT_AUTO_READ_ONLY, false)) {
+        *flags |= BDRV_O_AUTO_RDONLY;
+    }
 }
 
 static void update_options_from_flags(QDict *options, int flags)
@@ -XXX,XX +XXX,XX @@ static void update_options_from_flags(QDict *options, int flags)
     if (!qdict_haskey(options, BDRV_OPT_READ_ONLY)) {
         qdict_put_bool(options, BDRV_OPT_READ_ONLY, !(flags & BDRV_O_RDWR));
     }
+    if (!qdict_haskey(options, BDRV_OPT_AUTO_READ_ONLY)) {
+        qdict_put_bool(options, BDRV_OPT_AUTO_READ_ONLY,
+                       flags & BDRV_O_AUTO_RDONLY);
+    }
 }
 
 static void bdrv_assign_node_name(BlockDriverState *bs,
@@ -XXX,XX +XXX,XX @@ QemuOptsList bdrv_runtime_opts = {
             .type = QEMU_OPT_BOOL,
             .help = "Node is opened in read-only mode",
         },
+        {
+            .name = BDRV_OPT_AUTO_READ_ONLY,
+            .type = QEMU_OPT_BOOL,
+            .help = "Node can become read-only if opening read-write fails",
+        },
         {
             .name = "detect-zeroes",
             .type = QEMU_OPT_STRING,
@@ -XXX,XX +XXX,XX @@ BlockDriverState *bdrv_open_blockdev_ref(BlockdevRef *ref, Error **errp)
         qdict_set_default_str(qdict, BDRV_OPT_CACHE_DIRECT, "off");
         qdict_set_default_str(qdict, BDRV_OPT_CACHE_NO_FLUSH, "off");
         qdict_set_default_str(qdict, BDRV_OPT_READ_ONLY, "off");
+        qdict_set_default_str(qdict, BDRV_OPT_AUTO_READ_ONLY, "off");
+
     }
 
     bs = bdrv_open_inherit(NULL, reference, qdict, 0, NULL, NULL, errp);
diff --git a/block/vvfat.c b/block/vvfat.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -XXX,XX +XXX,XX @@ static void vvfat_qcow_options(int *child_flags, QDict *child_options,
                                int parent_flags, QDict *parent_options)
 {
     qdict_set_default_str(child_options, BDRV_OPT_READ_ONLY, "off");
+    qdict_set_default_str(child_options, BDRV_OPT_AUTO_READ_ONLY, "off");
     qdict_set_default_str(child_options, BDRV_OPT_CACHE_NO_FLUSH, "on");
 }
 
diff --git a/blockdev.c b/blockdev.c
index XXXXXXX..XXXXXXX 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_change_medium(bool has_device, const char *device,
 
     bdrv_flags = blk_get_open_flags_from_root_state(blk);
     bdrv_flags &= ~(BDRV_O_TEMPORARY | BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING |
-        BDRV_O_PROTOCOL);
+        BDRV_O_PROTOCOL | BDRV_O_AUTO_RDONLY);
 
     if (!has_read_only) {
         read_only = BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN;
-- 
2.19.1

Some block drivers have traditionally changed their node to read-only
mode without asking the user. This behaviour has been marked deprecated
since 2.11, expecting users to provide an explicit read-only=on option.

Now that we have auto-read-only=on, enable these drivers to make use of
the option.

This is the only use of bdrv_set_read_only(), so we can make it a bit
more specific and turn it into a bdrv_apply_auto_read_only() that is
more convenient for drivers to use.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 include/block/block.h |  3 ++-
 block.c               | 42 +++++++++++++++++++++++++++---------------
 block/bochs.c         | 17 ++++++-----------
 block/cloop.c         | 16 +++++-----------
 block/dmg.c           | 16 +++++-----------
 block/rbd.c           | 15 ++++-----------
 block/vvfat.c         | 10 ++--------
 7 files changed, 51 insertions(+), 68 deletions(-)

diff --git a/include/block/block.h b/include/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
 bool bdrv_is_read_only(BlockDriverState *bs);
 int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only,
                            bool ignore_allow_rdw, Error **errp);
-int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
+int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
+                              Error **errp);
 bool bdrv_is_writable(BlockDriverState *bs);
 bool bdrv_is_sg(BlockDriverState *bs);
 bool bdrv_is_inserted(BlockDriverState *bs);
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only,
     return 0;
 }
 
-/* TODO Remove (deprecated since 2.11)
- * Block drivers are not supposed to automatically change bs->read_only.
- * Instead, they should just check whether they can provide what the user
- * explicitly requested and error out if read-write is requested, but they can
- * only provide read-only access. */
-int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
+/*
+ * Called by a driver that can only provide a read-only image.
+ *
+ * Returns 0 if the node is already read-only or it could switch the node to
+ * read-only because BDRV_O_AUTO_RDONLY is set.
+ *
+ * Returns -EACCES if the node is read-write and BDRV_O_AUTO_RDONLY is not set
+ * or bdrv_can_set_read_only() forbids making the node read-only. If @errmsg
+ * is not NULL, it is used as the error message for the Error object.
+ */
+int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
+                              Error **errp)
 {
     int ret = 0;
 
-    ret = bdrv_can_set_read_only(bs, read_only, false, errp);
-    if (ret < 0) {
-        return ret;
+    if (!(bs->open_flags & BDRV_O_RDWR)) {
+        return 0;
+    }
+    if (!(bs->open_flags & BDRV_O_AUTO_RDONLY)) {
+        goto fail;
     }
 
-    bs->read_only = read_only;
-
-    if (read_only) {
-        bs->open_flags &= ~BDRV_O_RDWR;
-    } else {
-        bs->open_flags |= BDRV_O_RDWR;
+    ret = bdrv_can_set_read_only(bs, true, false, NULL);
+    if (ret < 0) {
+        goto fail;
     }
 
+    bs->read_only = true;
+    bs->open_flags &= ~BDRV_O_RDWR;
+
     return 0;
+
+fail:
+    error_setg(errp, "%s", errmsg ?: "Image is read-only");
+    return -EACCES;
 }
 
 void bdrv_get_full_backing_filename_from_filename(const char *backed,
diff --git a/block/bochs.c b/block/bochs.c
index XXXXXXX..XXXXXXX 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
     struct bochs_header bochs;
     int ret;
 
+    /* No write support yet */
+    ret = bdrv_apply_auto_read_only(bs, NULL, errp);
+    if (ret < 0) {
+        return ret;
+    }
+
     bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,
                                false, errp);
     if (!bs->file) {
         return -EINVAL;
     }
 
-    if (!bdrv_is_read_only(bs)) {
-        error_report("Opening bochs images without an explicit read-only=on "
-                     "option is deprecated. Future versions will refuse to "
-                     "open the image instead of automatically marking the "
-                     "image read-only.");
-        ret = bdrv_set_read_only(bs, true, errp); /* no write support yet */
-        if (ret < 0) {
-            return ret;
-        }
-    }
-
     ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));
     if (ret < 0) {
         return ret;
diff --git a/block/cloop.c b/block/cloop.c
index XXXXXXX..XXXXXXX 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
     uint32_t offsets_size, max_compressed_block_size = 1, i;
     int ret;
 
+    ret = bdrv_apply_auto_read_only(bs, NULL, errp);
+    if (ret < 0) {
+        return ret;
+    }
+
     bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,
                                false, errp);
     if (!bs->file) {
         return -EINVAL;
     }
 
-    if (!bdrv_is_read_only(bs)) {
-        error_report("Opening cloop images without an explicit read-only=on "
-                     "option is deprecated. Future versions will refuse to "
-                     "open the image instead of automatically marking the "
-                     "image read-only.");
-        ret = bdrv_set_read_only(bs, true, errp);
-        if (ret < 0) {
-            return ret;
-        }
-    }
-
     /* read header */
     ret = bdrv_pread(bs->file, 128, &s->block_size, 4);
     if (ret < 0) {
diff --git a/block/dmg.c b/block/dmg.c
index XXXXXXX..XXXXXXX 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
     int64_t offset;
     int ret;
 
+    ret = bdrv_apply_auto_read_only(bs, NULL, errp);
+    if (ret < 0) {
+        return ret;
+    }
+
     bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,
                                false, errp);
     if (!bs->file) {
         return -EINVAL;
     }
 
-    if (!bdrv_is_read_only(bs)) {
-        error_report("Opening dmg images without an explicit read-only=on "
-                     "option is deprecated. Future versions will refuse to "
-                     "open the image instead of automatically marking the "
-                     "image read-only.");
-        ret = bdrv_set_read_only(bs, true, errp);
-        if (ret < 0) {
-            return ret;
-        }
-    }
-
     block_module_load_one("dmg-bz2");
 
     s->n_chunks = 0;
diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
     /* If we are using an rbd snapshot, we must be r/o, otherwise
      * leave as-is */
     if (s->snap != NULL) {
-        if (!bdrv_is_read_only(bs)) {
-            error_report("Opening rbd snapshots without an explicit "
-                         "read-only=on option is deprecated. Future versions "
-                         "will refuse to open the image instead of "
-                         "automatically marking the image read-only.");
-            r = bdrv_set_read_only(bs, true, &local_err);
-            if (r < 0) {
-                rbd_close(s->image);
-                error_propagate(errp, local_err);
-                goto failed_open;
-            }
+        r = bdrv_apply_auto_read_only(bs, "rbd snapshots are read-only", errp);
+        if (r < 0) {
+            rbd_close(s->image);
+            goto failed_open;
         }
     }
 
diff --git a/block/vvfat.c b/block/vvfat.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
                        "Unable to set VVFAT to 'rw' when drive is read-only");
             goto fail;
         }
-    } else  if (!bdrv_is_read_only(bs)) {
-        error_report("Opening non-rw vvfat images without an explicit "
-                     "read-only=on option is deprecated. Future versions "
-                     "will refuse to open the image instead of "
-                     "automatically marking the image read-only.");
-        /* read only is the default for safety */
-        ret = bdrv_set_read_only(bs, true, &local_err);
+    } else {
+        ret = bdrv_apply_auto_read_only(bs, NULL, errp);
         if (ret < 0) {
-            error_propagate(errp, local_err);
             goto fail;
         }
     }
-- 
2.19.1

If read-only=off, but auto-read-only=on is given, open a read-write NBD
connection if the server provides a read-write export, but instead of
erroring out for read-only exports, just degrade to read-only.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 block/nbd-client.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/block/nbd-client.c b/block/nbd-client.c
index XXXXXXX..XXXXXXX 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -XXX,XX +XXX,XX @@ int nbd_client_init(BlockDriverState *bs,
         logout("Failed to negotiate with the NBD server\n");
         return ret;
     }
-    if (client->info.flags & NBD_FLAG_READ_ONLY &&
-        !bdrv_is_read_only(bs)) {
-        error_setg(errp,
-                   "request for write access conflicts with read-only export");
-        return -EACCES;
+    if (client->info.flags & NBD_FLAG_READ_ONLY) {
+        ret = bdrv_apply_auto_read_only(bs, "NBD export is read-only", errp);
+        if (ret < 0) {
+            return ret;
+        }
     }
     if (client->info.flags & NBD_FLAG_SEND_FUA) {
         bs->supported_write_flags = BDRV_REQ_FUA;
-- 
2.19.1

If read-only=off, but auto-read-only=on is given, open the file
read-write if we have the permissions, but instead of erroring out for
read-only files, just degrade to read-only.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 block/file-posix.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
 
     s->fd = -1;
     fd = qemu_open(filename, s->open_flags, 0644);
-    if (fd < 0) {
-        ret = -errno;
-        error_setg_errno(errp, errno, "Could not open '%s'", filename);
+    ret = fd < 0 ? -errno : 0;
+
+    if (ret == -EACCES || ret == -EROFS) {
+        /* Try to degrade to read-only, but if it doesn't work, still use the
+         * normal error message. */
+        if (bdrv_apply_auto_read_only(bs, NULL, NULL) == 0) {
+            bdrv_flags &= ~BDRV_O_RDWR;
+            raw_parse_flags(bdrv_flags, &s->open_flags);
+            assert(!(s->open_flags & O_CREAT));
+            fd = qemu_open(filename, s->open_flags);
+            ret = fd < 0 ? -errno : 0;
+        }
+    }
+
+    if (ret < 0) {
+        error_setg_errno(errp, -ret, "Could not open '%s'", filename);
         if (ret == -EROFS) {
             ret = -EACCES;
         }
-- 
2.19.1

If read-only=off, but auto-read-only=on is given, open the file
read-write if we have the permissions, but instead of erroring out for
read-only files, just degrade to read-only.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
---
 block/gluster.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/block/gluster.c b/block/gluster.c
index XXXXXXX..XXXXXXX 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_open(BlockDriverState *bs,  QDict *options,
     qemu_gluster_parse_flags(bdrv_flags, &open_flags);
 
     s->fd = glfs_open(s->glfs, gconf->path, open_flags);
-    if (!s->fd) {
-        ret = -errno;
+    ret = s->fd ? 0 : -errno;
+
+    if (ret == -EACCES || ret == -EROFS) {
+        /* Try to degrade to read-only, but if it doesn't work, still use the
+         * normal error message. */
+        if (bdrv_apply_auto_read_only(bs, NULL, NULL) == 0) {
+            open_flags = (open_flags & ~O_RDWR) | O_RDONLY;
+            s->fd = glfs_open(s->glfs, gconf->path, open_flags);
+            ret = s->fd ? 0 : -errno;
+        }
     }
 
     s->supports_seek_data = qemu_gluster_test_seek(s->fd);
-- 
2.19.1

If read-only=off, but auto-read-only=on is given, open the volume
read-write if we have the permissions, but instead of erroring out for
read-only volumes, just degrade to read-only.

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

diff --git a/block/iscsi.c b/block/iscsi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
     /* Check the write protect flag of the LUN if we want to write */
     if (iscsilun->type == TYPE_DISK && (flags & BDRV_O_RDWR) &&
         iscsilun->write_protected) {
-        error_setg(errp, "Cannot open a write protected LUN as read-write");
-        ret = -EACCES;
-        goto out;
+        ret = bdrv_apply_auto_read_only(bs, "LUN is write protected", errp);
+        if (ret < 0) {
+            goto out;
+        }
+        flags &= ~BDRV_O_RDWR;
     }
 
     iscsi_readcapacity_sync(iscsilun, &local_err);
-- 
2.19.1

While we want machine interfaces like -blockdev and QMP blockdev-add to
add as little auto-detection as possible so that management tools are
explicit about their needs, -drive is a convenience option for human
users. Enabling auto-read-only=on by default there enables users to use
read-only images for read-only guest devices without having to specify
read-only=on explicitly. If they try to attach the image to a read-write
device, they will still get an error message.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 blockdev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blockdev.c b/blockdev.c
index XXXXXXX..XXXXXXX 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -XXX,XX +XXX,XX @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts,
         qdict_set_default_str(bs_opts, BDRV_OPT_CACHE_NO_FLUSH, "off");
         qdict_set_default_str(bs_opts, BDRV_OPT_READ_ONLY,
                               read_only ? "on" : "off");
+        qdict_set_default_str(bs_opts, BDRV_OPT_AUTO_READ_ONLY, "on");
         assert((bdrv_flags & BDRV_O_CACHE_MASK) == 0);
 
         if (runstate_check(RUN_STATE_INMIGRATE)) {
-- 
2.19.1

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 tests/qemu-iotests/232     | 147 +++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/232.out |  59 +++++++++++++++
 tests/qemu-iotests/group   |   1 +
 3 files changed, 207 insertions(+)
 create mode 100755 tests/qemu-iotests/232
 create mode 100644 tests/qemu-iotests/232.out

diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
new file mode 100755
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/232
@@ -XXX,XX +XXX,XX @@
+#!/bin/bash
+#
+# Test for auto-read-only
+#
+# Copyright (C) 2018 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=kwolf@redhat.com
+
+seq=`basename $0`
+echo "QA output created by $seq"
+
+here=`pwd`
+status=1	# failure is the default!
+
+_cleanup()
+{
+    _cleanup_test_img
+    rm -f $TEST_IMG.snap
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+
+_supported_fmt generic
+_supported_proto file
+_supported_os Linux
+
+function do_run_qemu()
+{
+    echo Testing: "$@"
+    (
+        if ! test -t 0; then
+            while read cmd; do
+                echo $cmd
+            done
+        fi
+        echo quit
+    ) | $QEMU -nographic -monitor stdio -nodefaults "$@"
+    echo
+}
+
+function run_qemu()
+{
+    do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_hmp |
+        _filter_generated_node_ids | _filter_imgfmt
+}
+
+function run_qemu_info_block()
+{
+    echo "info block -n" | run_qemu "$@" | grep -e "(file" -e "QEMU_PROG"
+}
+
+size=128M
+
+_make_test_img $size
+
+echo
+echo "=== -drive with read-write image: read-only/auto-read-only combinations ==="
+echo
+
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on,auto-read-only=off
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on,auto-read-only=on
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on
+echo
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off,auto-read-only=off
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off,auto-read-only=on
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off
+echo
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,auto-read-only=off
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,auto-read-only=on
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none
+
+echo
+echo "=== -drive with read-only image: read-only/auto-read-only combinations ==="
+echo
+
+chmod a-w $TEST_IMG
+
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on,auto-read-only=off
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on,auto-read-only=on
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on
+echo
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off,auto-read-only=off
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off,auto-read-only=on
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off
+echo
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,auto-read-only=off
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,auto-read-only=on
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none
+
+echo
+echo "=== -blockdev with read-write image: read-only/auto-read-only combinations ==="
+echo
+
+chmod a+w $TEST_IMG
+
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on,auto-read-only=off
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on,auto-read-only=on
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on
+echo
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off,auto-read-only=off
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off,auto-read-only=on
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off
+echo
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=off
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=on
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0
+
+echo
+echo "=== -blockdev with read-only image: read-only/auto-read-only combinations ==="
+echo
+
+chmod a-w $TEST_IMG
+
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on,auto-read-only=off
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on,auto-read-only=on
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on
+echo
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off,auto-read-only=off
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off,auto-read-only=on
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off
+echo
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=off
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=on
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/232.out b/tests/qemu-iotests/232.out
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/232.out
@@ -XXX,XX +XXX,XX @@
+QA output created by 232
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+
+=== -drive with read-write image: read-only/auto-read-only combinations ===
+
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
+
+NODE_NAME: TEST_DIR/t.IMGFMT (file)
+NODE_NAME: TEST_DIR/t.IMGFMT (file)
+NODE_NAME: TEST_DIR/t.IMGFMT (file)
+
+NODE_NAME: TEST_DIR/t.IMGFMT (file)
+NODE_NAME: TEST_DIR/t.IMGFMT (file)
+NODE_NAME: TEST_DIR/t.IMGFMT (file)
+
+=== -drive with read-only image: read-only/auto-read-only combinations ===
+
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
+
+QEMU_PROG: -drive driver=file,file=TEST_DIR/t.IMGFMT,if=none,read-only=off,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
+
+QEMU_PROG: -drive driver=file,file=TEST_DIR/t.IMGFMT,if=none,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
+
+=== -blockdev with read-write image: read-only/auto-read-only combinations ===
+
+node0: TEST_DIR/t.IMGFMT (file, read-only)
+node0: TEST_DIR/t.IMGFMT (file, read-only)
+node0: TEST_DIR/t.IMGFMT (file, read-only)
+
+node0: TEST_DIR/t.IMGFMT (file)
+node0: TEST_DIR/t.IMGFMT (file)
+node0: TEST_DIR/t.IMGFMT (file)
+
+node0: TEST_DIR/t.IMGFMT (file)
+node0: TEST_DIR/t.IMGFMT (file)
+node0: TEST_DIR/t.IMGFMT (file)
+
+=== -blockdev with read-only image: read-only/auto-read-only combinations ===
+
+node0: TEST_DIR/t.IMGFMT (file, read-only)
+node0: TEST_DIR/t.IMGFMT (file, read-only)
+node0: TEST_DIR/t.IMGFMT (file, read-only)
+
+QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0,read-only=off,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
+node0: TEST_DIR/t.IMGFMT (file, read-only)
+QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0,read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
+
+QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
+node0: TEST_DIR/t.IMGFMT (file, read-only)
+QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
+*** 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 @@
 227 auto quick
 229 auto quick
 231 auto quick
+232 auto quick
-- 
2.19.1

From: Max Reitz <mreitz@redhat.com>

This adds some whitespace into the option help (including indentation)
and puts angle brackets around the type names.  Furthermore, the list
name is no longer printed as part of every line, but only once in
advance, and only if the caller did not print a caption already.

This patch also restores the description alignment we had before commit
9cbef9d68ee1d8d0, just at 24 instead of 16 characters like we used to.
This increase is because now we have the type and two spaces of
indentation before the description, and with a usual type name length of
three chracters, this sums up to eight additional characters -- which
means that we now need 24 characters to get the same amount of padding
for most options.  Also, 24 is a third of 80, which makes it kind of a
round number in terminal terms.

Finally, this patch amends the reference output of iotest 082 to match
the changes (and thus makes it pass again).

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/qemu/option.h      |   2 +-
 qemu-img.c                 |   4 +-
 util/qemu-option.c         |  32 +-
 tests/qemu-iotests/082.out | 956 ++++++++++++++++++-------------------
 4 files changed, 507 insertions(+), 487 deletions(-)

diff --git a/include/qemu/option.h b/include/qemu/option.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -XXX,XX +XXX,XX @@ typedef int (*qemu_opts_loopfunc)(void *opaque, QemuOpts *opts, Error **errp);
 int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func,
                       void *opaque, Error **errp);
 void qemu_opts_print(QemuOpts *opts, const char *sep);
-void qemu_opts_print_help(QemuOptsList *list);
+void qemu_opts_print_help(QemuOptsList *list, bool print_caption);
 void qemu_opts_free(QemuOptsList *list);
 QemuOptsList *qemu_opts_append(QemuOptsList *dst, QemuOptsList *list);
 
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 int print_block_option_help(const char *filename, const char *fmt)
     }
 
     printf("Supported options:\n");
-    qemu_opts_print_help(create_opts);
+    qemu_opts_print_help(create_opts, false);
     qemu_opts_free(create_opts);
     return 0;
 }
@@ -XXX,XX +XXX,XX @@ static int print_amend_option_help(const char *format)
     assert(drv->create_opts);
 
     printf("Creation options for '%s':\n", format);
-    qemu_opts_print_help(drv->create_opts);
+    qemu_opts_print_help(drv->create_opts, false);
     printf("\nNote that not all of these options may be amendable.\n");
     return 0;
 }
diff --git a/util/qemu-option.c b/util/qemu-option.c
index XXXXXXX..XXXXXXX 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -XXX,XX +XXX,XX @@ static const char *opt_type_to_string(enum QemuOptType type)
     g_assert_not_reached();
 }
 
-void qemu_opts_print_help(QemuOptsList *list)
+/**
+ * Print the list of options available in the given list.  If
+ * @print_caption is true, a caption (including the list name, if it
+ * exists) is printed.  The options itself will be indented, so
+ * @print_caption should only be set to false if the caller prints its
+ * own custom caption (so that the indentation makes sense).
+ */
+void qemu_opts_print_help(QemuOptsList *list, bool print_caption)
 {
     QemuOptDesc *desc;
     int i;
@@ -XXX,XX +XXX,XX @@ void qemu_opts_print_help(QemuOptsList *list)
     desc = list->desc;
     while (desc && desc->name) {
         GString *str = g_string_new(NULL);
-        if (list->name) {
-            g_string_append_printf(str, "%s.", list->name);
-        }
-        g_string_append_printf(str, "%s=%s", desc->name,
+        g_string_append_printf(str, "  %s=<%s>", desc->name,
                                opt_type_to_string(desc->type));
         if (desc->help) {
+            if (str->len < 24) {
+                g_string_append_printf(str, "%*s", 24 - (int)str->len, "");
+            }
             g_string_append_printf(str, " - %s", desc->help);
         }
         g_ptr_array_add(array, g_string_free(str, false));
@@ -XXX,XX +XXX,XX @@ void qemu_opts_print_help(QemuOptsList *list)
     }
 
     g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0);
+    if (print_caption && array->len > 0) {
+        if (list->name) {
+            printf("%s options:\n", list->name);
+        } else {
+            printf("Options:\n");
+        }
+    } else if (array->len == 0) {
+        if (list->name) {
+            printf("There are no options for %s.\n", list->name);
+        } else {
+            printf("No options available.\n");
+        }
+    }
     for (i = 0; i < array->len; i++) {
         printf("%s\n", (char *)array->pdata[i]);
     }
@@ -XXX,XX +XXX,XX @@ QemuOpts *qemu_opts_parse_noisily(QemuOptsList *list, const char *params,
     opts = opts_parse(list, params, permit_abbrev, false, &invalidp, &err);
     if (err) {
         if (invalidp && has_help_option(params)) {
-            qemu_opts_print_help(list);
+            qemu_opts_print_help(list, true);
             error_free(err);
         } else {
             error_report_err(err);
diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/082.out
+++ b/tests/qemu-iotests/082.out
@@ -XXX,XX +XXX,XX @@ cluster_size: 8192
 
 Testing: create -f qcow2 -o help TEST_DIR/t.qcow2 128M
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: create -f qcow2 -o ? TEST_DIR/t.qcow2 128M
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: create -f qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2 128M
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: create -f qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2 128M
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: create -f qcow2 -o help,cluster_size=4k TEST_DIR/t.qcow2 128M
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: create -f qcow2 -o ?,cluster_size=4k TEST_DIR/t.qcow2 128M
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: create -f qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2 128M
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: create -f qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2 128M
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: create -f qcow2 -u -o backing_file=TEST_DIR/t.qcow2,,help TEST_DIR/t.qcow2 128M
 Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 backing_file=TEST_DIR/t.qcow2,,help cluster_size=65536 lazy_refcounts=off refcount_bits=16
@@ -XXX,XX +XXX,XX @@ qemu-img: Invalid option list: ,,
 
 Testing: create -f qcow2 -o help
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: create -o help
 Supported options:
-size             Virtual disk size
+  size=<size>            - Virtual disk size
 
 Testing: create -f bochs -o help
 qemu-img: Format driver 'bochs' does not support image creation
@@ -XXX,XX +XXX,XX @@ cluster_size: 8192
 
 Testing: convert -O qcow2 -o help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: convert -O qcow2 -o ? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: convert -O qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: convert -O qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: convert -O qcow2 -o help,cluster_size=4k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: convert -O qcow2 -o ?,cluster_size=4k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: convert -O qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: convert -O qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
-nocow            Turn off copy-on-write (valid only on btrfs)
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: convert -O qcow2 -o backing_file=TEST_DIR/t.qcow2,,help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 qemu-img: Could not open 'TEST_DIR/t.qcow2.base': Could not open backing file: Could not open 'TEST_DIR/t.qcow2,help': No such file or directory
@@ -XXX,XX +XXX,XX @@ qemu-img: Invalid option list: ,,
 
 Testing: convert -O qcow2 -o help
 Supported options:
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Testing: convert -o help
 Supported options:
-size             Virtual disk size
+  size=<size>            - Virtual disk size
 
 Testing: convert -O bochs -o help
 qemu-img: Format driver 'bochs' does not support image creation
@@ -XXX,XX +XXX,XX @@ cluster_size: 65536
 
 Testing: amend -f qcow2 -o help TEST_DIR/t.qcow2
 Creation options for 'qcow2':
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: amend -f qcow2 -o ? TEST_DIR/t.qcow2
 Creation options for 'qcow2':
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: amend -f qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2
 Creation options for 'qcow2':
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: amend -f qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2
 Creation options for 'qcow2':
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: amend -f qcow2 -o help,cluster_size=4k TEST_DIR/t.qcow2
 Creation options for 'qcow2':
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: amend -f qcow2 -o ?,cluster_size=4k TEST_DIR/t.qcow2
 Creation options for 'qcow2':
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: amend -f qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2
 Creation options for 'qcow2':
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: amend -f qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2
 Creation options for 'qcow2':
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Note that not all of these options may be amendable.
 
@@ -XXX,XX +XXX,XX @@ qemu-img: Invalid option list: ,,
 
 Testing: amend -f qcow2 -o help
 Creation options for 'qcow2':
-size             Virtual disk size
-compat           Compatibility level (0.10 or 1.1)
-backing_file     File name of a base image
-backing_fmt      Image format of the base image
-encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
-encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
-encrypt.cipher-alg Name of encryption cipher algorithm
-encrypt.cipher-mode Name of encryption cipher mode
-encrypt.ivgen-alg Name of IV generator algorithm
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
-encrypt.hash-alg Name of encryption hash algorithm
-encrypt.iter-time Time to spend in PBKDF in milliseconds
-cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
-lazy_refcounts   Postpone refcount updates
-refcount_bits    Width of a reference count entry in bits
+  backing_file=<str>     - File name of a base image
+  backing_fmt=<str>      - Image format of the base image
+  cluster_size=<size>    - qcow2 cluster size
+  compat=<str>           - Compatibility level (0.10 or 1.1)
+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+  refcount_bits=<num>    - Width of a reference count entry in bits
+  size=<size>            - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: convert -o help
 Supported options:
-size             Virtual disk size
+  size=<size>            - Virtual disk size
 
 Testing: amend -f bochs -o help
 qemu-img: Format driver 'bochs' does not support option amendment
-- 
2.19.1

From: Max Reitz <mreitz@redhat.com>

Just like in qemu_opts_print_help(), print the device name as a caption
instead of on every single line, indent all options, add angle brackets
around types, and align the descriptions after 24 characters.  Also,
separate the descriptions with " - " instead of putting them in
parentheses, because that is what we do everywhere else.  This does look
a bit funny here because basically all bits have the description
"on/off", but funny does not mean it is less readable.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qdev-monitor.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/qdev-monitor.c b/qdev-monitor.c
index XXXXXXX..XXXXXXX 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -XXX,XX +XXX,XX @@ int qdev_device_help(QemuOpts *opts)
         goto error;
     }
 
+    if (prop_list) {
+        out_printf("%s options:\n", driver);
+    } else {
+        out_printf("There are no options for %s.\n", driver);
+    }
     for (prop = prop_list; prop; prop = prop->next) {
-        out_printf("%s.%s=%s", driver, prop->value->name, prop->value->type);
+        int len;
+        out_printf("  %s=<%s>%n", prop->value->name, prop->value->type, &len);
         if (prop->value->has_description) {
-            out_printf(" (%s)\n", prop->value->description);
+            if (len < 24) {
+                out_printf("%*s", 24 - len, "");
+            }
+            out_printf(" - %s\n", prop->value->description);
         } else {
             out_printf("\n");
         }
-- 
2.19.1

From: Max Reitz <mreitz@redhat.com>

Just like in qemu_opts_print_help(), print the object name as a caption
instead of on every single line, indent all options, add angle brackets
around types, and align the descriptions after 24 characters.

Also, indent every object name in the list of available objects.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 vl.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/vl.c b/vl.c
index XXXXXXX..XXXXXXX 100644
--- a/vl.c
+++ b/vl.c
@@ -XXX,XX +XXX,XX @@ static bool object_create_initial(const char *type, QemuOpts *opts)
         list = object_class_get_list_sorted(TYPE_USER_CREATABLE, false);
         for (l = list; l != NULL; l = l->next) {
             ObjectClass *oc = OBJECT_CLASS(l->data);
-            printf("%s\n", object_class_get_name(oc));
+            printf("  %s\n", object_class_get_name(oc));
         }
         g_slist_free(list);
         exit(0);
@@ -XXX,XX +XXX,XX @@ static bool object_create_initial(const char *type, QemuOpts *opts)
             }
 
             str = g_string_new(NULL);
-            g_string_append_printf(str, "%s.%s=%s", type,
-                                   prop->name, prop->type);
+            g_string_append_printf(str, "  %s=<%s>", prop->name, prop->type);
             if (prop->description) {
+                if (str->len < 24) {
+                    g_string_append_printf(str, "%*s", 24 - (int)str->len, "");
+                }
                 g_string_append_printf(str, " - %s", prop->description);
             }
             g_ptr_array_add(array, g_string_free(str, false));
         }
         g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0);
+        if (array->len > 0) {
+            printf("%s options:\n", type);
+        } else {
+            printf("There are no options for %s.\n", type);
+        }
         for (i = 0; i < array->len; i++) {
             printf("%s\n", (char *)array->pdata[i]);
         }
-- 
2.19.1

From: Leonid Bloch <lbloch@janustech.com>

If an expression is used to define DEFAULT_CLUSTER_SIZE, when compiled,
it will be embedded as a literal expression in the binary (as the
default value) because it is stringified to mark the size of the default
value. Now this is fixed by using a defined number to define this value.

Signed-off-by: Leonid Bloch <lbloch@janustech.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/vdi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/vdi.c b/block/vdi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -XXX,XX +XXX,XX @@
 #define BLOCK_OPT_STATIC "static"
 
 #define SECTOR_SIZE 512
-#define DEFAULT_CLUSTER_SIZE (1 * MiB)
+#define DEFAULT_CLUSTER_SIZE S_1MiB
 
 #if defined(CONFIG_VDI_DEBUG)
 #define VDI_DEBUG 1
@@ -XXX,XX +XXX,XX @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,
         goto fail;
     } else if (header.block_size != DEFAULT_CLUSTER_SIZE) {
         error_setg(errp, "unsupported VDI image (block size %" PRIu32
-                         " is not %" PRIu64 ")",
+                         " is not %" PRIu32 ")",
                    header.block_size, DEFAULT_CLUSTER_SIZE);
         ret = -ENOTSUP;
         goto fail;
-- 
2.19.1

From: Leonid Bloch <lbloch@janustech.com>

The lookup table for power-of-two sizes was added in commit 540b8492618eb
for the purpose of having convenient shortcuts for these sizes in cases
when the literal number has to be present at compile time, and
expressions as '(1 * KiB)' can not be used. One such case is the
stringification of sizes. Beyond that, it is convenient to use these
shortcuts for all power-of-two sizes, even if they don't have to be
literal numbers.

Despite its convenience, this table introduced 55 lines of "dumb" code,
the purpose and origin of which are obscure without reading the message
of the commit which introduced it. This patch fixes that by adding a
comment to the code itself with a brief explanation for the reasoning
behind this table. This comment includes the short AWK script that
generated the table, so that anyone who's interested could make sure
that the values in it are correct (otherwise these values look as if
they were typed manually).

Signed-off-by: Leonid Bloch <lbloch@janustech.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/qemu/units.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/include/qemu/units.h b/include/qemu/units.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/units.h
+++ b/include/qemu/units.h
@@ -XXX,XX +XXX,XX @@
 #define PiB     (INT64_C(1) << 50)
 #define EiB     (INT64_C(1) << 60)
 
+/*
+ * The following lookup table is intended to be used when a literal string of
+ * the number of bytes is required (for example if it needs to be stringified).
+ * It can also be used for generic shortcuts of power-of-two sizes.
+ * This table is generated using the AWK script below:
+ *
+ *  BEGIN {
+ *      suffix="KMGTPE";
+ *      for(i=10; i<64; i++) {
+ *          val=2**i;
+ *          s=substr(suffix, int(i/10), 1);
+ *          n=2**(i%10);
+ *          pad=21-int(log(n)/log(10));
+ *          printf("#define S_%d%siB %*d\n", n, s, pad, val);
+ *      }
+ *  }
+ */
+
 #define S_1KiB                  1024
 #define S_2KiB                  2048
 #define S_4KiB                  4096
-- 
2.19.1

The following changes since commit bf159f0bdc7b8e7aa8342dedb3829ca744c1b612:

Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2021-01-27.for-upstream' into staging (2021-01-27 17:40:25 +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 a44be0334beae3a9affb4a3a92cc6852993d7a84:

iotests: rename and move 169 and 199 tests (2021-01-27 20:53:14 +0100)

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

- Fix crash on write to read-only devices
- iotests: Rewrite 'check' in Python, get rid of 'groups' and allow
  non-numeric test case names

----------------------------------------------------------------
Kevin Wolf (2):
      block: Separate blk_is_writable() and blk_supports_write_perm()
      virtio-scsi-test: Test writing to scsi-cd device

Vladimir Sementsov-Ogievskiy (6):
      iotests: 146: drop extra whitespaces from .out file
      iotests: add findtests.py
      iotests: add testenv.py
      iotests: add testrunner.py
      iotests: rewrite check into python
      iotests: rename and move 169 and 199 tests

docs/devel/testing.rst                             |   50 +-
 include/sysemu/block-backend.h                     |    3 +-
 block/block-backend.c                              |   19 +-
 hw/block/dataplane/xen-block.c                     |    2 +-
 hw/block/fdc.c                                     |    9 +-
 hw/block/m25p80.c                                  |    6 +-
 hw/block/nand.c                                    |    2 +-
 hw/block/nvme-ns.c                                 |    7 +-
 hw/block/onenand.c                                 |    2 +-
 hw/block/pflash_cfi01.c                            |    2 +-
 hw/block/pflash_cfi02.c                            |    2 +-
 hw/block/swim.c                                    |    6 +-
 hw/block/virtio-blk.c                              |    6 +-
 hw/block/xen-block.c                               |    2 +-
 hw/ide/core.c                                      |    2 +-
 hw/misc/sifive_u_otp.c                             |    2 +-
 hw/ppc/pnv_pnor.c                                  |    2 +-
 hw/scsi/scsi-disk.c                                |   10 +-
 hw/scsi/scsi-generic.c                             |    4 +-
 hw/sd/sd.c                                         |    6 +-
 hw/usb/dev-storage.c                               |    4 +-
 tests/qtest/virtio-scsi-test.c                     |   39 +
 tests/qemu-iotests/findtests.py                    |  159 +++
 tests/qemu-iotests/iotests.py                      |    8 +
 tests/qemu-iotests/testenv.py                      |  281 +++++
 tests/qemu-iotests/testrunner.py                   |  367 +++++++
 Makefile                                           |    1 -
 tests/check-block.sh                               |    3 +-
 tests/qemu-iotests/146.out                         |  780 +++++++-------
 tests/qemu-iotests/check                           | 1095 +++-----------------
 tests/qemu-iotests/common.env.in                   |    3 -
 tests/qemu-iotests/group                           |  323 ------
 tests/qemu-iotests/meson.build                     |    3 -
 .../{199 => tests/migrate-bitmaps-postcopy-test}   |    0
 .../migrate-bitmaps-postcopy-test.out}             |    0
 .../{169 => tests/migrate-bitmaps-test}            |    0
 .../{169.out => tests/migrate-bitmaps-test.out}    |    0
 37 files changed, 1481 insertions(+), 1729 deletions(-)
 create mode 100644 tests/qemu-iotests/findtests.py
 create mode 100644 tests/qemu-iotests/testenv.py
 create mode 100644 tests/qemu-iotests/testrunner.py
 delete mode 100644 tests/qemu-iotests/common.env.in
 delete mode 100644 tests/qemu-iotests/group
 rename tests/qemu-iotests/{199 => tests/migrate-bitmaps-postcopy-test} (100%)
 rename tests/qemu-iotests/{199.out => tests/migrate-bitmaps-postcopy-test.out} (100%)
 rename tests/qemu-iotests/{169 => tests/migrate-bitmaps-test} (100%)
 rename tests/qemu-iotests/{169.out => tests/migrate-bitmaps-test.out} (100%)

Currently, blk_is_read_only() tells whether a given BlockBackend can
only be used in read-only mode because its root node is read-only. Some
callers actually try to answer a slightly different question: Is the
BlockBackend configured to be writable, by taking write permissions on
the root node?

This can differ, for example, for CD-ROM devices which don't take write
permissions, but may be backed by a writable image file. scsi-cd allows
write requests to the drive if blk_is_read_only() returns false.
However, the write request will immediately run into an assertion
failure because the write permission is missing.

This patch introduces separate functions for both questions.
blk_supports_write_perm() answers the question whether the block
node/image file can support writable devices, whereas blk_is_writable()
tells whether the BlockBackend is currently configured to be writable.

All calls of blk_is_read_only() are converted to one of the two new
functions.

Fixes: https://bugs.launchpad.net/bugs/1906693
Cc: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210118123448.307825-2-kwolf@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/sysemu/block-backend.h |  3 ++-
 block/block-backend.c          | 19 ++++++++++++++++---
 hw/block/dataplane/xen-block.c |  2 +-
 hw/block/fdc.c                 |  9 +++++----
 hw/block/m25p80.c              |  6 +++---
 hw/block/nand.c                |  2 +-
 hw/block/nvme-ns.c             |  7 ++++---
 hw/block/onenand.c             |  2 +-
 hw/block/pflash_cfi01.c        |  2 +-
 hw/block/pflash_cfi02.c        |  2 +-
 hw/block/swim.c                |  6 +++---
 hw/block/virtio-blk.c          |  6 +++---
 hw/block/xen-block.c           |  2 +-
 hw/ide/core.c                  |  2 +-
 hw/misc/sifive_u_otp.c         |  2 +-
 hw/ppc/pnv_pnor.c              |  2 +-
 hw/scsi/scsi-disk.c            | 10 +++++-----
 hw/scsi/scsi-generic.c         |  4 ++--
 hw/sd/sd.c                     |  6 +++---
 hw/usb/dev-storage.c           |  4 ++--
 20 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index XXXXXXX..XXXXXXX 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -XXX,XX +XXX,XX @@ BlockErrorAction blk_get_error_action(BlockBackend *blk, bool is_read,
                                       int error);
 void blk_error_action(BlockBackend *blk, BlockErrorAction action,
                       bool is_read, int error);
-bool blk_is_read_only(BlockBackend *blk);
+bool blk_supports_write_perm(BlockBackend *blk);
+bool blk_is_writable(BlockBackend *blk);
 bool blk_is_sg(BlockBackend *blk);
 bool blk_enable_write_cache(BlockBackend *blk);
 void blk_set_enable_write_cache(BlockBackend *blk, bool wce);
diff --git a/block/block-backend.c b/block/block-backend.c
index XXXXXXX..XXXXXXX 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -XXX,XX +XXX,XX @@ void blk_error_action(BlockBackend *blk, BlockErrorAction action,
     }
 }
 
-bool blk_is_read_only(BlockBackend *blk)
+/*
+ * Returns true if the BlockBackend can support taking write permissions
+ * (because its root node is not read-only).
+ */
+bool blk_supports_write_perm(BlockBackend *blk)
 {
     BlockDriverState *bs = blk_bs(blk);
 
     if (bs) {
-        return bdrv_is_read_only(bs);
+        return !bdrv_is_read_only(bs);
     } else {
-        return blk->root_state.read_only;
+        return !blk->root_state.read_only;
     }
 }
 
+/*
+ * Returns true if the BlockBackend can be written to in its current
+ * configuration (i.e. if write permission have been requested)
+ */
+bool blk_is_writable(BlockBackend *blk)
+{
+    return blk->perm & BLK_PERM_WRITE;
+}
+
 bool blk_is_sg(BlockBackend *blk)
 {
     BlockDriverState *bs = blk_bs(blk);
diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/dataplane/xen-block.c
+++ b/hw/block/dataplane/xen-block.c
@@ -XXX,XX +XXX,XX @@ static int xen_block_parse_request(XenBlockRequest *request)
     };
 
     if (request->req.operation != BLKIF_OP_READ &&
-        blk_is_read_only(dataplane->blk)) {
+        !blk_is_writable(dataplane->blk)) {
         error_report("error: write req for ro device");
         goto err;
     }
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -XXX,XX +XXX,XX @@ static void fd_revalidate(FDrive *drv)
 
     FLOPPY_DPRINTF("revalidate\n");
     if (drv->blk != NULL) {
-        drv->ro = blk_is_read_only(drv->blk);
+        drv->ro = !blk_is_writable(drv->blk);
         if (!blk_is_inserted(drv->blk)) {
             FLOPPY_DPRINTF("No disk in drive\n");
             drv->disk = FLOPPY_DRIVE_TYPE_NONE;
@@ -XXX,XX +XXX,XX @@ static void fd_change_cb(void *opaque, bool load, Error **errp)
         blk_set_perm(drive->blk, 0, BLK_PERM_ALL, &error_abort);
     } else {
         if (!blkconf_apply_backend_options(drive->conf,
-                                           blk_is_read_only(drive->blk), false,
-                                           errp)) {
+                                           !blk_supports_write_perm(drive->blk),
+                                           false, errp)) {
             return;
         }
     }
@@ -XXX,XX +XXX,XX @@ static void floppy_drive_realize(DeviceState *qdev, Error **errp)
          * read-only node later */
         read_only = true;
     } else {
-        read_only = !blk_bs(dev->conf.blk) || blk_is_read_only(dev->conf.blk);
+        read_only = !blk_bs(dev->conf.blk) ||
+                    !blk_supports_write_perm(dev->conf.blk);
     }
 
     if (!blkconf_blocksizes(&dev->conf, errp)) {
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -XXX,XX +XXX,XX @@ static void flash_sync_page(Flash *s, int page)
 {
     QEMUIOVector *iov;
 
-    if (!s->blk || blk_is_read_only(s->blk)) {
+    if (!s->blk || !blk_is_writable(s->blk)) {
         return;
     }
 
@@ -XXX,XX +XXX,XX @@ static inline void flash_sync_area(Flash *s, int64_t off, int64_t len)
 {
     QEMUIOVector *iov;
 
-    if (!s->blk || blk_is_read_only(s->blk)) {
+    if (!s->blk || !blk_is_writable(s->blk)) {
         return;
     }
 
@@ -XXX,XX +XXX,XX @@ static void m25p80_realize(SSIPeripheral *ss, Error **errp)
 
     if (s->blk) {
         uint64_t perm = BLK_PERM_CONSISTENT_READ |
-                        (blk_is_read_only(s->blk) ? 0 : BLK_PERM_WRITE);
+                        (blk_supports_write_perm(s->blk) ? BLK_PERM_WRITE : 0);
         ret = blk_set_perm(s->blk, perm, BLK_PERM_ALL, errp);
         if (ret < 0) {
             return;
diff --git a/hw/block/nand.c b/hw/block/nand.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -XXX,XX +XXX,XX @@ static void nand_realize(DeviceState *dev, Error **errp)
     pagesize = 1 << s->oob_shift;
     s->mem_oob = 1;
     if (s->blk) {
-        if (blk_is_read_only(s->blk)) {
+        if (!blk_supports_write_perm(s->blk)) {
             error_setg(errp, "Can't use a read-only drive");
             return;
         }
diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/nvme-ns.c
+++ b/hw/block/nvme-ns.c
@@ -XXX,XX +XXX,XX @@ static void nvme_ns_init(NvmeNamespace *ns)
 
 static int nvme_ns_init_blk(NvmeCtrl *n, NvmeNamespace *ns, Error **errp)
 {
+    bool read_only;
+
     if (!blkconf_blocksizes(&ns->blkconf, errp)) {
         return -1;
     }
 
-    if (!blkconf_apply_backend_options(&ns->blkconf,
-                                       blk_is_read_only(ns->blkconf.blk),
-                                       false, errp)) {
+    read_only = !blk_supports_write_perm(ns->blkconf.blk);
+    if (!blkconf_apply_backend_options(&ns->blkconf, read_only, false, errp)) {
         return -1;
     }
 
diff --git a/hw/block/onenand.c b/hw/block/onenand.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/onenand.c
+++ b/hw/block/onenand.c
@@ -XXX,XX +XXX,XX @@ static void onenand_realize(DeviceState *dev, Error **errp)
         s->image = memset(g_malloc(size + (size >> 5)),
                           0xff, size + (size >> 5));
     } else {
-        if (blk_is_read_only(s->blk)) {
+        if (!blk_supports_write_perm(s->blk)) {
             error_setg(errp, "Can't use a read-only drive");
             return;
         }
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -XXX,XX +XXX,XX @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp)
 
     if (pfl->blk) {
         uint64_t perm;
-        pfl->ro = blk_is_read_only(pfl->blk);
+        pfl->ro = !blk_supports_write_perm(pfl->blk);
         perm = BLK_PERM_CONSISTENT_READ | (pfl->ro ? 0 : BLK_PERM_WRITE);
         ret = blk_set_perm(pfl->blk, perm, BLK_PERM_ALL, errp);
         if (ret < 0) {
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -XXX,XX +XXX,XX @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp)
 
     if (pfl->blk) {
         uint64_t perm;
-        pfl->ro = blk_is_read_only(pfl->blk);
+        pfl->ro = !blk_supports_write_perm(pfl->blk);
         perm = BLK_PERM_CONSISTENT_READ | (pfl->ro ? 0 : BLK_PERM_WRITE);
         ret = blk_set_perm(pfl->blk, perm, BLK_PERM_ALL, errp);
         if (ret < 0) {
diff --git a/hw/block/swim.c b/hw/block/swim.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/swim.c
+++ b/hw/block/swim.c
@@ -XXX,XX +XXX,XX @@ static void swim_change_cb(void *opaque, bool load, Error **errp)
         blk_set_perm(drive->blk, 0, BLK_PERM_ALL, &error_abort);
     } else {
         if (!blkconf_apply_backend_options(drive->conf,
-                                           blk_is_read_only(drive->blk), false,
-                                           errp)) {
+                                           !blk_supports_write_perm(drive->blk),
+                                           false, errp)) {
             return;
         }
     }
@@ -XXX,XX +XXX,XX @@ static void swim_drive_realize(DeviceState *qdev, Error **errp)
     dev->conf.werror = BLOCKDEV_ON_ERROR_AUTO;
 
     if (!blkconf_apply_backend_options(&dev->conf,
-                                       blk_is_read_only(dev->conf.blk),
+                                       !blk_supports_write_perm(dev->conf.blk),
                                        false, errp)) {
         return;
     }
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -XXX,XX +XXX,XX @@ static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features,
          virtio_has_feature(features, VIRTIO_BLK_F_CONFIG_WCE))) {
         virtio_add_feature(&features, VIRTIO_BLK_F_WCE);
     }
-    if (blk_is_read_only(s->blk)) {
+    if (!blk_is_writable(s->blk)) {
         virtio_add_feature(&features, VIRTIO_BLK_F_RO);
     }
     if (s->conf.num_queues > 1) {
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
     }
 
     if (!blkconf_apply_backend_options(&conf->conf,
-                                       blk_is_read_only(conf->conf.blk), true,
-                                       errp)) {
+                                       !blk_supports_write_perm(conf->conf.blk),
+                                       true, errp)) {
         return;
     }
     s->original_wce = blk_enable_write_cache(conf->conf.blk);
diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -XXX,XX +XXX,XX @@ static void xen_disk_realize(XenBlockDevice *blockdev, Error **errp)
         return;
     }
 
-    blockdev->info = blk_is_read_only(conf->blk) ? VDISK_READONLY : 0;
+    blockdev->info = blk_supports_write_perm(conf->blk) ? 0 : VDISK_READONLY;
 }
 
 static void xen_disk_class_init(ObjectClass *class, void *data)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -XXX,XX +XXX,XX @@ int ide_init_drive(IDEState *s, BlockBackend *blk, IDEDriveKind kind,
             error_setg(errp, "Device needs media, but drive is empty");
             return -1;
         }
-        if (blk_is_read_only(blk)) {
+        if (!blk_is_writable(blk)) {
             error_setg(errp, "Can't use a read-only drive");
             return -1;
         }
diff --git a/hw/misc/sifive_u_otp.c b/hw/misc/sifive_u_otp.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/misc/sifive_u_otp.c
+++ b/hw/misc/sifive_u_otp.c
@@ -XXX,XX +XXX,XX @@ static void sifive_u_otp_realize(DeviceState *dev, Error **errp)
 
         if (s->blk) {
             perm = BLK_PERM_CONSISTENT_READ |
-                   (blk_is_read_only(s->blk) ? 0 : BLK_PERM_WRITE);
+                   (blk_supports_write_perm(s->blk) ? BLK_PERM_WRITE : 0);
             ret = blk_set_perm(s->blk, perm, BLK_PERM_ALL, errp);
             if (ret < 0) {
                 return;
diff --git a/hw/ppc/pnv_pnor.c b/hw/ppc/pnv_pnor.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/ppc/pnv_pnor.c
+++ b/hw/ppc/pnv_pnor.c
@@ -XXX,XX +XXX,XX @@ static void pnv_pnor_realize(DeviceState *dev, Error **errp)
 
     if (s->blk) {
         uint64_t perm = BLK_PERM_CONSISTENT_READ |
-                        (blk_is_read_only(s->blk) ? 0 : BLK_PERM_WRITE);
+                        (blk_supports_write_perm(s->blk) ? BLK_PERM_WRITE : 0);
         ret = blk_set_perm(s->blk, perm, BLK_PERM_ALL, errp);
         if (ret < 0) {
             return;
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -XXX,XX +XXX,XX @@ static int scsi_disk_emulate_mode_sense(SCSIDiskReq *r, uint8_t *outbuf)
 
     if (s->qdev.type == TYPE_DISK) {
         dev_specific_param = s->features & (1 << SCSI_DISK_F_DPOFUA) ? 0x10 : 0;
-        if (blk_is_read_only(s->qdev.conf.blk)) {
+        if (!blk_is_writable(s->qdev.conf.blk)) {
             dev_specific_param |= 0x80; /* Readonly.  */
         }
     } else {
@@ -XXX,XX +XXX,XX @@ static void scsi_disk_emulate_unmap(SCSIDiskReq *r, uint8_t *inbuf)
         goto invalid_param_len;
     }
 
-    if (blk_is_read_only(s->qdev.conf.blk)) {
+    if (!blk_is_writable(s->qdev.conf.blk)) {
         block_acct_invalid(blk_get_stats(s->qdev.conf.blk), BLOCK_ACCT_UNMAP);
         scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED));
         return;
@@ -XXX,XX +XXX,XX @@ static void scsi_disk_emulate_write_same(SCSIDiskReq *r, uint8_t *inbuf)
         return;
     }
 
-    if (blk_is_read_only(s->qdev.conf.blk)) {
+    if (!blk_is_writable(s->qdev.conf.blk)) {
         scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED));
         return;
     }
@@ -XXX,XX +XXX,XX @@ static int32_t scsi_disk_dma_command(SCSIRequest *req, uint8_t *buf)
     case WRITE_VERIFY_10:
     case WRITE_VERIFY_12:
     case WRITE_VERIFY_16:
-        if (blk_is_read_only(s->qdev.conf.blk)) {
+        if (!blk_is_writable(s->qdev.conf.blk)) {
             scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED));
             return 0;
         }
@@ -XXX,XX +XXX,XX @@ static void scsi_realize(SCSIDevice *dev, Error **errp)
         }
     }
 
-    read_only = blk_is_read_only(s->qdev.conf.blk);
+    read_only = !blk_supports_write_perm(s->qdev.conf.blk);
     if (dev->type == TYPE_ROM) {
         read_only = true;
     }
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -XXX,XX +XXX,XX @@ static void scsi_read_complete(void * opaque, int ret)
      * readonly.
      */
     if ((s->type == TYPE_DISK || s->type == TYPE_TAPE || s->type == TYPE_ZBC) &&
-        blk_is_read_only(s->conf.blk) &&
+        !blk_is_writable(s->conf.blk) &&
         (r->req.cmd.buf[0] == MODE_SENSE ||
          r->req.cmd.buf[0] == MODE_SENSE_10) &&
         (r->req.cmd.buf[1] & 0x8) == 0) {
@@ -XXX,XX +XXX,XX @@ static void scsi_generic_realize(SCSIDevice *s, Error **errp)
         return;
     }
     if (!blkconf_apply_backend_options(&s->conf,
-                                       blk_is_read_only(s->conf.blk),
+                                       !blk_supports_write_perm(s->conf.blk),
                                        true, errp)) {
         return;
     }
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -XXX,XX +XXX,XX @@ static void sd_reset(DeviceState *dev)
     sd_set_sdstatus(sd);
 
     g_free(sd->wp_groups);
-    sd->wp_switch = sd->blk ? blk_is_read_only(sd->blk) : false;
+    sd->wp_switch = sd->blk ? !blk_is_writable(sd->blk) : false;
     sd->wpgrps_size = sect;
     sd->wp_groups = bitmap_new(sd->wpgrps_size);
     memset(sd->function_group, 0, sizeof(sd->function_group));
@@ -XXX,XX +XXX,XX @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert)
 {
     sd->readonly_cb = readonly;
     sd->inserted_cb = insert;
-    qemu_set_irq(readonly, sd->blk ? blk_is_read_only(sd->blk) : 0);
+    qemu_set_irq(readonly, sd->blk ? !blk_is_writable(sd->blk) : 0);
     qemu_set_irq(insert, sd->blk ? blk_is_inserted(sd->blk) : 0);
 }
 
@@ -XXX,XX +XXX,XX @@ static void sd_realize(DeviceState *dev, Error **errp)
     if (sd->blk) {
         int64_t blk_size;
 
-        if (blk_is_read_only(sd->blk)) {
+        if (!blk_supports_write_perm(sd->blk)) {
             error_setg(errp, "Cannot use read-only drive as SD card");
             return;
         }
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -XXX,XX +XXX,XX @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp)
         return;
     }
 
-    if (!blkconf_apply_backend_options(&s->conf, blk_is_read_only(blk), true,
-                                       errp)) {
+    if (!blkconf_apply_backend_options(&s->conf, !blk_supports_write_perm(blk),
+                                       true, errp)) {
         return;
     }
 
-- 
2.29.2

This tests that trying to write to a (read-only) scsi-cd device backed
by a read-write image file doesn't crash and results in the correct
error.

This is a regression test for https://bugs.launchpad.net/bugs/1906693.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210118123448.307825-3-kwolf@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qtest/virtio-scsi-test.c | 39 ++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/tests/qtest/virtio-scsi-test.c b/tests/qtest/virtio-scsi-test.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/virtio-scsi-test.c
+++ b/tests/qtest/virtio-scsi-test.c
@@ -XXX,XX +XXX,XX @@ static void test_unaligned_write_same(void *obj, void *data,
     qvirtio_scsi_pci_free(vs);
 }
 
+static void test_write_to_cdrom(void *obj, void *data,
+                                QGuestAllocator *t_alloc)
+{
+    QVirtioSCSI *scsi = obj;
+    QVirtioSCSIQueues *vs;
+    uint8_t buf[2048] = { 0 };
+    const uint8_t write_cdb[VIRTIO_SCSI_CDB_SIZE] = {
+        /* WRITE(10) to LBA 0, transfer length 1 */
+        0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
+    };
+    struct virtio_scsi_cmd_resp resp;
+
+    alloc = t_alloc;
+    vs = qvirtio_scsi_init(scsi->vdev);
+
+    virtio_scsi_do_command(vs, write_cdb, NULL, 0, buf, 2048, &resp);
+    g_assert_cmphex(resp.response, ==, 0);
+    g_assert_cmphex(resp.status, ==, CHECK_CONDITION);
+    g_assert_cmphex(resp.sense[0], ==, 0x70);
+    g_assert_cmphex(resp.sense[2], ==, DATA_PROTECT);
+    g_assert_cmphex(resp.sense[12], ==, 0x27); /* WRITE PROTECTED */
+    g_assert_cmphex(resp.sense[13], ==, 0x00); /* WRITE PROTECTED */
+
+    qvirtio_scsi_pci_free(vs);
+}
+
 static void test_iothread_attach_node(void *obj, void *data,
                                       QGuestAllocator *t_alloc)
 {
@@ -XXX,XX +XXX,XX @@ static void *virtio_scsi_setup(GString *cmd_line, void *arg)
     return arg;
 }
 
+static void *virtio_scsi_setup_cd(GString *cmd_line, void *arg)
+{
+    g_string_append(cmd_line,
+                    " -drive file=null-co://,"
+                    "file.read-zeroes=on,"
+                    "if=none,id=dr1,format=raw "
+                    "-device scsi-cd,drive=dr1,lun=0,scsi-id=1");
+    return arg;
+}
+
 static void *virtio_scsi_setup_iothread(GString *cmd_line, void *arg)
 {
     g_string_append(cmd_line,
@@ -XXX,XX +XXX,XX @@ static void register_virtio_scsi_test(void)
     qos_add_test("unaligned-write-same", "virtio-scsi",
                  test_unaligned_write_same, &opts);
 
+    opts.before = virtio_scsi_setup_cd;
+    qos_add_test("write-to-cdrom", "virtio-scsi", test_write_to_cdrom, &opts);
+
     opts.before = virtio_scsi_setup_iothread;
     opts.edge = (QOSGraphEdgeOptions) {
         .extra_device_opts = "iothread=thread0",
-- 
2.29.2

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

check script will be stricter soon about whitespaces, so fix 146.out
now.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210125185056.129513-2-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/146.out | 780 ++++++++++++++++++-------------------
 1 file changed, 390 insertions(+), 390 deletions(-)

diff --git a/tests/qemu-iotests/146.out b/tests/qemu-iotests/146.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/146.out
+++ b/tests/qemu-iotests/146.out
@@ -XXX,XX +XXX,XX @@ QA output created by 146
 
 === Testing VPC Autodetect ===
 
-[{ "start": 0, "length": 136363130880, "depth": 0, "zero": true, "data": false }]
+[{ "start": 0, "length": 136363130880, "depth": 0, "zero": true, "data": false}]
 
 === Testing VPC with current_size force ===
 
-[{ "start": 0, "length": 136365211648, "depth": 0, "zero": true, "data": false }]
+[{ "start": 0, "length": 136365211648, "depth": 0, "zero": true, "data": false}]
 
 === Testing VPC with chs force ===
 
-[{ "start": 0, "length": 136363130880, "depth": 0, "zero": true, "data": false }]
+[{ "start": 0, "length": 136363130880, "depth": 0, "zero": true, "data": false}]
 
 === Testing Hyper-V Autodetect ===
 
-[{ "start": 0, "length": 136365211648, "depth": 0, "zero": true, "data": false }]
+[{ "start": 0, "length": 136365211648, "depth": 0, "zero": true, "data": false}]
 
 === Testing Hyper-V with current_size force ===
 
-[{ "start": 0, "length": 136365211648, "depth": 0, "zero": true, "data": false }]
+[{ "start": 0, "length": 136365211648, "depth": 0, "zero": true, "data": false}]
 
 === Testing Hyper-V with chs force ===
 
-[{ "start": 0, "length": 136363130880, "depth": 0, "zero": true, "data": false }]
+[{ "start": 0, "length": 136363130880, "depth": 0, "zero": true, "data": false}]
 
 === Testing d2v Autodetect ===
 
-[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 4194304, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 6291456, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 8388608, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 10485760, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 12582912, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 14680064, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 16777216, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 18874368, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 20971520, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 23068672, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 25165824, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 27262976, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 29360128, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 31457280, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 33554432, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 35651584, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 37748736, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 39845888, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 41943040, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 44040192, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 46137344, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 48234496, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 50331648, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 52428800, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 54525952, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 56623104, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 58720256, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 60817408, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 62914560, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 65011712, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 67108864, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 69206016, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 71303168, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 73400320, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 75497472, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 77594624, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 79691776, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 81788928, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 83886080, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 85983232, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 88080384, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 90177536, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 92274688, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 94371840, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 96468992, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 98566144, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 100663296, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 102760448, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 104857600, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 106954752, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 109051904, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 111149056, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 113246208, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 115343360, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 117440512, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 119537664, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 121634816, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 123731968, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 125829120, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 127926272, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 130023424, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 132120576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 134217728, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 136314880, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 138412032, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 140509184, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 142606336, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 144703488, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 146800640, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 148897792, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 150994944, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 153092096, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 155189248, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 157286400, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 159383552, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 161480704, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 163577856, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 165675008, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 167772160, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 169869312, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 171966464, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 174063616, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 176160768, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 178257920, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 180355072, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 182452224, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 184549376, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 186646528, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 188743680, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 190840832, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 192937984, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 195035136, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 197132288, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 199229440, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 201326592, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 203423744, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 205520896, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 207618048, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 209715200, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 211812352, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 213909504, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 216006656, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 218103808, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 220200960, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 222298112, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 224395264, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 226492416, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 228589568, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 230686720, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 232783872, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 234881024, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 236978176, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 239075328, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 241172480, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 243269632, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 245366784, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 247463936, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 249561088, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 251658240, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 253755392, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 255852544, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 257949696, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 260046848, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 262144000, "length": 1310720, "depth": 0, "zero": false, "data": true, "offset": OFFSET }]
+[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 4194304, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 6291456, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 8388608, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 10485760, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 12582912, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 14680064, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 16777216, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 18874368, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 20971520, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 23068672, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 25165824, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 27262976, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 29360128, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 31457280, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 33554432, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 35651584, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 37748736, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 39845888, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 41943040, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 44040192, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 46137344, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 48234496, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 50331648, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 52428800, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 54525952, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 56623104, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 58720256, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 60817408, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 62914560, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 65011712, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 67108864, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 69206016, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 71303168, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 73400320, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 75497472, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 77594624, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 79691776, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 81788928, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 83886080, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 85983232, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 88080384, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 90177536, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 92274688, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 94371840, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 96468992, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 98566144, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 100663296, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 102760448, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 104857600, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 106954752, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 109051904, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 111149056, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 113246208, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 115343360, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 117440512, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 119537664, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 121634816, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 123731968, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 125829120, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 127926272, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 130023424, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 132120576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 134217728, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 136314880, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 138412032, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 140509184, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 142606336, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 144703488, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 146800640, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 148897792, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 150994944, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 153092096, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 155189248, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 157286400, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 159383552, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 161480704, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 163577856, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 165675008, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 167772160, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 169869312, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 171966464, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 174063616, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 176160768, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 178257920, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 180355072, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 182452224, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 184549376, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 186646528, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 188743680, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 190840832, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 192937984, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 195035136, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 197132288, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 199229440, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 201326592, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 203423744, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 205520896, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 207618048, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 209715200, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 211812352, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 213909504, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 216006656, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 218103808, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 220200960, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 222298112, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 224395264, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 226492416, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 228589568, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 230686720, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 232783872, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 234881024, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 236978176, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 239075328, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 241172480, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 243269632, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 245366784, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 247463936, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 249561088, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 251658240, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 253755392, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 255852544, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 257949696, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 260046848, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 262144000, "length": 1310720, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
 
 === Testing d2v with current_size force ===
 
-[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 4194304, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 6291456, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 8388608, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 10485760, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 12582912, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 14680064, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 16777216, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 18874368, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 20971520, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 23068672, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 25165824, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 27262976, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 29360128, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 31457280, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 33554432, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 35651584, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 37748736, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 39845888, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 41943040, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 44040192, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 46137344, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 48234496, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 50331648, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 52428800, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 54525952, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 56623104, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 58720256, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 60817408, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 62914560, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 65011712, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 67108864, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 69206016, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 71303168, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 73400320, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 75497472, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 77594624, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 79691776, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 81788928, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 83886080, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 85983232, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 88080384, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 90177536, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 92274688, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 94371840, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 96468992, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 98566144, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 100663296, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 102760448, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 104857600, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 106954752, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 109051904, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 111149056, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 113246208, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 115343360, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 117440512, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 119537664, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 121634816, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 123731968, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 125829120, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 127926272, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 130023424, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 132120576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 134217728, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 136314880, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 138412032, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 140509184, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 142606336, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 144703488, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 146800640, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 148897792, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 150994944, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 153092096, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 155189248, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 157286400, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 159383552, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 161480704, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 163577856, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 165675008, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 167772160, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 169869312, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 171966464, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 174063616, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 176160768, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 178257920, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 180355072, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 182452224, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 184549376, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 186646528, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 188743680, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 190840832, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 192937984, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 195035136, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 197132288, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 199229440, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 201326592, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 203423744, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 205520896, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 207618048, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 209715200, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 211812352, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 213909504, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 216006656, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 218103808, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 220200960, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 222298112, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 224395264, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 226492416, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 228589568, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 230686720, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 232783872, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 234881024, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 236978176, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 239075328, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 241172480, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 243269632, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 245366784, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 247463936, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 249561088, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 251658240, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 253755392, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 255852544, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 257949696, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 260046848, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 262144000, "length": 1310720, "depth": 0, "zero": false, "data": true, "offset": OFFSET }]
+[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 4194304, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 6291456, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 8388608, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 10485760, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 12582912, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 14680064, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 16777216, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 18874368, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 20971520, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 23068672, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 25165824, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 27262976, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 29360128, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 31457280, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 33554432, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 35651584, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 37748736, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 39845888, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 41943040, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 44040192, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 46137344, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 48234496, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 50331648, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 52428800, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 54525952, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 56623104, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 58720256, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 60817408, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 62914560, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 65011712, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 67108864, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 69206016, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 71303168, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 73400320, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 75497472, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 77594624, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 79691776, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 81788928, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 83886080, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 85983232, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 88080384, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 90177536, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 92274688, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 94371840, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 96468992, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 98566144, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 100663296, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 102760448, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 104857600, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 106954752, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 109051904, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 111149056, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 113246208, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 115343360, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 117440512, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 119537664, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 121634816, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 123731968, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 125829120, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 127926272, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 130023424, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 132120576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 134217728, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 136314880, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 138412032, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 140509184, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 142606336, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 144703488, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 146800640, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 148897792, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 150994944, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 153092096, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 155189248, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 157286400, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 159383552, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 161480704, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 163577856, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 165675008, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 167772160, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 169869312, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 171966464, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 174063616, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 176160768, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 178257920, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 180355072, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 182452224, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 184549376, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 186646528, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 188743680, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 190840832, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 192937984, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 195035136, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 197132288, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 199229440, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 201326592, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 203423744, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 205520896, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 207618048, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 209715200, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 211812352, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 213909504, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 216006656, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 218103808, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 220200960, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 222298112, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 224395264, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 226492416, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 228589568, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 230686720, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 232783872, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 234881024, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 236978176, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 239075328, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 241172480, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 243269632, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 245366784, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 247463936, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 249561088, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 251658240, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 253755392, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 255852544, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 257949696, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 260046848, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 262144000, "length": 1310720, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
 
 === Testing d2v with chs force ===
 
-[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 4194304, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 6291456, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 8388608, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 10485760, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 12582912, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 14680064, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 16777216, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 18874368, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 20971520, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 23068672, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 25165824, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 27262976, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 29360128, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 31457280, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 33554432, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 35651584, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 37748736, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 39845888, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 41943040, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 44040192, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 46137344, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 48234496, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 50331648, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 52428800, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 54525952, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 56623104, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 58720256, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 60817408, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 62914560, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 65011712, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 67108864, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 69206016, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 71303168, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 73400320, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 75497472, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 77594624, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 79691776, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 81788928, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 83886080, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 85983232, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 88080384, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 90177536, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 92274688, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 94371840, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 96468992, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 98566144, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 100663296, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 102760448, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 104857600, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 106954752, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 109051904, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 111149056, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 113246208, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 115343360, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 117440512, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 119537664, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 121634816, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 123731968, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 125829120, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 127926272, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 130023424, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 132120576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 134217728, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 136314880, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 138412032, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 140509184, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 142606336, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 144703488, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 146800640, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 148897792, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 150994944, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 153092096, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 155189248, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 157286400, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 159383552, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 161480704, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 163577856, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 165675008, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 167772160, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 169869312, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 171966464, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 174063616, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 176160768, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 178257920, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 180355072, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 182452224, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 184549376, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 186646528, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 188743680, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 190840832, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 192937984, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 195035136, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 197132288, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 199229440, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 201326592, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 203423744, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 205520896, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 207618048, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 209715200, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 211812352, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 213909504, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 216006656, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 218103808, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 220200960, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 222298112, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 224395264, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 226492416, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 228589568, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 230686720, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 232783872, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 234881024, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 236978176, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 239075328, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 241172480, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 243269632, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 245366784, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 247463936, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 249561088, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 251658240, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 253755392, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 255852544, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 257949696, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 260046848, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET },
-{ "start": 262144000, "length": 1310720, "depth": 0, "zero": false, "data": true, "offset": OFFSET }]
+[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 4194304, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 6291456, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 8388608, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 10485760, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 12582912, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 14680064, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 16777216, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 18874368, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 20971520, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 23068672, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 25165824, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 27262976, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 29360128, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 31457280, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 33554432, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 35651584, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 37748736, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 39845888, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 41943040, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 44040192, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 46137344, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 48234496, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 50331648, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 52428800, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 54525952, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 56623104, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 58720256, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 60817408, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 62914560, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 65011712, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 67108864, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 69206016, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 71303168, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 73400320, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 75497472, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 77594624, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 79691776, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 81788928, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 83886080, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 85983232, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 88080384, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 90177536, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 92274688, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 94371840, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 96468992, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 98566144, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 100663296, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 102760448, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 104857600, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 106954752, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 109051904, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 111149056, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 113246208, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 115343360, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 117440512, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 119537664, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 121634816, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 123731968, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 125829120, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 127926272, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 130023424, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 132120576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 134217728, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 136314880, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 138412032, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 140509184, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 142606336, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 144703488, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 146800640, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 148897792, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 150994944, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 153092096, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 155189248, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 157286400, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 159383552, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 161480704, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 163577856, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 165675008, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 167772160, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 169869312, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 171966464, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 174063616, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 176160768, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 178257920, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 180355072, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 182452224, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 184549376, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 186646528, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 188743680, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 190840832, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 192937984, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 195035136, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 197132288, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 199229440, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 201326592, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 203423744, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 205520896, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 207618048, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 209715200, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 211812352, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 213909504, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 216006656, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 218103808, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 220200960, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 222298112, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 224395264, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 226492416, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 228589568, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 230686720, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 232783872, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 234881024, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 236978176, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 239075328, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 241172480, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 243269632, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 245366784, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 247463936, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 249561088, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 251658240, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 253755392, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 255852544, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 257949696, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 260046848, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 262144000, "length": 1310720, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
 
 === Testing Image create, default ===
 
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/IMGFMT-create-test.IMGFMT', fmt=IMGFMT size=4294967296
 
 === Read created image, default opts ====
 
-[{ "start": 0, "length": 4295467008, "depth": 0, "zero": true, "data": false }]
+[{ "start": 0, "length": 4295467008, "depth": 0, "zero": true, "data": false}]
 
 === Read created image, force_size_calc=chs ====
 
-[{ "start": 0, "length": 4295467008, "depth": 0, "zero": true, "data": false }]
+[{ "start": 0, "length": 4295467008, "depth": 0, "zero": true, "data": false}]
 
 === Read created image, force_size_calc=current_size ====
 
-[{ "start": 0, "length": 4295467008, "depth": 0, "zero": true, "data": false }]
+[{ "start": 0, "length": 4295467008, "depth": 0, "zero": true, "data": false}]
 
 === Testing Image create, force_size ===
 
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/IMGFMT-create-test.IMGFMT', fmt=IMGFMT size=4294967296
 
 === Read created image, default opts ====
 
-[{ "start": 0, "length": 4294967296, "depth": 0, "zero": true, "data": false }]
+[{ "start": 0, "length": 4294967296, "depth": 0, "zero": true, "data": false}]
 
 === Read created image, force_size_calc=chs ====
 
-[{ "start": 0, "length": 4294967296, "depth": 0, "zero": true, "data": false }]
+[{ "start": 0, "length": 4294967296, "depth": 0, "zero": true, "data": false}]
 
 === Read created image, force_size_calc=current_size ====
 
-[{ "start": 0, "length": 4294967296, "depth": 0, "zero": true, "data": false }]
+[{ "start": 0, "length": 4294967296, "depth": 0, "zero": true, "data": false}]
 *** done
-- 
2.29.2

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

Add python script with new logic of searching for tests:

Current ./check behavior:
 - tests are named [0-9][0-9][0-9]
 - tests must be registered in group file (even if test doesn't belong
   to any group, like 142)

Behavior of findtests.py:
 - group file is dropped
 - tests are all files in tests/ subdirectory (except for .out files),
   so it's not needed more to "register the test", just create it with
   appropriate name in tests/ subdirectory. Old names like
   [0-9][0-9][0-9] (in root iotests directory) are supported too, but
   not recommended for new tests
 - groups are parsed from '# group: ' line inside test files
 - optional file group.local may be used to define some additional
   groups for downstreams
 - 'disabled' group is used to temporary disable tests. So instead of
   commenting tests in old 'group' file you now can add them to
   disabled group with help of 'group.local' file
 - selecting test ranges like 5-15 are not supported more
   (to support restarting failed ./check command from the middle of the
    process, new argument is added: --start-from)

Benefits:
 - no rebase conflicts in group file on patch porting from branch to
   branch
 - no conflicts in upstream, when different series want to occupy same
   test number
 - meaningful names for test files
   For example, with digital number, when some person wants to add some
   test about block-stream, he most probably will just create a new
   test. But if there would be test-block-stream test already, he will
   at first look at it and may be just add a test-case into it.
   And anyway meaningful names are better.

This commit doesn't update check behavior (which will be done in
further commit), still, the documentation changed like new behavior is
already here.  Let's live with this small inconsistency for the
following few commits, until final change.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210125185056.129513-3-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 docs/devel/testing.rst          |  50 +++++++++-
 tests/qemu-iotests/findtests.py | 159 ++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+), 1 deletion(-)
 create mode 100644 tests/qemu-iotests/findtests.py

diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -XXX,XX +XXX,XX @@ check-block
 -----------
 
 ``make check-block`` runs a subset of the block layer iotests (the tests that
-are in the "auto" group in ``tests/qemu-iotests/group``).
+are in the "auto" group).
 See the "QEMU iotests" section below for more information.
 
 GCC gcov support
@@ -XXX,XX +XXX,XX @@ another application on the host may have locked the file, possibly leading to a
 test failure.  If using such devices are explicitly desired, consider adding
 ``locking=off`` option to disable image locking.
 
+Test case groups
+----------------
+
+"Tests may belong to one or more test groups, which are defined in the form
+of a comment in the test source file. By convention, test groups are listed
+in the second line of the test file, after the "#!/..." line, like this:
+
+.. code::
+
+  #!/usr/bin/env python3
+  # group: auto quick
+  #
+  ...
+
+Another way of defining groups is creating the tests/qemu-iotests/group.local
+file. This should be used only for downstream (this file should never appear
+in upstream). This file may be used for defining some downstream test groups
+or for temporarily disabling tests, like this:
+
+.. code::
+
+  # groups for some company downstream process
+  #
+  # ci - tests to run on build
+  # down - our downstream tests, not for upstream
+  #
+  # Format of each line is:
+  # TEST_NAME TEST_GROUP [TEST_GROUP ]...
+
+  013 ci
+  210 disabled
+  215 disabled
+  our-ugly-workaround-test down ci
+
+Note that the following group names have a special meaning:
+
+- quick: Tests in this group should finish within a few seconds.
+
+- auto: Tests in this group are used during "make check" and should be
+  runnable in any case. That means they should run with every QEMU binary
+  (also non-x86), with every QEMU configuration (i.e. must not fail if
+  an optional feature is not compiled in - but reporting a "skip" is ok),
+  work at least with the qcow2 file format, work with all kind of host
+  filesystems and users (e.g. "nobody" or "root") and must not take too
+  much memory and disk space (since CI pipelines tend to fail otherwise).
+
+- disabled: Tests in this group are disabled and ignored by check.
+
 .. _docker-ref:
 
 Docker based tests
diff --git a/tests/qemu-iotests/findtests.py b/tests/qemu-iotests/findtests.py
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/findtests.py
@@ -XXX,XX +XXX,XX @@
+# TestFinder class, define set of tests to run.
+#
+# Copyright (c) 2020-2021 Virtuozzo International GmbH
+#
+# 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/>.
+#
+
+import os
+import glob
+import re
+from collections import defaultdict
+from contextlib import contextmanager
+from typing import Optional, List, Iterator, Set
+
+
+@contextmanager
+def chdir(path: Optional[str] = None) -> Iterator[None]:
+    if path is None:
+        yield
+        return
+
+    saved_dir = os.getcwd()
+    os.chdir(path)
+    try:
+        yield
+    finally:
+        os.chdir(saved_dir)
+
+
+class TestFinder:
+    def __init__(self, test_dir: Optional[str] = None) -> None:
+        self.groups = defaultdict(set)
+
+        with chdir(test_dir):
+            self.all_tests = glob.glob('[0-9][0-9][0-9]')
+            self.all_tests += [f for f in glob.iglob('tests/*')
+                               if not f.endswith('.out') and
+                               os.path.isfile(f + '.out')]
+
+            for t in self.all_tests:
+                with open(t, encoding="utf-8") as f:
+                    for line in f:
+                        if line.startswith('# group: '):
+                            for g in line.split()[2:]:
+                                self.groups[g].add(t)
+                            break
+
+    def add_group_file(self, fname: str) -> None:
+        with open(fname, encoding="utf-8") as f:
+            for line in f:
+                line = line.strip()
+
+                if (not line) or line[0] == '#':
+                    continue
+
+                words = line.split()
+                test_file = self.parse_test_name(words[0])
+                groups = words[1:]
+
+                for g in groups:
+                    self.groups[g].add(test_file)
+
+    def parse_test_name(self, name: str) -> str:
+        if '/' in name:
+            raise ValueError('Paths are unsupported for test selection, '
+                             f'requiring "{name}" is wrong')
+
+        if re.fullmatch(r'\d+', name):
+            # Numbered tests are old naming convention. We should convert them
+            # to three-digit-length, like 1 --> 001.
+            name = f'{int(name):03}'
+        else:
+            # Named tests all should be in tests/ subdirectory
+            name = os.path.join('tests', name)
+
+        if name not in self.all_tests:
+            raise ValueError(f'Test "{name}" is not found')
+
+        return name
+
+    def find_tests(self, groups: Optional[List[str]] = None,
+                   exclude_groups: Optional[List[str]] = None,
+                   tests: Optional[List[str]] = None,
+                   start_from: Optional[str] = None) -> List[str]:
+        """Find tests
+
+        Algorithm:
+
+        1. a. if some @groups specified
+             a.1 Take all tests from @groups
+             a.2 Drop tests, which are in at least one of @exclude_groups or in
+                 'disabled' group (if 'disabled' is not listed in @groups)
+             a.3 Add tests from @tests (don't exclude anything from them)
+
+           b. else, if some @tests specified:
+             b.1 exclude_groups must be not specified, so just take @tests
+
+           c. else (only @exclude_groups list is non-empty):
+             c.1 Take all tests
+             c.2 Drop tests, which are in at least one of @exclude_groups or in
+                 'disabled' group
+
+        2. sort
+
+        3. If start_from specified, drop tests from first one to @start_from
+           (not inclusive)
+        """
+        if groups is None:
+            groups = []
+        if exclude_groups is None:
+            exclude_groups = []
+        if tests is None:
+            tests = []
+
+        res: Set[str] = set()
+        if groups:
+            # Some groups specified. exclude_groups supported, additionally
+            # selecting some individual tests supported as well.
+            res.update(*(self.groups[g] for g in groups))
+        elif tests:
+            # Some individual tests specified, but no groups. In this case
+            # we don't support exclude_groups.
+            if exclude_groups:
+                raise ValueError("Can't exclude from individually specified "
+                                 "tests.")
+        else:
+            # No tests no groups: start from all tests, exclude_groups
+            # supported.
+            res.update(self.all_tests)
+
+        if 'disabled' not in groups and 'disabled' not in exclude_groups:
+            # Don't want to modify function argument, so create new list.
+            exclude_groups = exclude_groups + ['disabled']
+
+        res = res.difference(*(self.groups[g] for g in exclude_groups))
+
+        # We want to add @tests. But for compatibility with old test names,
+        # we should convert any number < 100 to number padded by
+        # leading zeroes, like 1 -> 001 and 23 -> 023.
+        for t in tests:
+            res.add(self.parse_test_name(t))
+
+        sequence = sorted(res)
+
+        if start_from is not None:
+            del sequence[:sequence.index(self.parse_test_name(start_from))]
+
+        return sequence
-- 
2.29.2

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

Add TestEnv class, which will handle test environment in a new python
iotests running framework.

Don't add compat=1.1 for qcow2 IMGOPTS, as v3 is default anyway.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210125185056.129513-4-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/testenv.py | 281 ++++++++++++++++++++++++++++++++++
 1 file changed, 281 insertions(+)
 create mode 100644 tests/qemu-iotests/testenv.py

diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/testenv.py
@@ -XXX,XX +XXX,XX @@
+# TestEnv class to manage test environment variables.
+#
+# Copyright (c) 2020-2021 Virtuozzo International GmbH
+#
+# 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/>.
+#
+
+import os
+import sys
+import tempfile
+from pathlib import Path
+import shutil
+import collections
+import random
+import subprocess
+import glob
+from typing import Dict, Any, Optional, ContextManager
+
+
+def isxfile(path: str) -> bool:
+    return os.path.isfile(path) and os.access(path, os.X_OK)
+
+
+def get_default_machine(qemu_prog: str) -> str:
+    outp = subprocess.run([qemu_prog, '-machine', 'help'], check=True,
+                          universal_newlines=True,
+                          stdout=subprocess.PIPE).stdout
+
+    machines = outp.split('\n')
+    try:
+        default_machine = next(m for m in machines if m.endswith(' (default)'))
+    except StopIteration:
+        return ''
+    default_machine = default_machine.split(' ', 1)[0]
+
+    alias_suf = ' (alias of {})'.format(default_machine)
+    alias = next((m for m in machines if m.endswith(alias_suf)), None)
+    if alias is not None:
+        default_machine = alias.split(' ', 1)[0]
+
+    return default_machine
+
+
+class TestEnv(ContextManager['TestEnv']):
+    """
+    Manage system environment for running tests
+
+    The following variables are supported/provided. They are represented by
+    lower-cased TestEnv attributes.
+    """
+
+    # We store environment variables as instance attributes, and there are a
+    # lot of them. Silence pylint:
+    # pylint: disable=too-many-instance-attributes
+
+    env_variables = ['PYTHONPATH', 'TEST_DIR', 'SOCK_DIR', 'SAMPLE_IMG_DIR',
+                     'OUTPUT_DIR', 'PYTHON', 'QEMU_PROG', 'QEMU_IMG_PROG',
+                     'QEMU_IO_PROG', 'QEMU_NBD_PROG', 'QSD_PROG',
+                     'SOCKET_SCM_HELPER', 'QEMU_OPTIONS', 'QEMU_IMG_OPTIONS',
+                     'QEMU_IO_OPTIONS', 'QEMU_IO_OPTIONS_NO_FMT',
+                     'QEMU_NBD_OPTIONS', 'IMGOPTS', 'IMGFMT', 'IMGPROTO',
+                     'AIOMODE', 'CACHEMODE', 'VALGRIND_QEMU',
+                     'CACHEMODE_IS_DEFAULT', 'IMGFMT_GENERIC', 'IMGOPTSSYNTAX',
+                     'IMGKEYSECRET', 'QEMU_DEFAULT_MACHINE', 'MALLOC_PERTURB_']
+
+    def get_env(self) -> Dict[str, str]:
+        env = {}
+        for v in self.env_variables:
+            val = getattr(self, v.lower(), None)
+            if val is not None:
+                env[v] = val
+
+        return env
+
+    def init_directories(self) -> None:
+        """Init directory variables:
+             PYTHONPATH
+             TEST_DIR
+             SOCK_DIR
+             SAMPLE_IMG_DIR
+             OUTPUT_DIR
+        """
+        self.pythonpath = os.getenv('PYTHONPATH')
+        if self.pythonpath:
+            self.pythonpath = self.source_iotests + os.pathsep + \
+                self.pythonpath
+        else:
+            self.pythonpath = self.source_iotests
+
+        self.test_dir = os.getenv('TEST_DIR',
+                                  os.path.join(os.getcwd(), 'scratch'))
+        Path(self.test_dir).mkdir(parents=True, exist_ok=True)
+
+        try:
+            self.sock_dir = os.environ['SOCK_DIR']
+            self.tmp_sock_dir = False
+            Path(self.test_dir).mkdir(parents=True, exist_ok=True)
+        except KeyError:
+            self.sock_dir = tempfile.mkdtemp()
+            self.tmp_sock_dir = True
+
+        self.sample_img_dir = os.getenv('SAMPLE_IMG_DIR',
+                                        os.path.join(self.source_iotests,
+                                                     'sample_images'))
+
+        self.output_dir = os.getcwd()  # OUTPUT_DIR
+
+    def init_binaries(self) -> None:
+        """Init binary path variables:
+             PYTHON (for bash tests)
+             QEMU_PROG, QEMU_IMG_PROG, QEMU_IO_PROG, QEMU_NBD_PROG, QSD_PROG
+             SOCKET_SCM_HELPER
+        """
+        self.python = sys.executable
+
+        def root(*names: str) -> str:
+            return os.path.join(self.build_root, *names)
+
+        arch = os.uname().machine
+        if 'ppc64' in arch:
+            arch = 'ppc64'
+
+        self.qemu_prog = os.getenv('QEMU_PROG', root(f'qemu-system-{arch}'))
+        if not os.path.exists(self.qemu_prog):
+            pattern = root('qemu-system-*')
+            try:
+                progs = glob.iglob(pattern)
+                self.qemu_prog = next(p for p in progs if isxfile(p))
+            except StopIteration:
+                sys.exit("Not found any Qemu executable binary by pattern "
+                         f"'{pattern}'")
+
+        self.qemu_img_prog = os.getenv('QEMU_IMG_PROG', root('qemu-img'))
+        self.qemu_io_prog = os.getenv('QEMU_IO_PROG', root('qemu-io'))
+        self.qemu_nbd_prog = os.getenv('QEMU_NBD_PROG', root('qemu-nbd'))
+        self.qsd_prog = os.getenv('QSD_PROG', root('storage-daemon',
+                                                   'qemu-storage-daemon'))
+
+        for b in [self.qemu_img_prog, self.qemu_io_prog, self.qemu_nbd_prog,
+                  self.qemu_prog, self.qsd_prog]:
+            if not os.path.exists(b):
+                sys.exit('No such file: ' + b)
+            if not isxfile(b):
+                sys.exit('Not executable: ' + b)
+
+        helper_path = os.path.join(self.build_iotests, 'socket_scm_helper')
+        if isxfile(helper_path):
+            self.socket_scm_helper = helper_path  # SOCKET_SCM_HELPER
+
+    def __init__(self, imgfmt: str, imgproto: str, aiomode: str,
+                 cachemode: Optional[str] = None,
+                 imgopts: Optional[str] = None,
+                 misalign: bool = False,
+                 debug: bool = False,
+                 valgrind: bool = False) -> None:
+        self.imgfmt = imgfmt
+        self.imgproto = imgproto
+        self.aiomode = aiomode
+        self.imgopts = imgopts
+        self.misalign = misalign
+        self.debug = debug
+
+        if valgrind:
+            self.valgrind_qemu = 'y'
+
+        if cachemode is None:
+            self.cachemode_is_default = 'true'
+            self.cachemode = 'writeback'
+        else:
+            self.cachemode_is_default = 'false'
+            self.cachemode = cachemode
+
+        # Initialize generic paths: build_root, build_iotests, source_iotests,
+        # which are needed to initialize some environment variables. They are
+        # used by init_*() functions as well.
+
+        if os.path.islink(sys.argv[0]):
+            # called from the build tree
+            self.source_iotests = os.path.dirname(os.readlink(sys.argv[0]))
+            self.build_iotests = os.path.dirname(os.path.abspath(sys.argv[0]))
+        else:
+            # called from the source tree
+            self.source_iotests = os.getcwd()
+            self.build_iotests = self.source_iotests
+
+        self.build_root = os.path.join(self.build_iotests, '..', '..')
+
+        self.init_directories()
+        self.init_binaries()
+
+        self.malloc_perturb_ = os.getenv('MALLOC_PERTURB_',
+                                         str(random.randrange(1, 255)))
+
+        # QEMU_OPTIONS
+        self.qemu_options = '-nodefaults -display none -accel qtest'
+        machine_map = (
+            ('arm', 'virt'),
+            ('aarch64', 'virt'),
+            ('avr', 'mega2560'),
+            ('rx', 'gdbsim-r5f562n8'),
+            ('tricore', 'tricore_testboard')
+        )
+        for suffix, machine in machine_map:
+            if self.qemu_prog.endswith(f'qemu-system-{suffix}'):
+                self.qemu_options += f' -machine {machine}'
+
+        # QEMU_DEFAULT_MACHINE
+        self.qemu_default_machine = get_default_machine(self.qemu_prog)
+
+        self.qemu_img_options = os.getenv('QEMU_IMG_OPTIONS')
+        self.qemu_nbd_options = os.getenv('QEMU_NBD_OPTIONS')
+
+        is_generic = self.imgfmt not in ['bochs', 'cloop', 'dmg']
+        self.imgfmt_generic = 'true' if is_generic else 'false'
+
+        self.qemu_io_options = f'--cache {self.cachemode} --aio {self.aiomode}'
+        if self.misalign:
+            self.qemu_io_options += ' --misalign'
+
+        self.qemu_io_options_no_fmt = self.qemu_io_options
+
+        if self.imgfmt == 'luks':
+            self.imgoptssyntax = 'true'
+            self.imgkeysecret = '123456'
+            if not self.imgopts:
+                self.imgopts = 'iter-time=10'
+            elif 'iter-time=' not in self.imgopts:
+                self.imgopts += ',iter-time=10'
+        else:
+            self.imgoptssyntax = 'false'
+            self.qemu_io_options += ' -f ' + self.imgfmt
+
+        if self.imgfmt == 'vmdk':
+            if not self.imgopts:
+                self.imgopts = 'zeroed_grain=on'
+            elif 'zeroed_grain=' not in self.imgopts:
+                self.imgopts += ',zeroed_grain=on'
+
+    def close(self) -> None:
+        if self.tmp_sock_dir:
+            shutil.rmtree(self.sock_dir)
+
+    def __enter__(self) -> 'TestEnv':
+        return self
+
+    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
+        self.close()
+
+    def print_env(self) -> None:
+        template = """\
+QEMU          -- "{QEMU_PROG}" {QEMU_OPTIONS}
+QEMU_IMG      -- "{QEMU_IMG_PROG}" {QEMU_IMG_OPTIONS}
+QEMU_IO       -- "{QEMU_IO_PROG}" {QEMU_IO_OPTIONS}
+QEMU_NBD      -- "{QEMU_NBD_PROG}" {QEMU_NBD_OPTIONS}
+IMGFMT        -- {IMGFMT}{imgopts}
+IMGPROTO      -- {IMGPROTO}
+PLATFORM      -- {platform}
+TEST_DIR      -- {TEST_DIR}
+SOCK_DIR      -- {SOCK_DIR}
+SOCKET_SCM_HELPER -- {SOCKET_SCM_HELPER}"""
+
+        args = collections.defaultdict(str, self.get_env())
+
+        if 'IMGOPTS' in args:
+            args['imgopts'] = f" ({args['IMGOPTS']})"
+
+        u = os.uname()
+        args['platform'] = f'{u.sysname}/{u.machine} {u.nodename} {u.release}'
+
+        print(template.format_map(args))
-- 
2.29.2

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

Add TestRunner class, which will run tests in a new python iotests
running framework.

There are some differences with current ./check behavior, most
significant are:
- Consider all tests self-executable, just run them, don't run python
  by hand.
- Elapsed time is cached in json file
- Elapsed time precision increased a bit
- Instead of using "diff -w" which ignores all whitespace differences,
  manually strip whitespace at line end then use python difflib, which
  no longer ignores spacing mid-line

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210125185056.129513-5-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/testrunner.py | 367 +++++++++++++++++++++++++++++++
 1 file changed, 367 insertions(+)
 create mode 100644 tests/qemu-iotests/testrunner.py

diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunner.py
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/testrunner.py
@@ -XXX,XX +XXX,XX @@
+# Class for actually running tests.
+#
+# Copyright (c) 2020-2021 Virtuozzo International GmbH
+#
+# 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/>.
+#
+
+import os
+from pathlib import Path
+import datetime
+import time
+import difflib
+import subprocess
+import contextlib
+import json
+import termios
+import sys
+from contextlib import contextmanager
+from typing import List, Optional, Iterator, Any, Sequence, Dict, \
+        ContextManager
+
+from testenv import TestEnv
+
+
+def silent_unlink(path: Path) -> None:
+    try:
+        path.unlink()
+    except OSError:
+        pass
+
+
+def file_diff(file1: str, file2: str) -> List[str]:
+    with open(file1, encoding="utf-8") as f1, \
+         open(file2, encoding="utf-8") as f2:
+        # We want to ignore spaces at line ends. There are a lot of mess about
+        # it in iotests.
+        # TODO: fix all tests to not produce extra spaces, fix all .out files
+        # and use strict diff here!
+        seq1 = [line.rstrip() for line in f1]
+        seq2 = [line.rstrip() for line in f2]
+        res = [line.rstrip()
+               for line in difflib.unified_diff(seq1, seq2, file1, file2)]
+        return res
+
+
+# We want to save current tty settings during test run,
+# since an aborting qemu call may leave things screwed up.
+@contextmanager
+def savetty() -> Iterator[None]:
+    isterm = sys.stdin.isatty()
+    if isterm:
+        fd = sys.stdin.fileno()
+        attr = termios.tcgetattr(fd)
+
+    try:
+        yield
+    finally:
+        if isterm:
+            termios.tcsetattr(fd, termios.TCSADRAIN, attr)
+
+
+class LastElapsedTime(ContextManager['LastElapsedTime']):
+    """ Cache for elapsed time for tests, to show it during new test run
+
+    It is safe to use get() at any time.  To use update(), you must either
+    use it inside with-block or use save() after update().
+    """
+    def __init__(self, cache_file: str, env: TestEnv) -> None:
+        self.env = env
+        self.cache_file = cache_file
+        self.cache: Dict[str, Dict[str, Dict[str, float]]]
+
+        try:
+            with open(cache_file, encoding="utf-8") as f:
+                self.cache = json.load(f)
+        except (OSError, ValueError):
+            self.cache = {}
+
+    def get(self, test: str,
+            default: Optional[float] = None) -> Optional[float]:
+        if test not in self.cache:
+            return default
+
+        if self.env.imgproto not in self.cache[test]:
+            return default
+
+        return self.cache[test][self.env.imgproto].get(self.env.imgfmt,
+                                                       default)
+
+    def update(self, test: str, elapsed: float) -> None:
+        d = self.cache.setdefault(test, {})
+        d.setdefault(self.env.imgproto, {})[self.env.imgfmt] = elapsed
+
+    def save(self) -> None:
+        with open(self.cache_file, 'w', encoding="utf-8") as f:
+            json.dump(self.cache, f)
+
+    def __enter__(self) -> 'LastElapsedTime':
+        return self
+
+    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
+        self.save()
+
+
+class TestResult:
+    def __init__(self, status: str, description: str = '',
+                 elapsed: Optional[float] = None, diff: Sequence[str] = (),
+                 casenotrun: str = '', interrupted: bool = False) -> None:
+        self.status = status
+        self.description = description
+        self.elapsed = elapsed
+        self.diff = diff
+        self.casenotrun = casenotrun
+        self.interrupted = interrupted
+
+
+class TestRunner(ContextManager['TestRunner']):
+    def __init__(self, env: TestEnv, makecheck: bool = False,
+                 color: str = 'auto') -> None:
+        self.env = env
+        self.test_run_env = self.env.get_env()
+        self.makecheck = makecheck
+        self.last_elapsed = LastElapsedTime('.last-elapsed-cache', env)
+
+        assert color in ('auto', 'on', 'off')
+        self.color = (color == 'on') or (color == 'auto' and
+                                         sys.stdout.isatty())
+
+        self._stack: contextlib.ExitStack
+
+    def __enter__(self) -> 'TestRunner':
+        self._stack = contextlib.ExitStack()
+        self._stack.enter_context(self.env)
+        self._stack.enter_context(self.last_elapsed)
+        self._stack.enter_context(savetty())
+        return self
+
+    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
+        self._stack.close()
+
+    def test_print_one_line(self, test: str, starttime: str,
+                            endtime: Optional[str] = None, status: str = '...',
+                            lasttime: Optional[float] = None,
+                            thistime: Optional[float] = None,
+                            description: str = '',
+                            test_field_width: Optional[int] = None,
+                            end: str = '\n') -> None:
+        """ Print short test info before/after test run """
+        test = os.path.basename(test)
+
+        if test_field_width is None:
+            test_field_width = 8
+
+        if self.makecheck and status != '...':
+            if status and status != 'pass':
+                status = f' [{status}]'
+            else:
+                status = ''
+
+            print(f'  TEST   iotest-{self.env.imgfmt}: {test}{status}')
+            return
+
+        if lasttime:
+            lasttime_s = f' (last: {lasttime:.1f}s)'
+        else:
+            lasttime_s = ''
+        if thistime:
+            thistime_s = f'{thistime:.1f}s'
+        else:
+            thistime_s = '...'
+
+        if endtime:
+            endtime = f'[{endtime}]'
+        else:
+            endtime = ''
+
+        if self.color:
+            if status == 'pass':
+                col = '\033[32m'
+            elif status == 'fail':
+                col = '\033[1m\033[31m'
+            elif status == 'not run':
+                col = '\033[33m'
+            else:
+                col = ''
+
+            col_end = '\033[0m'
+        else:
+            col = ''
+            col_end = ''
+
+        print(f'{test:{test_field_width}} {col}{status:10}{col_end} '
+              f'[{starttime}] {endtime:13}{thistime_s:5} {lasttime_s:14} '
+              f'{description}', end=end)
+
+    def find_reference(self, test: str) -> str:
+        if self.env.cachemode == 'none':
+            ref = f'{test}.out.nocache'
+            if os.path.isfile(ref):
+                return ref
+
+        ref = f'{test}.out.{self.env.imgfmt}'
+        if os.path.isfile(ref):
+            return ref
+
+        ref = f'{test}.{self.env.qemu_default_machine}.out'
+        if os.path.isfile(ref):
+            return ref
+
+        return f'{test}.out'
+
+    def do_run_test(self, test: str) -> TestResult:
+        f_test = Path(test)
+        f_bad = Path(f_test.name + '.out.bad')
+        f_notrun = Path(f_test.name + '.notrun')
+        f_casenotrun = Path(f_test.name + '.casenotrun')
+        f_reference = Path(self.find_reference(test))
+
+        if not f_test.exists():
+            return TestResult(status='fail',
+                              description=f'No such test file: {f_test}')
+
+        if not os.access(str(f_test), os.X_OK):
+            sys.exit(f'Not executable: {f_test}')
+
+        if not f_reference.exists():
+            return TestResult(status='not run',
+                              description='No qualified output '
+                                          f'(expected {f_reference})')
+
+        for p in (f_bad, f_notrun, f_casenotrun):
+            silent_unlink(p)
+
+        args = [str(f_test.resolve())]
+        if self.env.debug:
+            args.append('-d')
+
+        with f_test.open(encoding="utf-8") as f:
+            try:
+                if f.readline() == '#!/usr/bin/env python3':
+                    args.insert(0, self.env.python)
+            except UnicodeDecodeError:  # binary test? for future.
+                pass
+
+        env = os.environ.copy()
+        env.update(self.test_run_env)
+
+        t0 = time.time()
+        with f_bad.open('w', encoding="utf-8") as f:
+            proc = subprocess.Popen(args, cwd=str(f_test.parent), env=env,
+                                    stdout=f, stderr=subprocess.STDOUT)
+            try:
+                proc.wait()
+            except KeyboardInterrupt:
+                proc.terminate()
+                proc.wait()
+                return TestResult(status='not run',
+                                  description='Interrupted by user',
+                                  interrupted=True)
+            ret = proc.returncode
+
+        elapsed = round(time.time() - t0, 1)
+
+        if ret != 0:
+            return TestResult(status='fail', elapsed=elapsed,
+                              description=f'failed, exit status {ret}',
+                              diff=file_diff(str(f_reference), str(f_bad)))
+
+        if f_notrun.exists():
+            return TestResult(status='not run',
+                              description=f_notrun.read_text().strip())
+
+        casenotrun = ''
+        if f_casenotrun.exists():
+            casenotrun = f_casenotrun.read_text()
+
+        diff = file_diff(str(f_reference), str(f_bad))
+        if diff:
+            return TestResult(status='fail', elapsed=elapsed,
+                              description=f'output mismatch (see {f_bad})',
+                              diff=diff, casenotrun=casenotrun)
+        else:
+            f_bad.unlink()
+            self.last_elapsed.update(test, elapsed)
+            return TestResult(status='pass', elapsed=elapsed,
+                              casenotrun=casenotrun)
+
+    def run_test(self, test: str,
+                 test_field_width: Optional[int] = None) -> TestResult:
+        last_el = self.last_elapsed.get(test)
+        start = datetime.datetime.now().strftime('%H:%M:%S')
+
+        self.test_print_one_line(test=test, starttime=start, lasttime=last_el,
+                                 end='\r', test_field_width=test_field_width)
+
+        res = self.do_run_test(test)
+
+        end = datetime.datetime.now().strftime('%H:%M:%S')
+        self.test_print_one_line(test=test, status=res.status,
+                                 starttime=start, endtime=end,
+                                 lasttime=last_el, thistime=res.elapsed,
+                                 description=res.description,
+                                 test_field_width=test_field_width)
+
+        if res.casenotrun:
+            print(res.casenotrun)
+
+        return res
+
+    def run_tests(self, tests: List[str]) -> None:
+        n_run = 0
+        failed = []
+        notrun = []
+        casenotrun = []
+
+        if not self.makecheck:
+            self.env.print_env()
+            print()
+
+        test_field_width = max(len(os.path.basename(t)) for t in tests) + 2
+
+        for t in tests:
+            name = os.path.basename(t)
+            res = self.run_test(t, test_field_width=test_field_width)
+
+            assert res.status in ('pass', 'fail', 'not run')
+
+            if res.casenotrun:
+                casenotrun.append(t)
+
+            if res.status != 'not run':
+                n_run += 1
+
+            if res.status == 'fail':
+                failed.append(name)
+                if self.makecheck:
+                    self.env.print_env()
+                if res.diff:
+                    print('\n'.join(res.diff))
+            elif res.status == 'not run':
+                notrun.append(name)
+
+            if res.interrupted:
+                break
+
+        if notrun:
+            print('Not run:', ' '.join(notrun))
+
+        if casenotrun:
+            print('Some cases not run in:', ' '.join(casenotrun))
+
+        if failed:
+            print('Failures:', ' '.join(failed))
+            print(f'Failed {len(failed)} of {n_run} iotests')
+        else:
+            print(f'Passed all {n_run} iotests')
-- 
2.29.2

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

Just use classes introduced in previous three commits. Behavior
difference is described in these three commits.

Drop group file, as it becomes unused.

Drop common.env: now check is in python, and for tests we use same
python interpreter that runs the check itself. Use build environment
PYTHON in check-block instead, to keep "make check" use the same
python.

Checking for virtio-blk moved to iotests.py, as it actually iotests.py
dependency. Actually not all python iotests depend on it, so in future
it may be refactored to checked only when really needed.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210125185056.129513-6-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/iotests.py    |    8 +
 Makefile                         |    1 -
 tests/check-block.sh             |    3 +-
 tests/qemu-iotests/check         | 1095 ++++--------------------------
 tests/qemu-iotests/common.env.in |    3 -
 tests/qemu-iotests/group         |  323 ---------
 tests/qemu-iotests/meson.build   |    3 -
 7 files changed, 139 insertions(+), 1297 deletions(-)
 delete mode 100644 tests/qemu-iotests/common.env.in
 delete mode 100644 tests/qemu-iotests/group

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 _verify_formats(required_formats: Sequence[str] = ()) -> None:
     if usf_list:
         notrun(f'formats {usf_list} are not whitelisted')
 
+
+def _verify_virtio_blk() -> None:
+    out = qemu_pipe('-M', 'none', '-device', 'help')
+    if 'virtio-blk' not in out:
+        notrun('Missing virtio-blk in QEMU binary')
+
+
 def supports_quorum():
     return 'quorum' in qemu_img_pipe('--help')
 
@@ -XXX,XX +XXX,XX @@ def execute_setup_common(supported_fmts: Sequence[str] = (),
     _verify_cache_mode(supported_cache_modes)
     _verify_aio_mode(supported_aio_modes)
     _verify_formats(required_fmts)
+    _verify_virtio_blk()
 
     return debug
 
diff --git a/Makefile b/Makefile
index XXXXXXX..XXXXXXX 100644
--- a/Makefile
+++ b/Makefile
@@ -XXX,XX +XXX,XX @@ distclean: clean
 	rm -f config-host.mak config-host.h*
 	rm -f tests/tcg/config-*.mak
 	rm -f config-all-disas.mak config.status
-	rm -f tests/qemu-iotests/common.env
 	rm -f roms/seabios/config.mak roms/vgabios/config.mak
 	rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols
 	rm -f *-config-target.h *-config-devices.mak *-config-devices.h
diff --git a/tests/check-block.sh b/tests/check-block.sh
index XXXXXXX..XXXXXXX 100755
--- a/tests/check-block.sh
+++ b/tests/check-block.sh
@@ -XXX,XX +XXX,XX @@ cd tests/qemu-iotests
 
 # QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests
 export QEMU_CHECK_BLOCK_AUTO=1
+export PYTHONUTF8=1
 
 ret=0
 for fmt in $format_list ; do
-    ./check -makecheck -$fmt $group || ret=1
+    ${PYTHON} ./check -makecheck -$fmt $group || ret=1
 done
 
 exit $ret
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -XXX,XX +XXX,XX @@
-#!/usr/bin/env bash
+#!/usr/bin/env python3
 #
-# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (c) 2000-2002,2006 Silicon Graphics, Inc.  All Rights Reserved.
+# Configure environment and run group of tests in it.
+#
+# Copyright (c) 2020-2021 Virtuozzo International GmbH
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -XXX,XX +XXX,XX @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Control script for QA
-#
-
-status=0
-needwrap=true
-try=0
-n_bad=0
-bad=""
-notrun=""
-casenotrun=""
-interrupt=true
-makecheck=false
-
-_init_error()
-{
-    echo "check: $1" >&2
-    exit 1
-}
-
-if [ -L "$0" ]
-then
-    # called from the build tree
-    source_iotests=$(dirname "$(readlink "$0")")
-    if [ -z "$source_iotests" ]
-    then
-        _init_error "failed to obtain source tree name from check symlink"
-    fi
-    source_iotests=$(cd "$source_iotests"; pwd) || _init_error "failed to enter source tree"
-    build_iotests=$(cd "$(dirname "$0")"; pwd)
-else
-    # called from the source tree
-    source_iotests=$PWD
-    # this may be an in-tree build (note that in the following code we may not
-    # assume that it truly is and have to test whether the build results
-    # actually exist)
-    build_iotests=$PWD
-fi
-
-build_root="$build_iotests/../.."
-
-# we need common.env
-if ! . "$build_iotests/common.env"
-then
-    _init_error "failed to source common.env (make sure the qemu-iotests are run from tests/qemu-iotests in the build tree)"
-fi
-
-# we need common.config
-if ! . "$source_iotests/common.config"
-then
-    _init_error "failed to source common.config"
-fi
-
-_full_imgfmt_details()
-{
-    if [ -n "$IMGOPTS" ]; then
-        echo "$IMGFMT ($IMGOPTS)"
-    else
-        echo "$IMGFMT"
-    fi
-}
-
-_full_platform_details()
-{
-    os=$(uname -s)
-    host=$(hostname -s)
-    kernel=$(uname -r)
-    platform=$(uname -m)
-    echo "$os/$platform $host $kernel"
-}
-
-_full_env_details()
-{
-    cat <<EOF
-QEMU          -- "$QEMU_PROG" $QEMU_OPTIONS
-QEMU_IMG      -- "$QEMU_IMG_PROG" $QEMU_IMG_OPTIONS
-QEMU_IO       -- "$QEMU_IO_PROG" $QEMU_IO_OPTIONS
-QEMU_NBD      -- "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS
-IMGFMT        -- $FULL_IMGFMT_DETAILS
-IMGPROTO      -- $IMGPROTO
-PLATFORM      -- $FULL_HOST_DETAILS
-TEST_DIR      -- $TEST_DIR
-SOCK_DIR      -- $SOCK_DIR
-SOCKET_SCM_HELPER -- $SOCKET_SCM_HELPER
-
-EOF
-}
-
-# $1 = prog to look for
-set_prog_path()
-{
-    p=$(command -v $1 2> /dev/null)
-    if [ -n "$p" -a -x "$p" ]; then
-        type -p "$p"
-    else
-        return 1
-    fi
-}
-
-if [ -z "$TEST_DIR" ]; then
-        TEST_DIR=$PWD/scratch
-fi
-mkdir -p "$TEST_DIR" || _init_error 'Failed to create TEST_DIR'
-
-tmp_sock_dir=false
-if [ -z "$SOCK_DIR" ]; then
-    SOCK_DIR=$(mktemp -d)
-    tmp_sock_dir=true
-fi
-mkdir -p "$SOCK_DIR" || _init_error 'Failed to create SOCK_DIR'
-
-diff="diff -u"
-verbose=false
-debug=false
-group=false
-xgroup=false
-imgopts=false
-showme=false
-sortme=false
-expunge=true
-have_test_arg=false
-cachemode=false
-aiomode=false
-
-tmp="${TEST_DIR}"/$$
-rm -f $tmp.list $tmp.tmp $tmp.sed
-
-export IMGFMT=raw
-export IMGFMT_GENERIC=true
-export IMGPROTO=file
-export IMGOPTS=""
-export CACHEMODE="writeback"
-export AIOMODE="threads"
-export QEMU_IO_OPTIONS=""
-export QEMU_IO_OPTIONS_NO_FMT=""
-export CACHEMODE_IS_DEFAULT=true
-export VALGRIND_QEMU=
-export IMGKEYSECRET=
-export IMGOPTSSYNTAX=false
-
-# Save current tty settings, since an aborting qemu call may leave things
-# screwed up
-STTY_RESTORE=
-if test -t 0; then
-    STTY_RESTORE=$(stty -g)
-fi
-
-for r
-do
-
-    if $group
-    then
-        # arg after -g
-        group_list=$(sed -n <"$source_iotests/group" -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{
-s/ .*//p
-}')
-        if [ -z "$group_list" ]
-        then
-            echo "Group \"$r\" is empty or not defined?"
-            exit 1
-        fi
-        [ ! -s $tmp.list ] && touch $tmp.list
-        for t in $group_list
-        do
-            if grep -s "^$t\$" $tmp.list >/dev/null
-            then
-                :
-            else
-                echo "$t" >>$tmp.list
-            fi
-        done
-        group=false
-        continue
-
-    elif $xgroup
-    then
-        # arg after -x
-        # Populate $tmp.list with all tests
-        awk '/^[0-9]{3,}/ {print $1}' "${source_iotests}/group" > $tmp.list 2>/dev/null
-        group_list=$(sed -n <"$source_iotests/group" -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{
-s/ .*//p
-}')
-        if [ -z "$group_list" ]
-        then
-            echo "Group \"$r\" is empty or not defined?"
-            exit 1
-        fi
-        numsed=0
-        rm -f $tmp.sed
-        for t in $group_list
-        do
-            if [ $numsed -gt 100 ]
-            then
-                sed -f $tmp.sed <$tmp.list >$tmp.tmp
-                mv $tmp.tmp $tmp.list
-                numsed=0
-                rm -f $tmp.sed
-            fi
-            echo "/^$t\$/d" >>$tmp.sed
-            numsed=$(expr $numsed + 1)
-        done
-        sed -f $tmp.sed <$tmp.list >$tmp.tmp
-        mv $tmp.tmp $tmp.list
-        xgroup=false
-        continue
-
-    elif $imgopts
-    then
-        IMGOPTS="$r"
-        imgopts=false
-        continue
-    elif $cachemode
-    then
-        CACHEMODE="$r"
-        CACHEMODE_IS_DEFAULT=false
-        cachemode=false
-        continue
-    elif $aiomode
-    then
-        AIOMODE="$r"
-        aiomode=false
-        continue
-    fi
-
-    xpand=true
-    case "$r"
-    in
-
-        -\? | -h | --help)        # usage
-            echo "Usage: $0 [options] [testlist]"'
-
-common options
-    -v                  verbose
-    -d                  debug
-
-image format options
-    -raw                test raw (default)
-    -bochs              test bochs
-    -cloop              test cloop
-    -parallels          test parallels
-    -qcow               test qcow
-    -qcow2              test qcow2
-    -qed                test qed
-    -vdi                test vdi
-    -vpc                test vpc
-    -vhdx               test vhdx
-    -vmdk               test vmdk
-    -luks               test luks
-    -dmg                test dmg
-
-image protocol options
-    -file               test file (default)
-    -rbd                test rbd
-    -sheepdog           test sheepdog
-    -nbd                test nbd
-    -fuse               test fuse
-    -ssh                test ssh
-    -nfs                test nfs
-
-other options
-    -xdiff              graphical mode diff
-    -nocache            use O_DIRECT on backing file
-    -misalign           misalign memory allocations
-    -n                  show me, do not run tests
-    -o options          -o options to pass to qemu-img create/convert
-    -c mode             cache mode
-    -i mode             AIO mode
-    -makecheck          pretty print output for make check
-
-testlist options
-    -g group[,group...]        include tests from these groups
-    -x group[,group...]        exclude tests from these groups
-    NNN                        include test NNN
-    NNN-NNN                    include test range (eg. 012-021)
-'
-            exit 0
-            ;;
-
-        -raw)
-            IMGFMT=raw
-            xpand=false
-            ;;
-
-        -bochs)
-            IMGFMT=bochs
-            IMGFMT_GENERIC=false
-            xpand=false
-            ;;
-
-        -cloop)
-            IMGFMT=cloop
-            IMGFMT_GENERIC=false
-            xpand=false
-            ;;
-
-        -parallels)
-            IMGFMT=parallels
-            xpand=false
-            ;;
-
-        -qcow)
-            IMGFMT=qcow
-            xpand=false
-            ;;
-
-        -qcow2)
-            IMGFMT=qcow2
-            xpand=false
-            ;;
-
-        -luks)
-            IMGOPTSSYNTAX=true
-            IMGFMT=luks
-            IMGKEYSECRET=123456
-            xpand=false
-            ;;
-
-        -dmg)
-            IMGFMT=dmg
-            IMGFMT_GENERIC=false
-            xpand=false
-            ;;
-
-        -qed)
-            IMGFMT=qed
-            xpand=false
-            ;;
-
-        -vdi)
-            IMGFMT=vdi
-            xpand=false
-            ;;
-
-        -vmdk)
-            IMGFMT=vmdk
-            xpand=false
-            ;;
-
-        -vpc)
-            IMGFMT=vpc
-            xpand=false
-            ;;
-
-        -vhdx)
-            IMGFMT=vhdx
-            xpand=false
-            ;;
-
-        -file)
-            IMGPROTO=file
-            xpand=false
-            ;;
-
-        -rbd)
-            IMGPROTO=rbd
-            xpand=false
-            ;;
-
-        -sheepdog)
-            IMGPROTO=sheepdog
-            xpand=false
-            ;;
-
-        -nbd)
-            IMGPROTO=nbd
-            xpand=false
-            ;;
-
-        -fuse)
-            IMGPROTO=fuse
-            xpand=false
-            ;;
-
-        -ssh)
-            IMGPROTO=ssh
-            xpand=false
-            ;;
-
-        -nfs)
-            IMGPROTO=nfs
-            xpand=false
-            ;;
-
-        -nocache)
-            CACHEMODE="none"
-            CACHEMODE_IS_DEFAULT=false
-            xpand=false
-            ;;
-
-        -misalign)
-            QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --misalign"
-            xpand=false
-            ;;
-
-        -valgrind)
-            VALGRIND_QEMU='y'
-            xpand=false
-            ;;
-
-        -g)        # -g group ... pick from group file
-            group=true
-            xpand=false
-            ;;
-
-        -xdiff)        # graphical diff mode
-            xpand=false
-
-            if [ ! -z "$DISPLAY" ]
-            then
-                command -v xdiff >/dev/null 2>&1 && diff=xdiff
-                command -v gdiff >/dev/null 2>&1 && diff=gdiff
-                command -v tkdiff >/dev/null 2>&1 && diff=tkdiff
-                command -v xxdiff >/dev/null 2>&1 && diff=xxdiff
-            fi
-            ;;
-        -makecheck)   # makecheck friendly output
-            makecheck=true
-            xpand=false
-            ;;
-        -n)        # show me, don't do it
-            showme=true
-            xpand=false
-            ;;
-        -o)
-            imgopts=true
-            xpand=false
-            ;;
-        -c)
-            cachemode=true
-            xpand=false
-            ;;
-        -i)
-            aiomode=true
-            xpand=false
-            ;;
-        -T)        # deprecated timestamp option
-            xpand=false
-            ;;
-        -v)
-            verbose=true
-            xpand=false
-            ;;
-        -d)
-            debug=true
-            xpand=false
-            ;;
-        -x)        # -x group ... exclude from group file
-            xgroup=true
-            xpand=false
-            ;;
-        '[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]')
-            echo "No tests?"
-            status=1
-            exit $status
-            ;;
-
-        [0-9]*-[0-9]*)
-            eval $(echo $r | sed -e 's/^/start=/' -e 's/-/ end=/')
-            ;;
-
-        [0-9]*-)
-            eval $(echo $r | sed -e 's/^/start=/' -e 's/-//')
-            end=$(echo [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] | sed -e 's/\[0-9]//g' -e 's/  *$//' -e 's/.* //')
-            if [ -z "$end" ]
-            then
-                echo "No tests in range \"$r\"?"
-                status=1
-                exit $status
-            fi
-            ;;
-
-        *)
-            start=$r
-            end=$r
-            ;;
-
-    esac
-
-    # get rid of leading 0s as can be interpreted as octal
-    start=$(echo $start | sed 's/^0*//')
-    end=$(echo $end | sed 's/^0*//')
-
-    if $xpand
-    then
-        have_test_arg=true
-        awk </dev/null '
-BEGIN        { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
-        | while read id
-        do
-            if grep -s "^$id$ \|\$$" "$source_iotests/group" >/dev/null
-            then
-                # in group file ... OK
-                echo $id >>$tmp.list
-            else
-                if [ -f expunged ] && $expunge && egrep "^$id([         ]|\$)" expunged >/dev/null
-                then
-                    # expunged ... will be reported, but not run, later
-                    echo $id >>$tmp.list
-                else
-                    # oops
-                    if [ "$start" == "$end" -a "$id" == "$end" ]
-                    then
-                        echo "$id - unknown test"
-                        exit 1
-                    else
-                        echo "$id - unknown test, ignored"
-                    fi
-                fi
-            fi
-        done || exit 1
-    fi
-
-done
-
-# Set qemu-io cache mode with $CACHEMODE we have
-QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --cache $CACHEMODE"
-# Set qemu-io aio mode with $AIOMODE we have
-QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --aio $AIOMODE"
-
-QEMU_IO_OPTIONS_NO_FMT="$QEMU_IO_OPTIONS"
-if [ "$IMGOPTSSYNTAX" != "true" ]; then
-    QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS -f $IMGFMT"
-fi
-
-# Set default options for qemu-img create -o if they were not specified
-if [ "$IMGFMT" == "qcow2" ] && ! (echo "$IMGOPTS" | grep "compat=" > /dev/null); then
-    IMGOPTS=$(_optstr_add "$IMGOPTS" "compat=1.1")
-fi
-if [ "$IMGFMT" == "luks" ] && ! (echo "$IMGOPTS" | grep "iter-time=" > /dev/null); then
-    IMGOPTS=$(_optstr_add "$IMGOPTS" "iter-time=10")
-fi
-if [ "$IMGFMT" == "vmdk" ] && ! (echo "$IMGOPTS" | grep "zeroed_grain=" > /dev/null); then
-    IMGOPTS=$(_optstr_add "$IMGOPTS" "zeroed_grain=on")
-fi
-
-if [ -z "$SAMPLE_IMG_DIR" ]; then
-        SAMPLE_IMG_DIR="$source_iotests/sample_images"
-fi
-
-export TEST_DIR
-export SOCK_DIR
-export SAMPLE_IMG_DIR
-
-if [ -s $tmp.list ]
-then
-    # found some valid test numbers ... this is good
-    :
-else
-    if $have_test_arg
-    then
-        # had test numbers, but none in group file ... do nothing
-        touch $tmp.list
-    else
-        # no test numbers, do everything from group file
-        sed -n -e '/^[0-9][0-9][0-9]*/s/^$[0-9]*$.*/\1/p' <"$source_iotests/group" >$tmp.list
-    fi
-fi
-
-# should be sort -n, but this did not work for Linux when this
-# was ported from IRIX
-#
-list=$(sort $tmp.list)
-rm -f $tmp.list $tmp.tmp $tmp.sed
-
-if [ -z "$QEMU_PROG" ]
-then
-    if [ -x "$build_iotests/qemu" ]; then
-        export QEMU_PROG="$build_iotests/qemu"
-    elif [ -x "$build_root/qemu-system-${qemu_arch}" ]; then
-        export QEMU_PROG="$build_root/qemu-system-${qemu_arch}"
-    else
-        pushd "$build_root" > /dev/null
-        for binary in qemu-system-*
-        do
-            if [ -x "$binary" ]
-            then
-                export QEMU_PROG="$build_root/$binary"
-                break
-            fi
-        done
-        popd > /dev/null
-        [ "$QEMU_PROG" = "" ] && _init_error "qemu not found"
-    fi
-fi
-export QEMU_PROG="$(type -p "$QEMU_PROG")"
-
-export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
-case "$QEMU_PROG" in
-    *qemu-system-arm|*qemu-system-aarch64)
-        export QEMU_OPTIONS="$QEMU_OPTIONS -machine virt"
-        ;;
-    *qemu-system-avr)
-        export QEMU_OPTIONS="$QEMU_OPTIONS -machine mega2560"
-        ;;
-    *qemu-system-rx)
-        export QEMU_OPTIONS="$QEMU_OPTIONS -machine gdbsim-r5f562n8"
-        ;;
-    *qemu-system-tricore)
-        export QEMU_OPTIONS="-$QEMU_OPTIONS -machine tricore_testboard"
-        ;;
-esac
-
-if [ -z "$QEMU_IMG_PROG" ]; then
-    if [ -x "$build_iotests/qemu-img" ]; then
-        export QEMU_IMG_PROG="$build_iotests/qemu-img"
-    elif [ -x "$build_root/qemu-img" ]; then
-        export QEMU_IMG_PROG="$build_root/qemu-img"
-    else
-        _init_error "qemu-img not found"
-    fi
-fi
-export QEMU_IMG_PROG="$(type -p "$QEMU_IMG_PROG")"
-
-if [ -z "$QEMU_IO_PROG" ]; then
-    if [ -x "$build_iotests/qemu-io" ]; then
-        export QEMU_IO_PROG="$build_iotests/qemu-io"
-    elif [ -x "$build_root/qemu-io" ]; then
-        export QEMU_IO_PROG="$build_root/qemu-io"
-    else
-        _init_error "qemu-io not found"
-    fi
-fi
-export QEMU_IO_PROG="$(type -p "$QEMU_IO_PROG")"
-
-if [ -z $QEMU_NBD_PROG ]; then
-    if [ -x "$build_iotests/qemu-nbd" ]; then
-        export QEMU_NBD_PROG="$build_iotests/qemu-nbd"
-    elif [ -x "$build_root/qemu-nbd" ]; then
-        export QEMU_NBD_PROG="$build_root/qemu-nbd"
-    else
-        _init_error "qemu-nbd not found"
-    fi
-fi
-export QEMU_NBD_PROG="$(type -p "$QEMU_NBD_PROG")"
-
-if [ -z "$QSD_PROG" ]; then
-    if [ -x "$build_iotests/qemu-storage-daemon" ]; then
-        export QSD_PROG="$build_iotests/qemu-storage-daemon"
-    elif [ -x "$build_root/storage-daemon/qemu-storage-daemon" ]; then
-        export QSD_PROG="$build_root/storage-daemon/qemu-storage-daemon"
-    else
-        _init_error "qemu-storage-daemon not found"
-    fi
-fi
-export QSD_PROG="$(type -p "$QSD_PROG")"
-
-if [ -x "$build_iotests/socket_scm_helper" ]
-then
-    export SOCKET_SCM_HELPER="$build_iotests/socket_scm_helper"
-fi
-
-python_usable=false
-if $PYTHON -c 'import sys; sys.exit(0 if sys.version_info >= (3,6) else 1)'
-then
-    # Our python framework also requires virtio-blk
-    if "$QEMU_PROG" -M none -device help | grep -q virtio-blk >/dev/null 2>&1
-    then
-        python_usable=true
-    else
-        python_unusable_because="Missing virtio-blk in QEMU binary"
-    fi
-else
-    python_unusable_because="Unsupported Python version"
-fi
-
-default_machine=$($QEMU_PROG -machine help | sed -n '/(default)/ s/ .*//p')
-default_alias_machine=$($QEMU_PROG -machine help | \
-   sed -n "/(alias of $default_machine)/ { s/ .*//p; q; }")
-if [[ "$default_alias_machine" ]]; then
-    default_machine="$default_alias_machine"
-fi
-
-export QEMU_DEFAULT_MACHINE="$default_machine"
-
-TIMESTAMP_FILE=check.time-$IMGPROTO-$IMGFMT
-
-_wallclock()
-{
-    date "+%H %M %S" | awk '{ print $1*3600 + $2*60 + $3 }'
-}
-
-_wrapup()
-{
-    if $showme
-    then
-        :
-    elif $needwrap
-    then
-        if [ -f $TIMESTAMP_FILE -a -f $tmp.time ]
-        then
-            cat $TIMESTAMP_FILE $tmp.time \
-            | awk '
-        { t[$1] = $2 }
-END        { if (NR > 0) {
-            for (i in t) print i " " t[i]
-          }
-        }' \
-            | sort -n >$tmp.out
-            mv $tmp.out $TIMESTAMP_FILE
-        fi
-
-        if [ -f $tmp.expunged ]
-        then
-            notrun=$(wc -l <$tmp.expunged | sed -e 's/  *//g')
-            try=$(expr $try - $notrun)
-            list=$(echo "$list" | sed -f $tmp.expunged)
-        fi
-
-        echo "" >>check.log
-        date >>check.log
-        echo $list | fmt | sed -e 's/^/    /' >>check.log
-        $interrupt && echo "Interrupted!" >>check.log
-
-        if [ ! -z "$notrun" ]
-        then
-            echo "Not run:$notrun"
-            echo "Not run:$notrun" >>check.log
-        fi
-        if [ ! -z "$casenotrun" ]
-        then
-            echo "Some cases not run in:$casenotrun"
-            echo "Some cases not run in:$casenotrun" >>check.log
-        fi
-        if [ ! -z "$n_bad" -a $n_bad != 0 ]
-        then
-            echo "Failures:$bad"
-            echo "Failed $n_bad of $try iotests"
-            echo "Failures:$bad" | fmt >>check.log
-            echo "Failed $n_bad of $try iotests" >>check.log
-        else
-            echo "Passed all $try iotests"
-            echo "Passed all $try iotests" >>check.log
-        fi
-        needwrap=false
-    fi
-
-    if test -n "$STTY_RESTORE"; then
-        stty $STTY_RESTORE
-    fi
-    rm -f "${TEST_DIR}"/*.out "${TEST_DIR}"/*.err "${TEST_DIR}"/*.time
-    rm -f "${TEST_DIR}"/check.pid "${TEST_DIR}"/check.sts
-    rm -f $tmp.*
-
-    if $tmp_sock_dir
-    then
-        rm -rf "$SOCK_DIR"
-    fi
-}
-
-trap "_wrapup; exit \$status" 0 1 2 3 15
-
-# Report the test start and results. For makecheck we want to pretty
-# print the whole report at the end of the execution.
-# args: $seq, $starttime, $lasttime
-_report_test_start()
-{
-    if ! $makecheck; then
-        if [ -n "$3" ]; then
-            local lasttime=" (last: $3s)"
-        fi
-        printf "%-8s %-10s [%s]            %4s%-14s\r" "$1" "..." "$2" "..." "$lasttime"
-    fi
-}
-# args:$seq $status $starttime $lasttime $thistime $details
-_report_test_result()
-{
-    local status lasttime thistime
-    if $makecheck; then
-        if [ -n "$2" ] && [ "$2" != "pass" ]; then
-            status=" [$2]"
-        fi
-        printf "  TEST    iotest-$IMGFMT: %s%s\n" "$1" "$status"
-        return
-    fi
-
-    if [ -n "$4" ]; then
-        lasttime=" (last: $4s)"
-    fi
-    if [ -n "$5" ]; then
-        thistime=" $5s"
-    fi
-    case "$2" in
-        "pass")     status=$(printf "\e[32m%-10s\e[0m" "$2") ;;
-        "fail")     status=$(printf "\e[1m\e[31m%-10s\e[0m" "$2") ;;
-        "not run")  status=$(printf "\e[33m%-10s\e[0m" "$2") ;;
-        *)          status=$(printf "%-10s" "$2") ;;
-    esac
-
-    printf "%-8s %s [%s] [%s] %4s%-14s %s\n" "$1" "$status" "$3" "$(date '+%T')" "$thistime" "$lasttime" "$6"
-}
-
-[ -f $TIMESTAMP_FILE ] || touch $TIMESTAMP_FILE
-
-FULL_IMGFMT_DETAILS=$(_full_imgfmt_details)
-FULL_HOST_DETAILS=$(_full_platform_details)
-
-if ! $makecheck; then
-    _full_env_details
-fi
-
-seq="check"
-
-[ -n "$TESTS_REMAINING_LOG" ] && echo $list > $TESTS_REMAINING_LOG
-
-for seq in $list
-do
-    err=false       # error flag
-    printdiff=false # show diff to reference output?
-    status=""       # test result summary
-    results=""      # test result details
-    thistime=""     # time the test took
-
-    if [ -n "$TESTS_REMAINING_LOG" ] ; then
-        sed -e "s/$seq//" -e 's/  / /' -e 's/^ *//' $TESTS_REMAINING_LOG > $TESTS_REMAINING_LOG.tmp
-        mv $TESTS_REMAINING_LOG.tmp $TESTS_REMAINING_LOG
-        sync
-    fi
-
-    lasttime=$(sed -n -e "/^$seq /s/.* //p" <$TIMESTAMP_FILE)
-    starttime=$(date "+%T")
-    _report_test_start $seq $starttime $lasttime
-
-    if $showme
-    then
-        status="not run"
-    elif [ -f expunged ] && $expunge && egrep "^$seq([         ]|\$)" expunged >/dev/null
-    then
-        status="not run"
-        results="expunged"
-        rm -f $seq.out.bad
-        echo "/^$seq\$/d" >>$tmp.expunged
-    elif [ ! -f "$source_iotests/$seq" ]
-    then
-        status="not run"
-        results="no such test?"
-        echo "/^$seq\$/d" >>$tmp.expunged
-    else
-        # really going to try and run this one
-        #
-        rm -f $seq.out.bad
-        rm -f core $seq.notrun
-        rm -f $seq.casenotrun
-
-        start=$(_wallclock)
-
-        if [ "$(head -n 1 "$source_iotests/$seq")" == "#!/usr/bin/env python3" ]; then
-            if $python_usable; then
-                run_command="$PYTHON $seq"
-            else
-                run_command="false"
-                echo "$python_unusable_because" > $seq.notrun
-            fi
-        else
-            run_command="./$seq"
-        fi
-        export OUTPUT_DIR=$PWD
-        if $debug; then
-            (cd "$source_iotests";
-            MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \
-                    $run_command -d 2>&1 | tee $tmp.out)
-        else
-            (cd "$source_iotests";
-            MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \
-                    $run_command >$tmp.out 2>&1)
-        fi
-        sts=$?
-        stop=$(_wallclock)
-
-        if [ -f core ]
-        then
-            mv core $seq.core
-            status="fail"
-            results="[dumped core] $seq.core"
-            err=true
-        fi
-
-        if [ -f $seq.notrun ]
-        then
-            # overwrites timestamp output
-            status="not run"
-            results="$(cat $seq.notrun)"
-        else
-            if [ $sts -ne 0 ]
-            then
-                status="fail"
-                results=$(printf %s "[failed, exit status $sts]")
-                err=true
-            fi
-
-            reference="$source_iotests/$seq.out"
-            reference_machine="$source_iotests/$seq.$QEMU_DEFAULT_MACHINE.out"
-            if [ -f "$reference_machine" ]; then
-                reference="$reference_machine"
-            fi
-
-            reference_format="$source_iotests/$seq.out.$IMGFMT"
-            if [ -f "$reference_format" ]; then
-                reference="$reference_format"
-            fi
-
-            if [ "$CACHEMODE" = "none" ]; then
-                [ -f "$source_iotests/$seq.out.nocache" ] && reference="$source_iotests/$seq.out.nocache"
-            fi
-
-            if [ ! -f "$reference" ]
-            then
-                status="fail"
-                results="no qualified output"
-                err=true
-            else
-                if diff -w "$reference" $tmp.out >/dev/null 2>&1
-                then
-                    if ! $err; then
-                        status="pass"
-                        thistime=$(expr $stop - $start)
-                        echo "$seq $thistime" >>$tmp.time
-                    fi
-                else
-                    mv $tmp.out $seq.out.bad
-                    status="fail"
-                    results="output mismatch (see $seq.out.bad)"
-                    printdiff=true
-                    err=true
-                fi
-            fi
-        fi
-        if [ -f $seq.casenotrun ]
-        then
-            cat $seq.casenotrun
-            casenotrun="$casenotrun $seq"
-        fi
-    fi
-
-    # come here for each test, except when $showme is true
-    #
-    _report_test_result $seq "$status" "$starttime" "$lasttime" "$thistime" "$results"
-    case "$status" in
-        "pass")
-            try=$(expr $try + 1)
-            ;;
-        "fail")
-            try=$(expr $try + 1)
-            if $makecheck; then
-                _full_env_details
-            fi
-            if $printdiff; then
-                $diff -w "$reference" "$PWD"/$seq.out.bad
-            fi
-            bad="$bad $seq"
-            n_bad=$(expr $n_bad + 1)
-            quick=false
-            ;;
-        "not run")
-            notrun="$notrun $seq"
-            ;;
-    esac
-
-    seq="after_$seq"
-done
 
-interrupt=false
-status=$(expr $n_bad)
-exit
+import os
+import sys
+import argparse
+from findtests import TestFinder
+from testenv import TestEnv
+from testrunner import TestRunner
+
+
+def make_argparser() -> argparse.ArgumentParser:
+    p = argparse.ArgumentParser(description="Test run options")
+
+    p.add_argument('-n', '--dry-run', action='store_true',
+                   help='show me, do not run tests')
+    p.add_argument('-makecheck', action='store_true',
+                   help='pretty print output for make check')
+
+    p.add_argument('-d', dest='debug', action='store_true', help='debug')
+    p.add_argument('-misalign', action='store_true',
+                   help='misalign memory allocations')
+    p.add_argument('--color', choices=['on', 'off', 'auto'],
+                   default='auto', help="use terminal colors. The default "
+                   "'auto' value means use colors if terminal stdout detected")
+
+    g_env = p.add_argument_group('test environment options')
+    mg = g_env.add_mutually_exclusive_group()
+    # We don't set default for cachemode, as we need to distinguish default
+    # from user input later.
+    mg.add_argument('-nocache', dest='cachemode', action='store_const',
+                    const='none', help='set cache mode "none" (O_DIRECT), '
+                    'sets CACHEMODE environment variable')
+    mg.add_argument('-c', dest='cachemode',
+                    help='sets CACHEMODE environment variable')
+
+    g_env.add_argument('-i', dest='aiomode', default='threads',
+                       help='sets AIOMODE environment variable')
+
+    p.set_defaults(imgfmt='raw', imgproto='file')
+
+    format_list = ['raw', 'bochs', 'cloop', 'parallels', 'qcow', 'qcow2',
+                   'qed', 'vdi', 'vpc', 'vhdx', 'vmdk', 'luks', 'dmg']
+    g_fmt = p.add_argument_group(
+        '  image format options',
+        'The following options set the IMGFMT environment variable. '
+        'At most one choice is allowed, default is "raw"')
+    mg = g_fmt.add_mutually_exclusive_group()
+    for fmt in format_list:
+        mg.add_argument('-' + fmt, dest='imgfmt', action='store_const',
+                        const=fmt, help=f'test {fmt}')
+
+    protocol_list = ['file', 'rbd', 'sheepdog', 'nbd', 'ssh', 'nfs',
+                     'fuse']
+    g_prt = p.add_argument_group(
+        '  image protocol options',
+        'The following options set the IMGPROTO environment variable. '
+        'At most one choice is allowed, default is "file"')
+    mg = g_prt.add_mutually_exclusive_group()
+    for prt in protocol_list:
+        mg.add_argument('-' + prt, dest='imgproto', action='store_const',
+                        const=prt, help=f'test {prt}')
+
+    g_bash = p.add_argument_group('bash tests options',
+                                  'The following options are ignored by '
+                                  'python tests.')
+    # TODO: make support for the following options in iotests.py
+    g_bash.add_argument('-o', dest='imgopts',
+                        help='options to pass to qemu-img create/convert, '
+                        'sets IMGOPTS environment variable')
+    g_bash.add_argument('-valgrind', action='store_true',
+                        help='use valgrind, sets VALGRIND_QEMU environment '
+                        'variable')
+
+    g_sel = p.add_argument_group('test selecting options',
+                                 'The following options specify test set '
+                                 'to run.')
+    g_sel.add_argument('-g', '--groups', metavar='group1,...',
+                       help='include tests from these groups')
+    g_sel.add_argument('-x', '--exclude-groups', metavar='group1,...',
+                       help='exclude tests from these groups')
+    g_sel.add_argument('--start-from', metavar='TEST',
+                       help='Start from specified test: make sorted sequence '
+                       'of tests as usual and then drop tests from the first '
+                       'one to TEST (not inclusive). This may be used to '
+                       'rerun failed ./check command, starting from the '
+                       'middle of the process.')
+    g_sel.add_argument('tests', metavar='TEST_FILES', nargs='*',
+                       help='tests to run')
+
+    return p
+
+
+if __name__ == '__main__':
+    args = make_argparser().parse_args()
+
+    env = TestEnv(imgfmt=args.imgfmt, imgproto=args.imgproto,
+                  aiomode=args.aiomode, cachemode=args.cachemode,
+                  imgopts=args.imgopts, misalign=args.misalign,
+                  debug=args.debug, valgrind=args.valgrind)
+
+    testfinder = TestFinder(test_dir=env.source_iotests)
+
+    groups = args.groups.split(',') if args.groups else None
+    x_groups = args.exclude_groups.split(',') if args.exclude_groups else None
+
+    group_local = os.path.join(env.source_iotests, 'group.local')
+    if os.path.isfile(group_local):
+        try:
+            testfinder.add_group_file(group_local)
+        except ValueError as e:
+            sys.exit(f"Failed to parse group file '{group_local}': {e}")
+
+    try:
+        tests = testfinder.find_tests(groups=groups, exclude_groups=x_groups,
+                                      tests=args.tests,
+                                      start_from=args.start_from)
+        if not tests:
+            raise ValueError('No tests selected')
+    except ValueError as e:
+        sys.exit(e)
+
+    if args.dry_run:
+        print('\n'.join(tests))
+    else:
+        with TestRunner(env, makecheck=args.makecheck,
+                        color=args.color) as tr:
+            tr.run_tests([os.path.join(env.source_iotests, t) for t in tests])
diff --git a/tests/qemu-iotests/common.env.in b/tests/qemu-iotests/common.env.in
deleted file mode 100644
index XXXXXXX..XXXXXXX
--- a/tests/qemu-iotests/common.env.in
+++ /dev/null
@@ -XXX,XX +XXX,XX @@
-# Automatically generated by configure - do not modify
-
-export PYTHON='@PYTHON@'
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
deleted file mode 100644
index XXXXXXX..XXXXXXX
--- a/tests/qemu-iotests/group
+++ /dev/null
@@ -XXX,XX +XXX,XX @@
-#
-# QA groups control file
-# Defines test groups
-#
-# Some notes about the groups:
-#
-# - do not start group names with a digit
-#
-# - quick : Tests in this group should finish within some few seconds.
-#
-# - img : Tests in this group can be used to excercise the qemu-img tool.
-#
-# - auto : Tests in this group are used during "make check" and should be
-#   runnable in any case. That means they should run with every QEMU binary
-#   (also non-x86), with every QEMU configuration (i.e. must not fail if
-#   an optional feature is not compiled in - but reporting a "skip" is ok),
-#   work at least with the qcow2 file format, work with all kind of host
-#   filesystems and users (e.g. "nobody" or "root") and must not take too
-#   much memory and disk space (since CI pipelines tend to fail otherwise).
-#
-
-#
-# test-group association ... one line per test
-#
-001 rw auto quick
-002 rw auto quick
-003 rw auto
-004 rw auto quick
-005 img auto quick
-# 006 was removed, do not reuse
-007 snapshot auto
-008 rw auto quick
-009 rw auto quick
-010 rw auto quick
-011 rw auto quick
-012 auto quick
-013 rw auto
-014 rw
-015 rw snapshot
-# 016 was removed, do not reuse
-017 rw backing auto quick
-018 rw backing auto quick
-019 rw backing auto quick
-020 rw backing auto quick
-021 io auto quick
-022 rw snapshot auto
-023 rw
-024 rw backing auto quick
-025 rw auto quick
-026 rw blkdbg
-027 rw auto quick
-028 rw backing quick
-029 rw auto quick
-030 rw auto backing
-031 rw auto quick
-032 rw auto quick
-033 rw auto quick
-034 rw auto backing quick
-035 rw auto quick
-036 rw auto quick
-037 rw auto backing quick
-038 rw auto backing quick
-039 rw auto quick
-040 rw auto
-041 rw auto backing
-042 rw auto quick
-043 rw auto backing
-044 rw
-045 rw quick
-046 rw auto aio quick
-047 rw auto quick
-048 img auto quick
-049 rw auto
-050 rw auto backing quick
-051 rw
-052 rw auto backing quick
-053 rw auto quick
-054 rw auto quick
-055 rw
-056 rw backing
-057 rw
-058 rw quick
-059 rw quick
-060 rw auto quick
-061 rw auto
-062 rw auto quick
-063 rw auto quick
-064 rw quick
-065 rw quick
-066 rw auto quick
-# 067 was removed, do not reuse
-068 rw quick
-069 rw auto quick
-070 rw quick
-071 rw auto quick
-072 rw auto quick
-073 rw auto quick
-074 rw auto quick
-075 rw quick
-076 io
-077 rw quick
-078 rw quick
-079 rw auto
-080 rw auto
-081 rw quick
-082 rw quick
-083 rw
-084 img quick
-085 rw
-086 rw auto quick
-087 rw quick
-088 rw quick
-089 rw auto quick
-090 rw auto quick
-091 rw migration quick
-092 rw quick
-093 throttle
-094 rw quick
-095 rw quick
-096 rw quick
-097 rw auto backing
-098 rw auto backing quick
-099 rw auto quick
-# 100 was removed, do not reuse
-101 rw quick
-102 rw quick
-103 rw auto quick
-104 rw auto
-105 rw auto quick
-106 rw quick
-107 rw auto quick
-108 rw auto quick
-109 rw
-110 rw auto backing quick
-111 rw auto quick
-112 rw
-113 rw quick
-114 rw auto quick
-115 rw
-116 rw quick
-117 rw auto
-118 rw
-119 rw quick
-120 rw auto quick
-121 rw
-122 rw
-123 rw quick
-124 rw backing
-125 rw
-126 rw auto backing
-127 rw auto backing quick
-128 rw quick
-129 rw quick
-130 rw quick
-131 rw quick
-132 rw quick
-133 auto quick
-134 rw auto quick
-135 rw
-136 rw
-137 rw auto
-138 rw auto quick
-139 rw quick
-140 rw auto quick
-141 rw auto quick
-142
-143 auto quick
-144 rw quick
-145 quick
-146 quick
-147 img
-148 rw quick
-149 rw sudo
-150 rw auto quick
-151 rw
-152 rw quick
-153 rw quick
-154 rw auto backing quick
-155 rw
-156 rw auto quick
-157 quick
-158 rw auto quick
-159 rw auto quick
-160 rw quick
-161 rw auto quick
-162 quick
-163 rw
-165 rw quick
-169 rw migration
-170 rw auto quick
-171 rw quick
-172 auto
-173 rw
-174 auto
-175 quick
-176 rw auto backing
-177 rw auto quick
-178 img
-179 rw auto quick
-181 rw auto migration quick
-182 rw quick
-183 rw migration quick
-184 rw auto quick
-185 rw
-186 rw auto
-187 rw auto
-188 rw quick
-189 rw
-190 rw auto quick
-191 rw auto
-192 rw auto quick
-194 rw migration quick
-195 rw auto quick
-196 rw quick migration
-197 rw quick
-198 rw
-199 rw migration
-200 rw
-201 rw migration quick
-202 rw quick
-203 rw auto migration quick
-204 rw quick
-205 rw quick
-206 rw
-207 rw
-208 rw quick
-209 rw quick
-210 rw
-211 rw quick
-212 rw quick
-213 rw quick
-214 rw auto
-215 rw quick
-216 rw quick
-217 rw auto quick
-218 rw quick
-219 rw
-220 rw auto
-221 rw quick
-222 rw quick
-223 rw quick
-224 rw quick
-225 rw quick
-226 auto quick
-227 quick
-228 rw quick
-229 auto quick
-231 quick
-232 quick
-233 quick
-234 quick migration
-235 quick
-236 quick
-237 rw quick
-238 quick
-239 rw quick
-240 quick
-241 rw quick
-242 rw quick
-243 rw quick
-244 rw auto quick
-245 rw
-246 rw quick
-247 rw quick
-248 rw quick
-249 rw auto quick
-250 rw quick
-251 rw auto quick
-252 rw auto backing quick
-253 rw quick
-254 rw backing quick
-255 rw quick
-256 rw auto quick
-257 rw
-258 rw quick
-259 rw auto quick
-260 rw quick
-261 rw
-262 rw quick migration
-263 rw quick
-264 rw
-265 rw auto quick
-266 rw quick
-267 rw auto quick snapshot
-268 rw auto quick
-270 rw backing quick
-271 rw auto
-272 rw
-273 backing quick
-274 rw backing
-277 rw quick
-279 rw backing quick
-280 rw migration quick
-281 rw quick
-282 rw img quick
-283 auto quick
-284 rw
-286 rw quick
-287 auto quick
-288 quick
-289 rw quick
-290 rw auto quick
-291 rw quick
-292 rw auto quick
-293 rw
-294 rw quick
-295 rw
-296 rw
-297 meta
-298
-299 auto quick
-300 migration
-301 backing quick
-302 quick
-303 rw quick
-304 rw quick
-305 rw quick
-307 rw quick export
-308 rw
-309 rw auto quick
-310 rw quick
-312 rw quick
-313 rw auto quick
diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/meson.build
+++ b/tests/qemu-iotests/meson.build
@@ -XXX,XX +XXX,XX @@ if 'CONFIG_LINUX' in config_host
 else
     socket_scm_helper = []
 endif
-configure_file(output: 'common.env',
-               input: files('common.env.in'),
-               configuration: {'PYTHON': python.full_path()})
-- 
2.29.2

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

Rename bitmaps migration tests and move them to tests subdirectory to
demonstrate new human-friendly test naming.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210125185056.129513-7-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/{199 => tests/migrate-bitmaps-postcopy-test}   | 0
 .../{199.out => tests/migrate-bitmaps-postcopy-test.out}          | 0
 tests/qemu-iotests/{169 => tests/migrate-bitmaps-test}            | 0
 tests/qemu-iotests/{169.out => tests/migrate-bitmaps-test.out}    | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/qemu-iotests/{199 => tests/migrate-bitmaps-postcopy-test} (100%)
 rename tests/qemu-iotests/{199.out => tests/migrate-bitmaps-postcopy-test.out} (100%)
 rename tests/qemu-iotests/{169 => tests/migrate-bitmaps-test} (100%)
 rename tests/qemu-iotests/{169.out => tests/migrate-bitmaps-test.out} (100%)

diff --git a/tests/qemu-iotests/199 b/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test
similarity index 100%
rename from tests/qemu-iotests/199
rename to tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test
diff --git a/tests/qemu-iotests/199.out b/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test.out
similarity index 100%
rename from tests/qemu-iotests/199.out
rename to tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test.out
diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/tests/migrate-bitmaps-test
similarity index 100%
rename from tests/qemu-iotests/169
rename to tests/qemu-iotests/tests/migrate-bitmaps-test
diff --git a/tests/qemu-iotests/169.out b/tests/qemu-iotests/tests/migrate-bitmaps-test.out
similarity index 100%
rename from tests/qemu-iotests/169.out
rename to tests/qemu-iotests/tests/migrate-bitmaps-test.out
-- 
2.29.2