Series comparison

-[Qemu-devel] [PULL 00/36] Block layer patches
+[Qemu-devel] [PULL 0/2] Block layer patches
-The following changes since commit b2f7a038bb4c4fc5ce6b8486e8513dfd97665e2a:
+The following changes since commit a2a9d4adabe340617a24eb73a8b2a116d28a6b38:
-  Merge remote-tracking branch 'remotes/rth/tags/pull-softfloat-20181104' into staging (2018-11-05 10:32:49 +0000)
+  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.1-20190712' into staging (2019-07-12 11:06:48 +0100)
 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 867eccfed84f96b54f4a432c510a02c2ce03b430:
-  include: Add a comment to explain the origin of sizes' lookup table (2018-11-05 15:29:59 +0100)
+  file-posix: Use max transfer length/segment count only for SCSI passthrough (2019-07-12 15:42:23 +0200)
 ----------------------------------------------------------------
 Block layer patches:
-- auto-read-only option to fix commit job when used with -blockdev
+- file-posix: Fix max transfer length for non-SCSI-passthrough
-- Fix help text related qemu-iotests failure (by improving the help text
+- iotests: Fix 082 reference output
   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):
+Eric Blake (1):
-      block: replace "discard" literal with BDRV_OPT_DISCARD macro
+      iotests: Update 082 expected output
       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):
+Maxim Levitsky (1):
-      iotests: make 083 specific to raw
+      file-posix: Use max transfer length/segment count only for SCSI passthrough
-Daniel P. Berrangé (1):
+ block/file-posix.c         | 54 ++++++++++++++++++++++++----------------------
-      crypto: initialize sector size even when opening with no IO flag
+ tests/qemu-iotests/082.out | 54 +++++++++++++++++++++++-----------------------
 files changed, 55 insertions(+), 53 deletions(-)
-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 06/36] block/qcow2-bitmap: 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/qcow2-bitmap.c | 24 ++++++++++++------------
-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)
---
-.19.1

-[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 09/36] block: change some function return type to bool
+Deleted patch
-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 ++++----
-files changed, 7 insertions(+), 7 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);
--int blk_is_sg(BlockBackend *blk);
--int blk_enable_write_cache(BlockBackend *blk);
-+bool blk_is_read_only(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);
- 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)
- {
-     BlockDriverState *bs = blk_bs(blk);
-@@ -XXX,XX +XXX,XX @@ int blk_is_read_only(BlockBackend *blk)
-     }
- }
--int blk_is_sg(BlockBackend *blk)
-+bool blk_is_sg(BlockBackend *blk)
- {
-     BlockDriverState *bs = blk_bs(blk);
-     if (!bs) {
--        return 0;
-+        return false;
-     }
-     return bdrv_is_sg(bs);
- }
--int blk_enable_write_cache(BlockBackend *blk)
-+bool blk_enable_write_cache(BlockBackend *blk)
- {
-     return blk->enable_write_cache;
- }
---
-.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 14/36] quorum: Remove quorum_err()
+Deleted patch
-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 +++++-------------------
-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;
-     }
---
-.19.1

-[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 16/36] iotest: Test the blkverify mode of the Quorum driver
+Deleted patch
-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 ++++++++++++++++
-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
---
-.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 30/36] option: Make option help nicer to read
+[Qemu-devel] [PULL 1/2] iotests: Update 082 expected output
-From: Max Reitz <mreitz@redhat.com>
+From: Eric Blake <eblake@redhat.com>
-This adds some whitespace into the option help (including indentation)
+A recent tweak to the '-o help' output for qemu-img needs to be
-and puts angle brackets around the type names.  Furthermore, the list
+reflected into the iotests expected outputs.
-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.
+Fixes: f7077c98
+Reported-by: Kevin Wolf <kwolf@redhat.com>
-This patch also restores the description alignment we had before commit
+Signed-off-by: Eric Blake <eblake@redhat.com>
-cbef9d68ee1d8d0, just at 24 instead of 16 characters like we used to.
+Reviewed-by: John Snow <jsnow@redhat.com>
 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 +-
+ tests/qemu-iotests/082.out | 54 +++++++++++++++++++-------------------
- qemu-img.c                 |   4 +-
+file changed, 27 insertions(+), 27 deletions(-)
- 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
+@@ -XXX,XX +XXX,XX @@ Supported options:
+   backing_file=<str>     - File name of a base image
- Testing: create -f qcow2 -o help TEST_DIR/t.qcow2 128M
+   backing_fmt=<str>      - Image format of the base image
- Supported options:
+   cluster_size=<size>    - qcow2 cluster size
--size             Virtual disk size
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
--compat           Compatibility level (0.10 or 1.1)
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
--backing_file     File name of a base image
+   data_file=<str>        - File name of an external data file
--backing_fmt      Image format of the base image
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
+@@ -XXX,XX +XXX,XX @@ Supported options:
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
+   backing_file=<str>     - File name of a base image
--encrypt.cipher-alg Name of encryption cipher algorithm
+   backing_fmt=<str>      - Image format of the base image
--encrypt.cipher-mode Name of encryption cipher mode
+   cluster_size=<size>    - qcow2 cluster size
--encrypt.ivgen-alg Name of IV generator algorithm
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
--encrypt.hash-alg Name of encryption hash algorithm
+   data_file=<str>        - File name of an external data file
--encrypt.iter-time Time to spend in PBKDF in milliseconds
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
--cluster_size     qcow2 cluster size
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
+@@ -XXX,XX +XXX,XX @@ Supported options:
--lazy_refcounts   Postpone refcount updates
+   backing_file=<str>     - File name of a base image
--refcount_bits    Width of a reference count entry in bits
+   backing_fmt=<str>      - Image format of the base image
--nocow            Turn off copy-on-write (valid only on btrfs)
+   cluster_size=<size>    - qcow2 cluster size
-+  backing_file=<str>     - File name of a base image
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  backing_fmt=<str>      - Image format of the base image
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
-+  cluster_size=<size>    - qcow2 cluster size
+   data_file=<str>        - File name of an external data file
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+@@ -XXX,XX +XXX,XX @@ Supported options:
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+   backing_file=<str>     - File name of a base image
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+   backing_fmt=<str>      - Image format of the base image
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+   cluster_size=<size>    - qcow2 cluster size
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+   data_file=<str>        - File name of an external data file
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+@@ -XXX,XX +XXX,XX @@ Supported options:
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+   backing_file=<str>     - File name of a base image
-+  refcount_bits=<num>    - Width of a reference count entry in bits
+   backing_fmt=<str>      - Image format of the base image
-+  size=<size>            - Virtual disk size
+   cluster_size=<size>    - qcow2 cluster size
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
- Testing: create -f qcow2 -o ? TEST_DIR/t.qcow2 128M
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
- Supported options:
+   data_file=<str>        - File name of an external data file
--size             Virtual disk size
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
--compat           Compatibility level (0.10 or 1.1)
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
--backing_file     File name of a base image
+@@ -XXX,XX +XXX,XX @@ Supported options:
--backing_fmt      Image format of the base image
+   backing_file=<str>     - File name of a base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+   backing_fmt=<str>      - Image format of the base image
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
+   cluster_size=<size>    - qcow2 cluster size
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
--encrypt.cipher-alg Name of encryption cipher algorithm
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
--encrypt.cipher-mode Name of encryption cipher mode
+   data_file=<str>        - File name of an external data file
--encrypt.ivgen-alg Name of IV generator algorithm
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
--encrypt.hash-alg Name of encryption hash algorithm
+@@ -XXX,XX +XXX,XX @@ Supported options:
--encrypt.iter-time Time to spend in PBKDF in milliseconds
+   backing_file=<str>     - File name of a base image
--cluster_size     qcow2 cluster size
+   backing_fmt=<str>      - Image format of the base image
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
+   cluster_size=<size>    - qcow2 cluster size
--lazy_refcounts   Postpone refcount updates
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
--refcount_bits    Width of a reference count entry in bits
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
--nocow            Turn off copy-on-write (valid only on btrfs)
+   data_file=<str>        - File name of an external data file
-+  backing_file=<str>     - File name of a base image
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
-+  backing_fmt=<str>      - Image format of the base image
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  cluster_size=<size>    - qcow2 cluster size
+@@ -XXX,XX +XXX,XX @@ Supported options:
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
+   backing_file=<str>     - File name of a base image
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+   backing_fmt=<str>      - Image format of the base image
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+   cluster_size=<size>    - qcow2 cluster size
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+   data_file=<str>        - File name of an external data file
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+@@ -XXX,XX +XXX,XX @@ Supported qcow2 options:
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+   backing_file=<str>     - File name of a base image
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+   backing_fmt=<str>      - Image format of the base image
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+   cluster_size=<size>    - qcow2 cluster size
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
-+  size=<size>            - Virtual disk size
+   data_file=<str>        - File name of an external data file
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
- Testing: create -f qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2 128M
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
- Supported options:
+@@ -XXX,XX +XXX,XX @@ Supported options:
--size             Virtual disk size
+   backing_file=<str>     - File name of a base image
--compat           Compatibility level (0.10 or 1.1)
+   backing_fmt=<str>      - Image format of the base image
--backing_file     File name of a base image
+   cluster_size=<size>    - qcow2 cluster size
--backing_fmt      Image format of the base image
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
+   data_file=<str>        - File name of an external data file
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
--encrypt.cipher-alg Name of encryption cipher algorithm
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
+@@ -XXX,XX +XXX,XX @@ Supported options:
--encrypt.ivgen-alg Name of IV generator algorithm
+   backing_file=<str>     - File name of a base image
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
+   backing_fmt=<str>      - Image format of the base image
--encrypt.hash-alg Name of encryption hash algorithm
+   cluster_size=<size>    - qcow2 cluster size
--encrypt.iter-time Time to spend in PBKDF in milliseconds
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
--cluster_size     qcow2 cluster size
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
+   data_file=<str>        - File name of an external data file
--lazy_refcounts   Postpone refcount updates
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
--refcount_bits    Width of a reference count entry in bits
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
--nocow            Turn off copy-on-write (valid only on btrfs)
+@@ -XXX,XX +XXX,XX @@ Supported options:
-+  backing_file=<str>     - File name of a base image
+   backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
+   backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
+   cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+   data_file=<str>        - File name of an external data file
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+@@ -XXX,XX +XXX,XX @@ Supported options:
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+   backing_file=<str>     - File name of a base image
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+   backing_fmt=<str>      - Image format of the base image
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+   cluster_size=<size>    - qcow2 cluster size
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+   data_file=<str>        - File name of an external data file
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
-+  refcount_bits=<num>    - Width of a reference count entry in bits
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  size=<size>            - Virtual disk size
+@@ -XXX,XX +XXX,XX @@ Supported options:
+   backing_file=<str>     - File name of a base image
- Testing: create -f qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2 128M
+   backing_fmt=<str>      - Image format of the base image
- Supported options:
+   cluster_size=<size>    - qcow2 cluster size
--size             Virtual disk size
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
--compat           Compatibility level (0.10 or 1.1)
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
--backing_file     File name of a base image
+   data_file=<str>        - File name of an external data file
--backing_fmt      Image format of the base image
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
+@@ -XXX,XX +XXX,XX @@ Supported options:
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
+   backing_file=<str>     - File name of a base image
--encrypt.cipher-alg Name of encryption cipher algorithm
+   backing_fmt=<str>      - Image format of the base image
--encrypt.cipher-mode Name of encryption cipher mode
+   cluster_size=<size>    - qcow2 cluster size
--encrypt.ivgen-alg Name of IV generator algorithm
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
--encrypt.hash-alg Name of encryption hash algorithm
+   data_file=<str>        - File name of an external data file
--encrypt.iter-time Time to spend in PBKDF in milliseconds
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
--cluster_size     qcow2 cluster size
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
+@@ -XXX,XX +XXX,XX @@ Supported options:
--lazy_refcounts   Postpone refcount updates
+   backing_file=<str>     - File name of a base image
--refcount_bits    Width of a reference count entry in bits
+   backing_fmt=<str>      - Image format of the base image
--nocow            Turn off copy-on-write (valid only on btrfs)
+   cluster_size=<size>    - qcow2 cluster size
-+  backing_file=<str>     - File name of a base image
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  backing_fmt=<str>      - Image format of the base image
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
-+  cluster_size=<size>    - qcow2 cluster size
+   data_file=<str>        - File name of an external data file
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+@@ -XXX,XX +XXX,XX @@ Supported options:
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+   backing_file=<str>     - File name of a base image
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+   backing_fmt=<str>      - Image format of the base image
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+   cluster_size=<size>    - qcow2 cluster size
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+   data_file=<str>        - File name of an external data file
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+@@ -XXX,XX +XXX,XX @@ Supported qcow2 options:
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+   backing_file=<str>     - File name of a base image
-+  refcount_bits=<num>    - Width of a reference count entry in bits
+   backing_fmt=<str>      - Image format of the base image
-+  size=<size>            - Virtual disk size
+   cluster_size=<size>    - qcow2 cluster size
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
- Testing: create -f qcow2 -o help,cluster_size=4k TEST_DIR/t.qcow2 128M
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
- Supported options:
+   data_file=<str>        - File name of an external data file
--size             Virtual disk size
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
--compat           Compatibility level (0.10 or 1.1)
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
--backing_file     File name of a base image
+@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
--backing_fmt      Image format of the base image
+   backing_file=<str>     - File name of a base image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+   backing_fmt=<str>      - Image format of the base image
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
+   cluster_size=<size>    - qcow2 cluster size
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
--encrypt.cipher-alg Name of encryption cipher algorithm
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
--encrypt.cipher-mode Name of encryption cipher mode
+   data_file=<str>        - File name of an external data file
--encrypt.ivgen-alg Name of IV generator algorithm
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
--encrypt.hash-alg Name of encryption hash algorithm
+@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
--encrypt.iter-time Time to spend in PBKDF in milliseconds
+   backing_file=<str>     - File name of a base image
--cluster_size     qcow2 cluster size
+   backing_fmt=<str>      - Image format of the base image
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
+   cluster_size=<size>    - qcow2 cluster size
--lazy_refcounts   Postpone refcount updates
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
--refcount_bits    Width of a reference count entry in bits
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
--nocow            Turn off copy-on-write (valid only on btrfs)
+   data_file=<str>        - File name of an external data file
-+  backing_file=<str>     - File name of a base image
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
-+  backing_fmt=<str>      - Image format of the base image
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  cluster_size=<size>    - qcow2 cluster size
+@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
+   backing_file=<str>     - File name of a base image
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
+   backing_fmt=<str>      - Image format of the base image
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+   cluster_size=<size>    - qcow2 cluster size
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+   data_file=<str>        - File name of an external data file
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+   backing_file=<str>     - File name of a base image
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
+   backing_fmt=<str>      - Image format of the base image
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+   cluster_size=<size>    - qcow2 cluster size
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  refcount_bits=<num>    - Width of a reference count entry in bits
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
-+  size=<size>            - Virtual disk size
+   data_file=<str>        - File name of an external data file
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
- Testing: create -f qcow2 -o ?,cluster_size=4k TEST_DIR/t.qcow2 128M
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
- Supported options:
+@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
--size             Virtual disk size
+   backing_file=<str>     - File name of a base image
--compat           Compatibility level (0.10 or 1.1)
+   backing_fmt=<str>      - Image format of the base image
--backing_file     File name of a base image
+   cluster_size=<size>    - qcow2 cluster size
--backing_fmt      Image format of the base image
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
--encrypt.format   Encrypt the image, format choices: 'aes', 'luks'
+   data_file=<str>        - File name of an external data file
--encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
--encrypt.cipher-alg Name of encryption cipher algorithm
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
--encrypt.cipher-mode Name of encryption cipher mode
+@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
--encrypt.ivgen-alg Name of IV generator algorithm
+   backing_file=<str>     - File name of a base image
--encrypt.ivgen-hash-alg Name of IV generator hash algorithm
+   backing_fmt=<str>      - Image format of the base image
--encrypt.hash-alg Name of encryption hash algorithm
+   cluster_size=<size>    - qcow2 cluster size
--encrypt.iter-time Time to spend in PBKDF in milliseconds
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
--cluster_size     qcow2 cluster size
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
--preallocation    Preallocation mode (allowed values: off, metadata, falloc, full)
+   data_file=<str>        - File name of an external data file
--lazy_refcounts   Postpone refcount updates
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
--refcount_bits    Width of a reference count entry in bits
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
--nocow            Turn off copy-on-write (valid only on btrfs)
+@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
-+  backing_file=<str>     - File name of a base image
+   backing_file=<str>     - File name of a base image
-+  backing_fmt=<str>      - Image format of the base image
+   backing_fmt=<str>      - Image format of the base image
-+  cluster_size=<size>    - qcow2 cluster size
+   cluster_size=<size>    - qcow2 cluster size
-+  compat=<str>           - Compatibility level (0.10 or 1.1)
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
-+  encrypt.cipher-mode=<str> - Name of encryption cipher mode
+   data_file=<str>        - File name of an external data file
-+  encrypt.format=<str>   - Encrypt the image, format choices: 'aes', 'luks'
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
-+  encrypt.hash-alg=<str> - Name of encryption hash algorithm
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
+@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
-+  encrypt.ivgen-alg=<str> - Name of IV generator algorithm
+   backing_file=<str>     - File name of a base image
-+  encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
+   backing_fmt=<str>      - Image format of the base image
-+  encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
+   cluster_size=<size>    - qcow2 cluster size
-+  encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
-+  lazy_refcounts=<bool (on/off)> - Postpone refcount updates
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
-+  nocow=<bool (on/off)>  - Turn off copy-on-write (valid only on btrfs)
+   data_file=<str>        - File name of an external data file
-+  preallocation=<str>    - Preallocation mode (allowed values: off, metadata, falloc, full)
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
-+  refcount_bits=<num>    - Width of a reference count entry in bits
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-+  size=<size>            - Virtual disk size
+@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
+   backing_file=<str>     - File name of a base image
- Testing: create -f qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2 128M
+   backing_fmt=<str>      - Image format of the base image
- Supported options:
+   cluster_size=<size>    - qcow2 cluster size
--size             Virtual disk size
+-  compat=<str>           - Compatibility level (0.10 or 1.1)
--compat           Compatibility level (0.10 or 1.1)
++  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
--backing_file     File name of a base image
+   data_file=<str>        - File name of an external data file
--backing_fmt      Image format of the base image
+   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
--encryption       Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
 -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
+.20.1

-[Qemu-devel] [PULL 22/36] block: Require auto-read-only for existing fallbacks
+[Qemu-devel] [PULL 2/2] file-posix: Use max transfer length/segment count only for SCSI passthrough
-Some block drivers have traditionally changed their node to read-only
+From: Maxim Levitsky <mlevitsk@redhat.com>
 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
+Regular kernel block devices (/dev/sda*, /dev/nvme*, etc) don't have
-the option.
+max segment size/max segment count hardware requirements exposed
 to the userspace, but rather the kernel block layer
 takes care to split the incoming requests that
 violate these requirements.
-This is the only use of bdrv_set_read_only(), so we can make it a bit
+Allowing the kernel to do the splitting allows qemu to avoid
-more specific and turn it into a bdrv_apply_auto_read_only() that is
+various overheads that arise otherwise from this.
 more convenient for drivers to use.
+This is especially visible in nbd server,
+exposing as a raw file, a mostly empty qcow2 image over the net.
+In this case most of the reads by the remote user
+won't even hit the underlying kernel block device,
+and therefore most of the  overhead will be in the
+nbd traffic which increases significantly with lower max transfer size.
+In addition to that even for local block device
+access the peformance improves a bit due to less
+traffic between qemu and the kernel when large
+transfer sizes are used (e.g for image conversion)
+More info can be found at:
+https://bugzilla.redhat.com/show_bug.cgi?id=1647104
+Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+Reviewed-by: Pankaj Gupta <pagupta@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
 ---
- include/block/block.h |  3 ++-
+ block/file-posix.c | 54 ++++++++++++++++++++++++----------------------
- block.c               | 42 +++++++++++++++++++++++++++---------------
+file changed, 28 insertions(+), 26 deletions(-)
  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
+diff --git a/block/file-posix.c b/block/file-posix.c
 index XXXXXXX..XXXXXXX 100644
---- a/include/block/block.h
+--- a/block/file-posix.c
-+++ b/include/block/block.h
++++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
+@@ -XXX,XX +XXX,XX @@ static void raw_reopen_abort(BDRVReopenState *state)
- bool bdrv_is_read_only(BlockDriverState *bs);
+     s->reopen_state = NULL;
  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)
+-static int hdev_get_max_transfer_length(BlockDriverState *bs, int fd)
-- * Block drivers are not supposed to automatically change bs->read_only.
++static int sg_get_max_transfer_length(int fd)
 - * 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;
+ #ifdef BLKSECTGET
+     int max_bytes = 0;
--    ret = bdrv_can_set_read_only(bs, read_only, false, errp);
+-    short max_sectors = 0;
--    if (ret < 0) {
+-    if (bs->sg && ioctl(fd, BLKSECTGET, &max_bytes) == 0) {
--        return ret;
++
-+    if (!(bs->open_flags & BDRV_O_RDWR)) {
++    if (ioctl(fd, BLKSECTGET, &max_bytes) == 0) {
-+        return 0;
+         return max_bytes;
 -    } else if (!bs->sg && ioctl(fd, BLKSECTGET, &max_sectors) == 0) {
 -        return max_sectors << BDRV_SECTOR_BITS;
      } else {
          return -errno;
      }
@@ -XXX,XX +XXX,XX @@ static int hdev_get_max_transfer_length(BlockDriverState *bs, int fd)
  #endif
  }
 -static int hdev_get_max_segments(const struct stat *st)
 +static int sg_get_max_segments(int fd)
  {
  #ifdef CONFIG_LINUX
      char buf[32];
      const char *end;
 -    char *sysfspath;
 +    char *sysfspath = NULL;
      int ret;
 -    int fd = -1;
 +    int sysfd = -1;
      long max_segments;
 +    struct stat st;
 +
 +    if (fstat(fd, &st)) {
 +        ret = -errno;
 +        goto out;
 +    }
-+    if (!(bs->open_flags & BDRV_O_AUTO_RDONLY)) {
-+        goto fail;
+     sysfspath = g_strdup_printf("/sys/dev/block/%u:%u/queue/max_segments",
 -                                major(st->st_rdev), minor(st->st_rdev));
 -    fd = open(sysfspath, O_RDONLY);
 -    if (fd == -1) {
 +                                major(st.st_rdev), minor(st.st_rdev));
 +    sysfd = open(sysfspath, O_RDONLY);
 +    if (sysfd == -1) {
          ret = -errno;
          goto out;
      }
+     do {
--    bs->read_only = read_only;
+-        ret = read(fd, buf, sizeof(buf) - 1);
--
++        ret = read(sysfd, buf, sizeof(buf) - 1);
--    if (read_only) {
+     } while (ret == -1 && errno == EINTR);
--        bs->open_flags &= ~BDRV_O_RDWR;
+     if (ret < 0) {
--    } else {
+         ret = -errno;
--        bs->open_flags |= BDRV_O_RDWR;
+@@ -XXX,XX +XXX,XX @@ static int hdev_get_max_segments(const struct stat *st)
 +    ret = bdrv_can_set_read_only(bs, true, false, NULL);
 +    if (ret < 0) {
 +        goto fail;
      }
-+    bs->read_only = true;
+ out:
-+    bs->open_flags &= ~BDRV_O_RDWR;
+-    if (fd != -1) {
 -        close(fd);
 +    if (sysfd != -1) {
 +        close(sysfd);
      }
      g_free(sysfspath);
      return ret;
@@ -XXX,XX +XXX,XX @@ out:
  static void raw_refresh_limits(BlockDriverState *bs, Error **errp)
  {
      BDRVRawState *s = bs->opaque;
 -    struct stat st;
 -    if (!fstat(s->fd, &st)) {
 -        if (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode)) {
 -            int ret = hdev_get_max_transfer_length(bs, s->fd);
 -            if (ret > 0 && ret <= BDRV_REQUEST_MAX_BYTES) {
 -                bs->bl.max_transfer = pow2floor(ret);
 -            }
 -            ret = hdev_get_max_segments(&st);
 -            if (ret > 0) {
 -                bs->bl.max_transfer = MIN(bs->bl.max_transfer,
 -                                          ret * getpagesize());
 -            }
 +    if (bs->sg) {
 +        int ret = sg_get_max_transfer_length(s->fd);
 +
-     return 0;
++        if (ret > 0 && ret <= BDRV_REQUEST_MAX_BYTES) {
 +            bs->bl.max_transfer = pow2floor(ret);
 +        }
 +
-+fail:
++        ret = sg_get_max_segments(s->fd);
-+    error_setg(errp, "%s", errmsg ?: "Image is read-only");
++        if (ret > 0) {
-+    return -EACCES;
++            bs->bl.max_transfer = MIN(bs->bl.max_transfer, ret * getpagesize());
  }
  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
+.20.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 29/36] qemu-iotests: Test auto-read-only with -drive and -blockdev
+Deleted patch
-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 +
-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 @@
-auto quick
-auto quick
-auto quick
-+232 auto quick
---
-.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
+Deleted patch
-From: Max Reitz <mreitz@redhat.com>
-There is no good reason why there should be a newline in this
-description, so remove it.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- vl.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/vl.c b/vl.c
-index XXXXXXX..XXXXXXX 100644
---- a/vl.c
-+++ b/vl.c
-@@ -XXX,XX +XXX,XX @@ static QemuOptsList qemu_fw_cfg_opts = {
-         }, {
-             .name = "file",
-             .type = QEMU_OPT_STRING,
--            .help = "Sets the name of the file from which\n"
-+            .help = "Sets the name of the file from which "
-                     "the fw_cfg blob will be loaded",
-         }, {
-             .name = "string",
---
-.19.1

-[Qemu-devel] [PULL 35/36] vdi: Use a literal number of bytes for DEFAULT_CLUSTER_SIZE
+Deleted patch
-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 ++--
-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;
---
-.19.1

-[Qemu-devel] [PULL 36/36] include: Add a comment to explain the origin of sizes' lookup table
+Deleted patch
-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 ++++++++++++++++++
-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
---
-.19.1

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

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);
-int blk_is_sg(BlockBackend *blk);
-int blk_enable_write_cache(BlockBackend *blk);
+bool blk_is_read_only(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);
 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)
 {
     BlockDriverState *bs = blk_bs(blk);
 
@@ -XXX,XX +XXX,XX @@ int blk_is_read_only(BlockBackend *blk)
     }
 }
 
-int blk_is_sg(BlockBackend *blk)
+bool blk_is_sg(BlockBackend *blk)
 {
     BlockDriverState *bs = blk_bs(blk);
 
     if (!bs) {
-        return 0;
+        return false;
     }
 
     return bdrv_is_sg(bs);
 }
 
-int blk_enable_write_cache(BlockBackend *blk)
+bool blk_enable_write_cache(BlockBackend *blk)
 {
     return blk->enable_write_cache;
 }
-- 
2.19.1

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

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.1-20190712' into staging (2019-07-12 11:06:48 +0100)

are available in the Git repository at:

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

for you to fetch changes up to 867eccfed84f96b54f4a432c510a02c2ce03b430:

file-posix: Use max transfer length/segment count only for SCSI passthrough (2019-07-12 15:42:23 +0200)

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

- file-posix: Fix max transfer length for non-SCSI-passthrough
- iotests: Fix 082 reference output

----------------------------------------------------------------
Eric Blake (1):
      iotests: Update 082 expected output

Maxim Levitsky (1):
      file-posix: Use max transfer length/segment count only for SCSI passthrough

block/file-posix.c         | 54 ++++++++++++++++++++++++----------------------
 tests/qemu-iotests/082.out | 54 +++++++++++++++++++++++-----------------------
 2 files changed, 55 insertions(+), 53 deletions(-)

From: Eric Blake <eblake@redhat.com>

A recent tweak to the '-o help' output for qemu-img needs to be
reflected into the iotests expected outputs.

Fixes: f7077c98
Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/082.out | 54 +++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

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 @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported qcow2 options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Supported qcow2 options:
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
   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)
+  compat=<str>           - Compatibility level (v2 [0.10] or v3 [1.1])
   data_file=<str>        - File name of an external data file
   data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
   encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
-- 
2.20.1

From: Maxim Levitsky <mlevitsk@redhat.com>

Regular kernel block devices (/dev/sda*, /dev/nvme*, etc) don't have
max segment size/max segment count hardware requirements exposed
to the userspace, but rather the kernel block layer
takes care to split the incoming requests that
violate these requirements.

Allowing the kernel to do the splitting allows qemu to avoid
various overheads that arise otherwise from this.

This is especially visible in nbd server,
exposing as a raw file, a mostly empty qcow2 image over the net.
In this case most of the reads by the remote user
won't even hit the underlying kernel block device,
and therefore most of the  overhead will be in the
nbd traffic which increases significantly with lower max transfer size.

In addition to that even for local block device
access the peformance improves a bit due to less
traffic between qemu and the kernel when large
transfer sizes are used (e.g for image conversion)

More info can be found at:
https://bugzilla.redhat.com/show_bug.cgi?id=1647104

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Pankaj Gupta <pagupta@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/file-posix.c | 54 ++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 26 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 void raw_reopen_abort(BDRVReopenState *state)
     s->reopen_state = NULL;
 }
 
-static int hdev_get_max_transfer_length(BlockDriverState *bs, int fd)
+static int sg_get_max_transfer_length(int fd)
 {
 #ifdef BLKSECTGET
     int max_bytes = 0;
-    short max_sectors = 0;
-    if (bs->sg && ioctl(fd, BLKSECTGET, &max_bytes) == 0) {
+
+    if (ioctl(fd, BLKSECTGET, &max_bytes) == 0) {
         return max_bytes;
-    } else if (!bs->sg && ioctl(fd, BLKSECTGET, &max_sectors) == 0) {
-        return max_sectors << BDRV_SECTOR_BITS;
     } else {
         return -errno;
     }
@@ -XXX,XX +XXX,XX @@ static int hdev_get_max_transfer_length(BlockDriverState *bs, int fd)
 #endif
 }
 
-static int hdev_get_max_segments(const struct stat *st)
+static int sg_get_max_segments(int fd)
 {
 #ifdef CONFIG_LINUX
     char buf[32];
     const char *end;
-    char *sysfspath;
+    char *sysfspath = NULL;
     int ret;
-    int fd = -1;
+    int sysfd = -1;
     long max_segments;
+    struct stat st;
+
+    if (fstat(fd, &st)) {
+        ret = -errno;
+        goto out;
+    }
 
     sysfspath = g_strdup_printf("/sys/dev/block/%u:%u/queue/max_segments",
-                                major(st->st_rdev), minor(st->st_rdev));
-    fd = open(sysfspath, O_RDONLY);
-    if (fd == -1) {
+                                major(st.st_rdev), minor(st.st_rdev));
+    sysfd = open(sysfspath, O_RDONLY);
+    if (sysfd == -1) {
         ret = -errno;
         goto out;
     }
     do {
-        ret = read(fd, buf, sizeof(buf) - 1);
+        ret = read(sysfd, buf, sizeof(buf) - 1);
     } while (ret == -1 && errno == EINTR);
     if (ret < 0) {
         ret = -errno;
@@ -XXX,XX +XXX,XX @@ static int hdev_get_max_segments(const struct stat *st)
     }
 
 out:
-    if (fd != -1) {
-        close(fd);
+    if (sysfd != -1) {
+        close(sysfd);
     }
     g_free(sysfspath);
     return ret;
@@ -XXX,XX +XXX,XX @@ out:
 static void raw_refresh_limits(BlockDriverState *bs, Error **errp)
 {
     BDRVRawState *s = bs->opaque;
-    struct stat st;
 
-    if (!fstat(s->fd, &st)) {
-        if (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode)) {
-            int ret = hdev_get_max_transfer_length(bs, s->fd);
-            if (ret > 0 && ret <= BDRV_REQUEST_MAX_BYTES) {
-                bs->bl.max_transfer = pow2floor(ret);
-            }
-            ret = hdev_get_max_segments(&st);
-            if (ret > 0) {
-                bs->bl.max_transfer = MIN(bs->bl.max_transfer,
-                                          ret * getpagesize());
-            }
+    if (bs->sg) {
+        int ret = sg_get_max_transfer_length(s->fd);
+
+        if (ret > 0 && ret <= BDRV_REQUEST_MAX_BYTES) {
+            bs->bl.max_transfer = pow2floor(ret);
+        }
+
+        ret = sg_get_max_segments(s->fd);
+        if (ret > 0) {
+            bs->bl.max_transfer = MIN(bs->bl.max_transfer, ret * getpagesize());
         }
     }
 
-- 
2.20.1