Accepting request 955876 from home:lizhang:branches:Virtualization

Backport patches related with iotest from upstream
* Patches added:
  block-backend-Retain-permissions-after-m.patch
  iotest-065-explicit-compression-type.patch
  iotest-214-explicit-compression-type.patch
  iotest-302-use-img_info_log-helper.patch
  iotest-303-explicit-compression-type.patch
  iotest-39-use-_qcow2_dump_header.patch
  iotests-60-more-accurate-set-dirty-bit-i.patch
  iotests-bash-tests-filter-compression-ty.patch
  iotests-common.rc-introduce-_qcow2_dump_.patch
  iotests-declare-lack-of-support-for-comp.patch
  iotests-drop-qemu_img_verbose-helper.patch
  iotests-massive-use-_qcow2_dump_header.patch
  iotests-MRCE-Write-data-to-source.patch
  iotests.py-filter-out-successful-output-.patch
  iotests.py-img_info_log-rename-imgopts-a.patch
  iotests.py-implement-unsupported_imgopts.patch
  iotests.py-qemu_img-create-support-IMGOP.patch
  iotests.py-rewrite-default-luks-support-.patch
  iotests-specify-some-unsupported_imgopts.patch
  qcow2-simple-case-support-for-downgradin.patch
  tests-qemu-iotests-Fix-051-for-binaries-.patch

OBS-URL: https://build.opensuse.org/request/show/955876
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=690

block-backend-Retain-permissions-after-m.patch

@@ -0,0 +1,72 @@
+From: Hanna Reitz <hreitz@redhat.com>
+Date: Thu, 25 Nov 2021 14:53:16 +0100
+Subject: block-backend: Retain permissions after migration
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Git-commit: 492a119610129f65217580790971fa038e5492d3
+
+After migration, the permissions the guest device wants to impose on its
+BlockBackend are stored in blk->perm and blk->shared_perm.  In
+blk_root_activate(), we take our permissions, but keep all shared
+permissions open by calling `blk_set_perm(blk->perm, BLK_PERM_ALL)`.
+
+Only afterwards (immediately or later, depending on the runstate) do we
+restrict the shared permissions by calling
+`blk_set_perm(blk->perm, blk->shared_perm)`.  Unfortunately, our first
+call with shared_perm=BLK_PERM_ALL has overwritten blk->shared_perm to
+be BLK_PERM_ALL, so this is a no-op and the set of shared permissions is
+not restricted.
+
+Fix this bug by saving the set of shared permissions before invoking
+blk_set_perm() with BLK_PERM_ALL and restoring it afterwards.
+
+Fixes: 5f7772c4d0cf32f4e779fcd5a69ae4dae24aeebf
+       ("block-backend: Defer shared_perm tightening migration
+       completion")
+Reported-by: Peng Liang <liangpeng10@huawei.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Message-Id: <20211125135317.186576-2-hreitz@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Tested-by: Peng Liang <liangpeng10@huawei.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ block/block-backend.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/block/block-backend.c b/block/block-backend.c
+index 12ef80ea170c04a15500b42bc5e7..41e388fe1f30af8f3cf6a872b37a 100644
+--- a/block/block-backend.c
++++ b/block/block-backend.c
+@@ -190,6 +190,7 @@ static void blk_root_activate(BdrvChild *child, Error **errp)
+ {
+     BlockBackend *blk = child->opaque;
+     Error *local_err = NULL;
++    uint64_t saved_shared_perm;
+ 
+     if (!blk->disable_perm) {
+         return;
+@@ -197,12 +198,22 @@ static void blk_root_activate(BdrvChild *child, Error **errp)
+ 
+     blk->disable_perm = false;
+ 
++    /*
++     * blk->shared_perm contains the permissions we want to share once
++     * migration is really completely done.  For now, we need to share
++     * all; but we also need to retain blk->shared_perm, which is
++     * overwritten by a successful blk_set_perm() call.  Save it and
++     * restore it below.
++     */
++    saved_shared_perm = blk->shared_perm;
++
+     blk_set_perm(blk, blk->perm, BLK_PERM_ALL, &local_err);
+     if (local_err) {
+         error_propagate(errp, local_err);
+         blk->disable_perm = true;
+         return;
+     }
++    blk->shared_perm = saved_shared_perm;
+ 
+     if (runstate_check(RUN_STATE_INMIGRATE)) {
+         /* Activation can happen when migration process is still active, for

bundles.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a992b15dafd241028da10fd0b802efc72f2b5997c41d3ba07fce2eec7791baa
+oid sha256:c193bc35a37fe2cdcac868f1c4be435022839ea65dab738da7ad58ae0e173c9f
-size 47228
+size 74216

iotest-065-explicit-compression-type.patch

@@ -0,0 +1,78 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:33 +0100
+Subject: iotest 065: explicit compression type
+
+Git-commit: 12a936171d71f839dc907fff7887358a05ac20f8
+
+The test checks different options. It of course fails if set
+IMGOPTS='compression_type=zstd'. So, let's be explicit in what
+compression type we want and independent of IMGOPTS. Test both existing
+compression types.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Hanna Reitz <hreitz@redhat.com>
+Message-Id: <20211223160144.1097696-9-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/065 | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065
+index dc7716275f0d5e8b6aeb572244fb..f7c1b68dadbaf151781dfc031166 100755
+--- a/tests/qemu-iotests/065
++++ b/tests/qemu-iotests/065
+@@ -88,7 +88,7 @@ class TestQMP(TestImageInfoSpecific):
+ 
+ class TestQCow2(TestQemuImgInfo):
+     '''Testing a qcow2 version 2 image'''
+-    img_options = 'compat=0.10'
++    img_options = 'compat=0.10,compression_type=zlib'
+     json_compare = { 'compat': '0.10', 'refcount-bits': 16,
+                      'compression-type': 'zlib' }
+     human_compare = [ 'compat: 0.10', 'compression type: zlib',
+@@ -96,17 +96,17 @@ class TestQCow2(TestQemuImgInfo):
+ 
+ class TestQCow3NotLazy(TestQemuImgInfo):
+     '''Testing a qcow2 version 3 image with lazy refcounts disabled'''
+-    img_options = 'compat=1.1,lazy_refcounts=off'
++    img_options = 'compat=1.1,lazy_refcounts=off,compression_type=zstd'
+     json_compare = { 'compat': '1.1', 'lazy-refcounts': False,
+                      'refcount-bits': 16, 'corrupt': False,
+-                     'compression-type': 'zlib', 'extended-l2': False }
+-    human_compare = [ 'compat: 1.1', 'compression type: zlib',
++                     'compression-type': 'zstd', 'extended-l2': False }
++    human_compare = [ 'compat: 1.1', 'compression type: zstd',
+                       'lazy refcounts: false', 'refcount bits: 16',
+                       'corrupt: false', 'extended l2: false' ]
+ 
+ class TestQCow3Lazy(TestQemuImgInfo):
+     '''Testing a qcow2 version 3 image with lazy refcounts enabled'''
+-    img_options = 'compat=1.1,lazy_refcounts=on'
++    img_options = 'compat=1.1,lazy_refcounts=on,compression_type=zlib'
+     json_compare = { 'compat': '1.1', 'lazy-refcounts': True,
+                      'refcount-bits': 16, 'corrupt': False,
+                      'compression-type': 'zlib', 'extended-l2': False }
+@@ -117,7 +117,7 @@ class TestQCow3Lazy(TestQemuImgInfo):
+ class TestQCow3NotLazyQMP(TestQMP):
+     '''Testing a qcow2 version 3 image with lazy refcounts disabled, opening
+        with lazy refcounts enabled'''
+-    img_options = 'compat=1.1,lazy_refcounts=off'
++    img_options = 'compat=1.1,lazy_refcounts=off,compression_type=zlib'
+     qemu_options = 'lazy-refcounts=on'
+     compare = { 'compat': '1.1', 'lazy-refcounts': False,
+                 'refcount-bits': 16, 'corrupt': False,
+@@ -127,11 +127,11 @@ class TestQCow3NotLazyQMP(TestQMP):
+ class TestQCow3LazyQMP(TestQMP):
+     '''Testing a qcow2 version 3 image with lazy refcounts enabled, opening
+        with lazy refcounts disabled'''
+-    img_options = 'compat=1.1,lazy_refcounts=on'
++    img_options = 'compat=1.1,lazy_refcounts=on,compression_type=zstd'
+     qemu_options = 'lazy-refcounts=off'
+     compare = { 'compat': '1.1', 'lazy-refcounts': True,
+                 'refcount-bits': 16, 'corrupt': False,
+-                'compression-type': 'zlib', 'extended-l2': False }
++                'compression-type': 'zstd', 'extended-l2': False }
+ 
+ TestImageInfoSpecific = None
+ TestQemuImgInfo = None

iotest-214-explicit-compression-type.patch

@@ -0,0 +1,32 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:43 +0100
+Subject: iotest 214: explicit compression type
+
+Git-commit: da87d5f83a23dd9b252fabc7787383ce6d2454a3
+
+The test-case "Corrupted size field in compressed cluster descriptor"
+heavily depends on zlib compression type. So, make it explicit. This
+way test passes with IMGOPTS='compression_type=zstd'.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Max Reitz <mreitz@redhat.com>
+Message-Id: <20211223160144.1097696-19-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/214 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
+index 0889089d81cfa9375b5f4d30bfd5..c66e246ba248e221e59743b247e3 100755
+--- a/tests/qemu-iotests/214
++++ b/tests/qemu-iotests/214
+@@ -51,7 +51,7 @@ echo
+ # The L2 entries of the two compressed clusters are located at
+ # 0x800000 and 0x800008, their original values are 0x4008000000a00000
+ # and 0x4008000000a00802 (5 sectors for compressed data each).
+-_make_test_img 8M -o cluster_size=2M
++_make_test_img 8M -o cluster_size=2M,compression_type=zlib
+ $QEMU_IO -c "write -c -P 0x11 0 2M" -c "write -c -P 0x11 2M 2M" "$TEST_IMG" \
+          2>&1 | _filter_qemu_io | _filter_testdir
+ 

iotest-302-use-img_info_log-helper.patch

@@ -0,0 +1,82 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:36 +0100
+Subject: iotest 302: use img_info_log() helper
+
+Git-commit: c30175d6fbc73a86a8013da195471d1a3490178f
+
+Instead of qemu_img_log("info", ..) use generic helper img_info_log().
+
+img_info_log() has smarter logic. For example it use filter_img_info()
+to filter output, which in turns filter a compression type. So it will
+help us in future when we implement a possibility to use zstd
+compression by default (with help of some runtime config file or maybe
+build option). For now to test you should recompile qemu with a small
+addition into block/qcow2.c before
+"if (qcow2_opts->has_compression_type":
+
+    if (!qcow2_opts->has_compression_type && version >= 3) {
+        qcow2_opts->has_compression_type = true;
+        qcow2_opts->compression_type = QCOW2_COMPRESSION_TYPE_ZSTD;
+    }
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Max Reitz <mreitz@redhat.com>
+Message-Id: <20211223160144.1097696-12-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/302     | 4 +++-
+ tests/qemu-iotests/302.out | 7 +++----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/tests/qemu-iotests/302 b/tests/qemu-iotests/302
+index 5695af4914654f2a434391b6d31c..a6d79e727b55dd2d0d0e6fb28650 100755
+--- a/tests/qemu-iotests/302
++++ b/tests/qemu-iotests/302
+@@ -34,6 +34,7 @@ from iotests import (
+     qemu_img_measure,
+     qemu_io,
+     qemu_nbd_popen,
++    img_info_log,
+ )
+ 
+ iotests.script_initialize(supported_fmts=["qcow2"])
+@@ -88,6 +89,7 @@ with tarfile.open(tar_file, "w") as tar:
+             tar_file):
+ 
+         iotests.log("=== Target image info ===")
++        # Not img_info_log as it enforces imgfmt, but now we print info on raw
+         qemu_img_log("info", nbd_uri)
+ 
+         qemu_img(
+@@ -99,7 +101,7 @@ with tarfile.open(tar_file, "w") as tar:
+             nbd_uri)
+ 
+         iotests.log("=== Converted image info ===")
+-        qemu_img_log("info", nbd_uri)
++        img_info_log(nbd_uri)
+ 
+         iotests.log("=== Converted image check ===")
+         qemu_img_log("check", nbd_uri)
+diff --git a/tests/qemu-iotests/302.out b/tests/qemu-iotests/302.out
+index e2f6077e8330854905882a9175a8..3e7c281b9116e4b54a4d6834d9ef 100644
+--- a/tests/qemu-iotests/302.out
++++ b/tests/qemu-iotests/302.out
+@@ -6,14 +6,13 @@ virtual size: 448 KiB (458752 bytes)
+ disk size: unavailable
+ 
+ === Converted image info ===
+-image: nbd+unix:///exp?socket=SOCK_DIR/PID-nbd-sock
+-file format: qcow2
++image: TEST_IMG
++file format: IMGFMT
+ virtual size: 1 GiB (1073741824 bytes)
+-disk size: unavailable
+ cluster_size: 65536
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: false
+     refcount bits: 16
+     corrupt: false

iotest-303-explicit-compression-type.patch

@@ -0,0 +1,101 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:32 +0100
+Subject: iotest 303: explicit compression type
+
+Git-commit: 677e0bae686e7c670a71d1f6a491a7f06f77de73
+
+The test prints qcow2 header fields which depends on chosen compression
+type. So, let's be explicit in what compression type we want and
+independent of IMGOPTS. Test both existing compression types.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Max Reitz <mreitz@redhat.com>
+Message-Id: <20211223160144.1097696-8-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/303     | 25 ++++++++++++++++---------
+ tests/qemu-iotests/303.out | 30 +++++++++++++++++++++++++++++-
+ 2 files changed, 45 insertions(+), 10 deletions(-)
+
+diff --git a/tests/qemu-iotests/303 b/tests/qemu-iotests/303
+index 475cb5428db4f047b7db63776ca0..16c2e1082768f67c14c8665b2b2c 100755
+--- a/tests/qemu-iotests/303
++++ b/tests/qemu-iotests/303
+@@ -54,12 +54,19 @@ def add_bitmap(num, begin, end, disabled):
+     log('')
+ 
+ 
+-qemu_img_create('-f', iotests.imgfmt, disk, '10M')
+-
+-add_bitmap(1, 0, 6, False)
+-add_bitmap(2, 6, 8, True)
+-dump = ['./qcow2.py', disk, 'dump-header']
+-subprocess.run(dump)
+-# Dump the metadata in JSON format
+-dump.append('-j')
+-subprocess.run(dump)
++def test(compression_type: str, json_output: bool) -> None:
++    qemu_img_create('-f', iotests.imgfmt,
++                    '-o', f'compression_type={compression_type}',
++                    disk, '10M')
++    add_bitmap(1, 0, 6, False)
++    add_bitmap(2, 6, 8, True)
++
++    cmd = ['./qcow2.py', disk, 'dump-header']
++    if json_output:
++        cmd.append('-j')
++
++    subprocess.run(cmd)
++
++
++test('zlib', False)
++test('zstd', True)
+diff --git a/tests/qemu-iotests/303.out b/tests/qemu-iotests/303.out
+index 7c16998587840607918fd777fb99..b3c70827b74a253209527106a4a9 100644
+--- a/tests/qemu-iotests/303.out
++++ b/tests/qemu-iotests/303.out
+@@ -80,6 +80,34 @@ extra_data_size           0
+ Bitmap table   type            size         offset
+ 0              all-zeroes      0            0
+ 
++Add bitmap 1
++wrote 1048576/1048576 bytes at offset 0
++1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
++
++wrote 1048576/1048576 bytes at offset 1048576
++1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
++
++wrote 1048576/1048576 bytes at offset 2097152
++1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
++
++wrote 1048576/1048576 bytes at offset 3145728
++1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
++
++wrote 1048576/1048576 bytes at offset 4194304
++1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
++
++wrote 1048576/1048576 bytes at offset 5242880
++1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
++
++
++Add bitmap 2
++wrote 1048576/1048576 bytes at offset 6291456
++1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
++
++wrote 1048576/1048576 bytes at offset 7340032
++1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
++
++
+ {
+     "magic": 1363560955,
+     "version": 3,
+@@ -94,7 +122,7 @@ Bitmap table   type            size         offset
+     "refcount_table_clusters": 1,
+     "nb_snapshots": 0,
+     "snapshot_offset": 0,
+-    "incompatible_features": 0,
++    "incompatible_features": 8,
+     "compatible_features": 0,
+     "autoclear_features": 1,
+     "refcount_order": 4,

iotest-39-use-_qcow2_dump_header.patch

@@ -0,0 +1,31 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:40 +0100
+Subject: iotest 39: use _qcow2_dump_header
+
+Git-commit: 72be51ddb3d10974da5128ad20ee5ca7a13ddd54
+
+_qcow2_dump_header has filter for compression type, so this change
+makes test pass with IMGOPTS='compression_type=zstd'.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Max Reitz <mreitz@redhat.com>
+Message-Id: <20211223160144.1097696-16-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/039 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
+index 8e783a8380666f26d237c7233602..00d379cde259d64a46e2a49d9f20 100755
+--- a/tests/qemu-iotests/039
++++ b/tests/qemu-iotests/039
+@@ -142,7 +142,7 @@ $QEMU_IMG commit "$TEST_IMG"
+ 
+ # The dirty bit must not be set
+ _qcow2_dump_header | grep incompatible_features
+-$PYTHON qcow2.py "$TEST_IMG".base dump-header | grep incompatible_features
++_qcow2_dump_header "$TEST_IMG".base | grep incompatible_features
+ 
+ _check_test_img
+ TEST_IMG="$TEST_IMG".base _check_test_img

iotests-60-more-accurate-set-dirty-bit-i.patch

@@ -0,0 +1,31 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:42 +0100
+Subject: iotests 60: more accurate set dirty bit in qcow2 header
+
+Git-commit: 3a0e60a065ee32027684314a0d886d43bc6ce34b
+
+Don't touch other incompatible bits, like compression-type. This makes
+the test pass with IMGOPTS='compression_type=zstd'.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Max Reitz <mreitz@redhat.com>
+Message-Id: <20211223160144.1097696-18-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/060 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
+index d1e3204d4ea42002263486eebafd..df87d600f761d254cff3f371794e 100755
+--- a/tests/qemu-iotests/060
++++ b/tests/qemu-iotests/060
+@@ -326,7 +326,7 @@ _make_test_img 64M
+ # Let the refblock appear unaligned
+ poke_file "$TEST_IMG" "$rt_offset"        "\x00\x00\x00\x00\xff\xff\x2a\x00"
+ # Mark the image dirty, thus forcing an automatic check when opening it
+-poke_file "$TEST_IMG" 72 "\x00\x00\x00\x00\x00\x00\x00\x01"
++$PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 0
+ # Open the image (qemu should refuse to do so)
+ $QEMU_IO -c close "$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt
+ 

iotests-MRCE-Write-data-to-source.patch

@@ -0,0 +1,61 @@
+From: Hanna Reitz <hreitz@redhat.com>
+Date: Thu, 23 Dec 2021 17:53:08 +0100
+Subject: iotests/MRCE: Write data to source
+
+Git-commit: fc2c3996a59683685a663deb3af12183ad24e4a7
+
+This test assumes that mirror flushes the source when entering the READY
+state, and that the format level will pass that flush on to the protocol
+level (where we intercept it with blkdebug).
+
+However, apparently that does not happen when using a VMDK image with
+zeroed_grain=on, which actually is the default set by testenv.py.  Right
+now, Python tests ignore IMGOPTS, though, so this has no effect; but
+Vladimir has a series that will change this, so we need to fix this test
+before that series lands.
+
+We can fix it by writing data to the source before we start the mirror
+job; apparently that makes the (VMDK) format layer change its mind and
+pass on the pre-READY flush to the protocol level, so the test passes
+again.  (I presume, without any data written, mirror just does a 64M
+zero write on the target, which VMDK with zeroed_grain=on basically just
+ignores.)
+
+Without this, we do not get a flush, and so blkdebug only sees a single
+flush at the end of the job instead of two, and therefore does not
+inject an error, which makes the block job complete instead of raising
+an error.
+
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Message-Id: <20211223165308.103793-1-hreitz@redhat.com>
+Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/tests/mirror-ready-cancel-error | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tests/qemu-iotests/tests/mirror-ready-cancel-error b/tests/qemu-iotests/tests/mirror-ready-cancel-error
+index f2dc88881f9e530db250d78e6f41..770ffca37930faf779b67166a806 100755
+--- a/tests/qemu-iotests/tests/mirror-ready-cancel-error
++++ b/tests/qemu-iotests/tests/mirror-ready-cancel-error
+@@ -36,6 +36,11 @@ class TestMirrorReadyCancelError(iotests.QMPTestCase):
+         assert iotests.qemu_img_create('-f', iotests.imgfmt, target,
+                                        str(image_size)) == 0
+ 
++        # Ensure that mirror will copy something before READY so the
++        # target format layer will forward the pre-READY flush to its
++        # file child
++        assert iotests.qemu_io_silent('-c', 'write -P 1 0 64k', source) == 0
++
+         self.vm = iotests.VM()
+         self.vm.launch()
+ 
+@@ -97,7 +102,7 @@ class TestMirrorReadyCancelError(iotests.QMPTestCase):
+         # Write something so will not leave the job immediately, but
+         # flush first (which will fail, thanks to blkdebug)
+         res = self.vm.qmp('human-monitor-command',
+-                          command_line='qemu-io mirror-top "write 0 64k"')
++                          command_line='qemu-io mirror-top "write -P 2 0 64k"')
+         self.assert_qmp(res, 'return', '')
+ 
+         # Drain status change events

iotests-bash-tests-filter-compression-ty.patch

@@ -0,0 +1,288 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:41 +0100
+Subject: iotests: bash tests: filter compression type
+
+Git-commit: dba5aee4da9ce0a81e5a870c22a19926212dc87e
+
+We want iotests pass with both the default zlib compression and with
+IMGOPTS='compression_type=zstd'.
+
+Actually the only test that is interested in real compression type in
+test output is 287 (test for qcow2 compression type), so implement
+specific option for it.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Hanna Reitz <hreitz@redhat.com>
+Message-Id: <20211223160144.1097696-17-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/060.out       |  2 +-
+ tests/qemu-iotests/061.out       | 12 ++++++------
+ tests/qemu-iotests/082.out       | 14 +++++++-------
+ tests/qemu-iotests/198.out       |  4 ++--
+ tests/qemu-iotests/287           |  8 ++++----
+ tests/qemu-iotests/common.filter |  8 ++++++++
+ tests/qemu-iotests/common.rc     | 14 +++++++++++++-
+ 7 files changed, 41 insertions(+), 21 deletions(-)
+
+diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
+index b74540bafbe84ff721fc0197d21c..329977d9b9b9fb4ec94615fff0a8 100644
+--- a/tests/qemu-iotests/060.out
++++ b/tests/qemu-iotests/060.out
+@@ -17,7 +17,7 @@ virtual size: 64 MiB (67108864 bytes)
+ cluster_size: 65536
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: false
+     refcount bits: 16
+     corrupt: true
+diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
+index 7ecbd4dea875ea26e0b131ec2922..139fc68177de57e33567094b84d6 100644
+--- a/tests/qemu-iotests/061.out
++++ b/tests/qemu-iotests/061.out
+@@ -525,7 +525,7 @@ virtual size: 64 MiB (67108864 bytes)
+ cluster_size: 65536
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: false
+     refcount bits: 16
+     data file: TEST_DIR/t.IMGFMT.data
+@@ -552,7 +552,7 @@ virtual size: 64 MiB (67108864 bytes)
+ cluster_size: 65536
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: false
+     refcount bits: 16
+     data file: foo
+@@ -567,7 +567,7 @@ virtual size: 64 MiB (67108864 bytes)
+ cluster_size: 65536
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: false
+     refcount bits: 16
+     data file raw: false
+@@ -583,7 +583,7 @@ virtual size: 64 MiB (67108864 bytes)
+ cluster_size: 65536
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: false
+     refcount bits: 16
+     data file: TEST_DIR/t.IMGFMT.data
+@@ -597,7 +597,7 @@ virtual size: 64 MiB (67108864 bytes)
+ cluster_size: 65536
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: false
+     refcount bits: 16
+     data file: TEST_DIR/t.IMGFMT.data
+@@ -612,7 +612,7 @@ virtual size: 64 MiB (67108864 bytes)
+ cluster_size: 65536
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: false
+     refcount bits: 16
+     data file: TEST_DIR/t.IMGFMT.data
+diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
+index 077ed0f2c7d933034a50c50c5de6..d0dd333117a571063a035d7d5c31 100644
+--- a/tests/qemu-iotests/082.out
++++ b/tests/qemu-iotests/082.out
+@@ -17,7 +17,7 @@ virtual size: 128 MiB (134217728 bytes)
+ cluster_size: 4096
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: true
+     refcount bits: 16
+     corrupt: false
+@@ -31,7 +31,7 @@ virtual size: 128 MiB (134217728 bytes)
+ cluster_size: 8192
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: true
+     refcount bits: 16
+     corrupt: false
+@@ -329,7 +329,7 @@ virtual size: 128 MiB (134217728 bytes)
+ cluster_size: 4096
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: true
+     refcount bits: 16
+     corrupt: false
+@@ -342,7 +342,7 @@ virtual size: 128 MiB (134217728 bytes)
+ cluster_size: 8192
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: true
+     refcount bits: 16
+     corrupt: false
+@@ -639,7 +639,7 @@ virtual size: 128 MiB (134217728 bytes)
+ cluster_size: 65536
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: true
+     refcount bits: 16
+     corrupt: false
+@@ -652,7 +652,7 @@ virtual size: 130 MiB (136314880 bytes)
+ cluster_size: 65536
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: false
+     refcount bits: 16
+     corrupt: false
+@@ -665,7 +665,7 @@ virtual size: 132 MiB (138412032 bytes)
+ cluster_size: 65536
+ Format specific information:
+     compat: 1.1
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     lazy refcounts: true
+     refcount bits: 16
+     corrupt: false
+diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out
+index 3952708444799fede03c45cce0b7..805494916f102694a38729b8a217 100644
+--- a/tests/qemu-iotests/198.out
++++ b/tests/qemu-iotests/198.out
+@@ -36,7 +36,7 @@ image: json:{ /* filtered */ }
+ file format: IMGFMT
+ virtual size: 16 MiB (16777216 bytes)
+ Format specific information:
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     encrypt:
+         ivgen alg: plain64
+         hash alg: sha256
+@@ -81,7 +81,7 @@ virtual size: 16 MiB (16777216 bytes)
+ backing file: TEST_DIR/t.IMGFMT.base
+ backing file format: IMGFMT
+ Format specific information:
+-    compression type: zlib
++    compression type: COMPRESSION_TYPE
+     encrypt:
+         ivgen alg: plain64
+         hash alg: sha256
+diff --git a/tests/qemu-iotests/287 b/tests/qemu-iotests/287
+index 5427ad5456aba89d04e573758679..6414640b2121d6511d7dcb11cda1 100755
+--- a/tests/qemu-iotests/287
++++ b/tests/qemu-iotests/287
+@@ -61,13 +61,13 @@ echo
+ echo "=== Testing compression type incompatible bit setting for zlib ==="
+ echo
+ _make_test_img -o compression_type=zlib 64M
+-_qcow2_dump_header | grep incompatible_features
++_qcow2_dump_header --no-filter-compression | grep incompatible_features
+ 
+ echo
+ echo "=== Testing compression type incompatible bit setting for zstd ==="
+ echo
+ _make_test_img -o compression_type=zstd 64M
+-_qcow2_dump_header | grep incompatible_features
++_qcow2_dump_header --no-filter-compression | grep incompatible_features
+ 
+ echo
+ echo "=== Testing zlib with incompatible bit set ==="
+@@ -75,7 +75,7 @@ echo
+ _make_test_img -o compression_type=zlib 64M
+ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 3
+ # to make sure the bit was actually set
+-_qcow2_dump_header | grep incompatible_features
++_qcow2_dump_header --no-filter-compression | grep incompatible_features
+ 
+ if $QEMU_IMG info "$TEST_IMG" >/dev/null 2>&1 ; then
+     echo "Error: The image opened successfully. The image must not be opened."
+@@ -87,7 +87,7 @@ echo
+ _make_test_img -o compression_type=zstd 64M
+ $PYTHON qcow2.py "$TEST_IMG" set-header incompatible_features 0
+ # to make sure the bit was actually unset
+-_qcow2_dump_header | grep incompatible_features
++_qcow2_dump_header --no-filter-compression | grep incompatible_features
+ 
+ if $QEMU_IMG info "$TEST_IMG" >/dev/null 2>&1 ; then
+     echo "Error: The image opened successfully. The image must not be opened."
+diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
+index 2b2b53946c65d698c71520a163a8..75cc241580d0289c70d7761e9758 100644
+--- a/tests/qemu-iotests/common.filter
++++ b/tests/qemu-iotests/common.filter
+@@ -247,6 +247,7 @@ _filter_img_info()
+         -e "/block_state_zero: \\(on\\|off\\)/d" \
+         -e "/log_size: [0-9]\\+/d" \
+         -e "s/iters: [0-9]\\+/iters: 1024/" \
++        -e 's/\(compression type: \)\(zlib\|zstd\)/\1COMPRESSION_TYPE/' \
+         -e "s/uuid: [-a-f0-9]\\+/uuid: 00000000-0000-0000-0000-000000000000/" | \
+     while IFS='' read -r line; do
+         if [[ $format_specific == 1 ]]; then
+@@ -337,5 +338,12 @@ _filter_authz_check_tls()
+     $SED -e 's/TLS x509 authz check for .* is denied/TLS x509 authz check for DISTINGUISHED-NAME is denied/'
+ }
+ 
++_filter_qcow2_compression_type_bit()
++{
++    $SED -e 's/\(incompatible_features\s\+\)\[3\(, \)\?/\1[/' \
++         -e 's/\(incompatible_features.*\), 3\]/\1]/' \
++         -e 's/\(incompatible_features.*\), 3\(,.*\)/\1\2/'
++}
++
+ # make sure this script returns success
+ true
+diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
+index 5dea310ea08c2bca65a6e21cbb66..9885030b43c953bf073aa84a3df1 100644
+--- a/tests/qemu-iotests/common.rc
++++ b/tests/qemu-iotests/common.rc
+@@ -699,6 +699,7 @@ _img_info()
+             -e "s#$TEST_DIR#TEST_DIR#g" \
+             -e "s#$SOCK_DIR/fuse-#TEST_DIR/#g" \
+             -e "s#$IMGFMT#IMGFMT#g" \
++            -e 's/\(compression type: \)\(zlib\|zstd\)/\1COMPRESSION_TYPE/' \
+             -e "/^disk size:/ D" \
+             -e "/actual-size/ D" | \
+         while IFS='' read -r line; do
+@@ -998,12 +999,23 @@ _require_one_device_of()
+ 
+ _qcow2_dump_header()
+ {
++    if [[ "$1" == "--no-filter-compression" ]]; then
++        local filter_compression=0
++        shift
++    else
++        local filter_compression=1
++    fi
++
+     img="$1"
+     if [ -z "$img" ]; then
+         img="$TEST_IMG"
+     fi
+ 
+-    $PYTHON qcow2.py "$img" dump-header
++    if [[ $filter_compression == 0 ]]; then
++        $PYTHON qcow2.py "$img" dump-header
++    else
++        $PYTHON qcow2.py "$img" dump-header | _filter_qcow2_compression_type_bit
++    fi
+ }
+ 
+ # make sure this script returns success

iotests-common.rc-introduce-_qcow2_dump_.patch

@@ -0,0 +1,38 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:38 +0100
+Subject: iotests/common.rc: introduce _qcow2_dump_header helper
+
+Git-commit: c5e627a6ecdccea64a1b600857ed671a83377847
+
+We'll use it in tests instead of explicit qcow2.py. Then we are going
+to add some filtering in _qcow2_dump_header.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Max Reitz <mreitz@redhat.com>
+Message-Id: <20211223160144.1097696-14-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/common.rc | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
+index d8582454de0aa4c2c9cfba0f0ce4..5dea310ea08c2bca65a6e21cbb66 100644
+--- a/tests/qemu-iotests/common.rc
++++ b/tests/qemu-iotests/common.rc
+@@ -996,5 +996,15 @@ _require_one_device_of()
+     _notrun "$* not available"
+ }
+ 
++_qcow2_dump_header()
++{
++    img="$1"
++    if [ -z "$img" ]; then
++        img="$TEST_IMG"
++    fi
++
++    $PYTHON qcow2.py "$img" dump-header
++}
++
+ # make sure this script returns success
+ true

iotests-declare-lack-of-support-for-comp.patch

@@ -0,0 +1,98 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:44 +0100
+Subject: iotests: declare lack of support for compresion_type in IMGOPTS
+
+Git-commit: e287a351db13f3f6670f4a3f2896f2dde47d07d1
+
+compression_type can't be used if we want to create image with
+compat=0.10. So, skip these tests, not many of them.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Hanna Reitz <hreitz@redhat.com>
+Message-Id: <20211223160144.1097696-20-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/031 | 5 +++--
+ tests/qemu-iotests/051 | 5 +++--
+ tests/qemu-iotests/061 | 6 +++++-
+ tests/qemu-iotests/112 | 3 ++-
+ tests/qemu-iotests/290 | 2 +-
+ 5 files changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
+index 648112f7960e909e81fbc4c1be13..ee587b1606fd1b9c8ba1bf6a50b2 100755
+--- a/tests/qemu-iotests/031
++++ b/tests/qemu-iotests/031
+@@ -42,8 +42,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
+ _supported_fmt qcow2
+ _supported_proto file fuse
+ # We want to test compat=0.10, which does not support external data
+-# files or refcount widths other than 16
+-_unsupported_imgopts data_file 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
++# files or refcount widths other than 16 or compression type
++_unsupported_imgopts data_file compression_type \
++    'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
+ 
+ CLUSTER_SIZE=65536
+ 
+diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
+index e9042a621420332ac288060cbec2..f1a506518b981fe28cc498af43bb 100755
+--- a/tests/qemu-iotests/051
++++ b/tests/qemu-iotests/051
+@@ -41,8 +41,9 @@ _supported_fmt qcow2
+ _supported_proto file
+ # A compat=0.10 image is created in this test which does not support anything
+ # other than refcount_bits=16;
+-# it also will not support an external data file
+-_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
++# it also will not support an external data file and compression type
++_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file \
++    compression_type
+ _require_drivers nbd
+ 
+ if [ "$QEMU_DEFAULT_MACHINE" = "pc" ]; then
+diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
+index 70edf1a1635e1e5df529e130d314..513fbec14cc2bcfbd085b0f092e4 100755
+--- a/tests/qemu-iotests/061
++++ b/tests/qemu-iotests/061
+@@ -48,7 +48,11 @@ _supported_os Linux
+ # not work with it;
+ # we have explicit tests for various cluster sizes, the remaining tests
+ # require the default 64k cluster
+-_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file cluster_size
++# we don't have explicit tests for zstd qcow2 compression type, as zstd may be
++# not compiled in. And we can't create compat images with comression type
++# extension
++_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file \
++    cluster_size compression_type
+ 
+ echo
+ echo "=== Testing version downgrade with zero expansion ==="
+diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
+index 07ac74fb2c184c0580ebbedd70f9..53332129931fa67416893b3b2eaf 100755
+--- a/tests/qemu-iotests/112
++++ b/tests/qemu-iotests/112
+@@ -43,7 +43,8 @@ _supported_proto file fuse
+ # This test will set refcount_bits on its own which would conflict with the
+ # manual setting; compat will be overridden as well;
+ # and external data files do not work well with our refcount testing
+-_unsupported_imgopts refcount_bits 'compat=0.10' data_file
++# also, compression type is not supported with compat=0.10 used in test
++_unsupported_imgopts refcount_bits 'compat=0.10' data_file compression_type
+ 
+ print_refcount_bits()
+ {
+diff --git a/tests/qemu-iotests/290 b/tests/qemu-iotests/290
+index ed80da2685e5ed094985e71c1e30..776b59de1bc8da4bbc67195231c4 100755
+--- a/tests/qemu-iotests/290
++++ b/tests/qemu-iotests/290
+@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
+ _supported_fmt qcow2
+ _supported_proto file fuse
+ _supported_os Linux
+-_unsupported_imgopts 'compat=0.10' refcount_bits data_file
++_unsupported_imgopts 'compat=0.10' refcount_bits data_file compression_type
+ 
+ echo
+ echo "### Test 'qemu-io -c discard' on a QCOW2 image without a backing file"

iotests-drop-qemu_img_verbose-helper.patch

@@ -0,0 +1,112 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:30 +0100
+Subject: iotests: drop qemu_img_verbose() helper
+
+Git-commit: 8f9e54ccfd047cbef09fe10fa75d59333052fb78
+
+qemu_img_verbose() has a drawback of not going through generic
+qemu_img_pipe_and_status(). qemu_img_verbose() is not very popular, so
+update the only two users to qemu_img_log() and drop qemu_img_verbose()
+at all.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Hanna Reitz <hreitz@redhat.com>
+Message-Id: <20211223160144.1097696-6-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/044        | 5 +++--
+ tests/qemu-iotests/044.out    | 1 +
+ tests/qemu-iotests/209        | 7 ++++---
+ tests/qemu-iotests/209.out    | 2 ++
+ tests/qemu-iotests/iotests.py | 8 --------
+ 5 files changed, 10 insertions(+), 13 deletions(-)
+
+diff --git a/tests/qemu-iotests/044 b/tests/qemu-iotests/044
+index d696e6442ad5b595d16a61f5c0dd..a5ee9a7ded3bf1f734322db80689 100755
+--- a/tests/qemu-iotests/044
++++ b/tests/qemu-iotests/044
+@@ -24,7 +24,7 @@ import os
+ import qcow2
+ from qcow2 import QcowHeader
+ import iotests
+-from iotests import qemu_img, qemu_img_verbose, qemu_io
++from iotests import qemu_img, qemu_img_log, qemu_io
+ import struct
+ import subprocess
+ import sys
+@@ -112,10 +112,11 @@ class TestRefcountTableGrowth(iotests.QMPTestCase):
+ 
+     def test_grow_refcount_table(self):
+         qemu_io('-c', 'write 3800M 1M', test_img)
+-        qemu_img_verbose('check' , test_img)
++        qemu_img_log('check' , test_img)
+         pass
+ 
+ if __name__ == '__main__':
++    iotests.activate_logging()
+     iotests.main(supported_fmts=['qcow2'],
+                  supported_protocols=['file'],
+                  unsupported_imgopts=['refcount_bits'])
+diff --git a/tests/qemu-iotests/044.out b/tests/qemu-iotests/044.out
+index 703cf3dee186906c6b7b0104f142..ff663b17d71f96d1d9ade8b45bdd 100644
+--- a/tests/qemu-iotests/044.out
++++ b/tests/qemu-iotests/044.out
+@@ -1,6 +1,7 @@
+ No errors were found on the image.
+ 7292415/33554432 = 21.73% allocated, 0.00% fragmented, 0.00% compressed clusters
+ Image end offset: 4296217088
++
+ .
+ ----------------------------------------------------------------------
+ Ran 1 tests
+diff --git a/tests/qemu-iotests/209 b/tests/qemu-iotests/209
+index ff7efea11bc69d64ed3ba41c586d..f6ad08ec42a7055634adfcd263d1 100755
+--- a/tests/qemu-iotests/209
++++ b/tests/qemu-iotests/209
+@@ -20,8 +20,8 @@
+ #
+ 
+ import iotests
+-from iotests import qemu_img_create, qemu_io, qemu_img_verbose, qemu_nbd, \
+-                    file_path
++from iotests import qemu_img_create, qemu_io, qemu_img_log, qemu_nbd, \
++                    file_path, log
+ 
+ iotests.script_initialize(supported_fmts=['qcow2'])
+ 
+@@ -33,4 +33,5 @@ qemu_img_create('-f', iotests.imgfmt, disk, '1M')
+ qemu_io('-f', iotests.imgfmt, '-c', 'write 0 512K', disk)
+ 
+ qemu_nbd('-k', nbd_sock, '-x', 'exp', '-f', iotests.imgfmt, disk)
+-qemu_img_verbose('map', '-f', 'raw', '--output=json', nbd_uri)
++qemu_img_log('map', '-f', 'raw', '--output=json', nbd_uri)
++log('done.')  # avoid new line at the end of output file
+diff --git a/tests/qemu-iotests/209.out b/tests/qemu-iotests/209.out
+index f27be3fa7b0bf619ae5ff0a308fb..515906ac7a1962b78ef3787a4a7c 100644
+--- a/tests/qemu-iotests/209.out
++++ b/tests/qemu-iotests/209.out
+@@ -1,2 +1,4 @@
+ [{ "start": 0, "length": 524288, "depth": 0, "present": true, "zero": false, "data": true, "offset": 0},
+ { "start": 524288, "length": 524288, "depth": 0, "present": true, "zero": true, "data": false, "offset": 524288}]
++
++done.
+diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
+index f0370b520651aa4ccc1cdb0cf28e..5a6bfcbb6adbb84d412e37966360 100644
+--- a/tests/qemu-iotests/iotests.py
++++ b/tests/qemu-iotests/iotests.py
+@@ -227,14 +227,6 @@ def qemu_img_measure(*args):
+ def qemu_img_check(*args):
+     return json.loads(qemu_img_pipe("check", "--output", "json", *args))
+ 
+-def qemu_img_verbose(*args):
+-    '''Run qemu-img without suppressing its output and return the exit code'''
+-    exitcode = subprocess.call(qemu_img_args + list(args))
+-    if exitcode < 0:
+-        sys.stderr.write('qemu-img received signal %i: %s\n'
+-                         % (-exitcode, ' '.join(qemu_img_args + list(args))))
+-    return exitcode
+-
+ def qemu_img_pipe(*args: str) -> str:
+     '''Run qemu-img and return its output'''
+     return qemu_img_pipe_and_status(*args)[0]

iotests-massive-use-_qcow2_dump_header.patch

@@ -0,0 +1,408 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:39 +0100
+Subject: iotests: massive use _qcow2_dump_header
+
+Git-commit: 984d7a52d5ca33a79e09f2617fe43e368dce4068
+
+We are going to add filtering in _qcow2_dump_header and want all tests
+use it.
+
+The patch is generated by commands:
+  cd tests/qemu-iotests
+  sed -ie 's/$PYTHON qcow2.py "$TEST_IMG" dump-header\($\| \)/_qcow2_dump_header\1/' ??? tests/*
+
+(the difficulty is to avoid converting dump-header-exts)
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Max Reitz <mreitz@redhat.com>
+Message-Id: <20211223160144.1097696-15-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+(cherry picked from commit 984d7a52d5ca33a79e09f2617fe43e368dce4068)
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/031 |  6 +++---
+ tests/qemu-iotests/036 |  6 +++---
+ tests/qemu-iotests/039 | 20 ++++++++++----------
+ tests/qemu-iotests/060 | 20 ++++++++++----------
+ tests/qemu-iotests/061 | 36 ++++++++++++++++++------------------
+ tests/qemu-iotests/137 |  2 +-
+ tests/qemu-iotests/287 |  8 ++++----
+ 7 files changed, 49 insertions(+), 49 deletions(-)
+
+diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
+index 58b57a0ef2c0973b6f595102802d..648112f7960e909e81fbc4c1be13 100755
+--- a/tests/qemu-iotests/031
++++ b/tests/qemu-iotests/031
+@@ -58,21 +58,21 @@ for compat in "compat=0.10" "compat=1.1"; do
+     echo
+     _make_test_img -o $compat 64M
+     $PYTHON qcow2.py "$TEST_IMG" add-header-ext 0x12345678 "This is a test header extension"
+-    $PYTHON qcow2.py "$TEST_IMG" dump-header
++    _qcow2_dump_header
+     _check_test_img
+ 
+     echo
+     echo === Rewrite header with no backing file ===
+     echo
+     $QEMU_IMG rebase -u -b "" "$TEST_IMG"
+-    $PYTHON qcow2.py "$TEST_IMG" dump-header
++    _qcow2_dump_header
+     _check_test_img
+ 
+     echo
+     echo === Add a backing file and format ===
+     echo
+     $QEMU_IMG rebase -u -b "/some/backing/file/path" -F host_device "$TEST_IMG"
+-    $PYTHON qcow2.py "$TEST_IMG" dump-header
++    _qcow2_dump_header
+ done
+ 
+ # success, all done
+diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
+index 5e567012a8203e38b609fd863736..f703605e44412b70e3f2aa9ea33f 100755
+--- a/tests/qemu-iotests/036
++++ b/tests/qemu-iotests/036
+@@ -58,7 +58,7 @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
+ 
+ # Without feature table
+ $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
++_qcow2_dump_header | grep features
+ $PYTHON qcow2.py "$TEST_IMG" dump-header-exts
+ _img_info
+ 
+@@ -107,7 +107,7 @@ echo === Create image with unknown autoclear feature bit ===
+ echo
+ _make_test_img 64M
+ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
++_qcow2_dump_header | grep features
+ $PYTHON qcow2.py "$TEST_IMG" dump-header-exts
+ 
+ echo
+@@ -115,7 +115,7 @@ echo === Repair image ===
+ echo
+ _check_test_img -r all
+ 
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
++_qcow2_dump_header | grep features
+ $PYTHON qcow2.py "$TEST_IMG" dump-header-exts
+ 
+ # success, all done
+diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
+index 12b2c7fa7b87d87db9c5f5688dfe..8e783a8380666f26d237c7233602 100755
+--- a/tests/qemu-iotests/039
++++ b/tests/qemu-iotests/039
+@@ -59,7 +59,7 @@ _make_test_img -o "compat=1.1,lazy_refcounts=on" $size
+ $QEMU_IO -c "write -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
+ 
+ # The dirty bit must not be set
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ _check_test_img
+ 
+ echo
+@@ -73,7 +73,7 @@ $QEMU_IO -c "write -P 0x5a 0 512" \
+     | _filter_qemu_io
+ 
+ # The dirty bit must be set
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ _check_test_img
+ 
+ echo
+@@ -82,7 +82,7 @@ echo "== Read-only access must still work =="
+ $QEMU_IO -r -c "read -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
+ 
+ # The dirty bit must be set
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ echo
+ echo "== Repairing the image file must succeed =="
+@@ -90,7 +90,7 @@ echo "== Repairing the image file must succeed =="
+ _check_test_img -r all
+ 
+ # The dirty bit must not be set
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ echo
+ echo "== Data should still be accessible after repair =="
+@@ -108,12 +108,12 @@ $QEMU_IO -c "write -P 0x5a 0 512" \
+     | _filter_qemu_io
+ 
+ # The dirty bit must be set
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ $QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io
+ 
+ # The dirty bit must not be set
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ echo
+ echo "== Creating an image file with lazy_refcounts=off =="
+@@ -126,7 +126,7 @@ $QEMU_IO -c "write -P 0x5a 0 512" \
+     | _filter_qemu_io
+ 
+ # The dirty bit must not be set since lazy_refcounts=off
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ _check_test_img
+ 
+ echo
+@@ -141,7 +141,7 @@ $QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io
+ $QEMU_IMG commit "$TEST_IMG"
+ 
+ # The dirty bit must not be set
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ $PYTHON qcow2.py "$TEST_IMG".base dump-header | grep incompatible_features
+ 
+ _check_test_img
+@@ -159,7 +159,7 @@ $QEMU_IO -c "reopen -o lazy-refcounts=on" \
+     | _filter_qemu_io
+ 
+ # The dirty bit must be set
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ _check_test_img
+ 
+ _make_test_img -o "compat=1.1,lazy_refcounts=on" $size
+@@ -171,7 +171,7 @@ $QEMU_IO -c "reopen -o lazy-refcounts=off" \
+     | _filter_qemu_io
+ 
+ # The dirty bit must not be set
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ _check_test_img
+ 
+ 
+diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
+index db26c6b246cda94e9258c51b0b6c..d1e3204d4ea42002263486eebafd 100755
+--- a/tests/qemu-iotests/060
++++ b/tests/qemu-iotests/060
+@@ -80,13 +80,13 @@ poke_file "$TEST_IMG" "$l1_offset" "\x80\x00\x00\x00\x00\x03\x00\x00"
+ _check_test_img
+ 
+ # The corrupt bit should not be set anyway
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ # Try to write something, thereby forcing the corrupt bit to be set
+ $QEMU_IO -c "$OPEN_RW" -c "write -P 0x2a 0 512" | _filter_qemu_io
+ 
+ # The corrupt bit must now be set
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ # This information should be available through qemu-img info
+ _img_info --format-specific
+@@ -114,19 +114,19 @@ poke_file "$TEST_IMG" "$(($rb_offset+8))" "\x00\x01"
+ # Redirect new data cluster onto refcount block
+ poke_file "$TEST_IMG" "$l2_offset" "\x80\x00\x00\x00\x00\x02\x00\x00"
+ _check_test_img
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ $QEMU_IO -c "$OPEN_RW" -c "write -P 0x2a 0 512" | _filter_qemu_io
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ # Try to fix it
+ _check_test_img -r all
+ 
+ # The corrupt bit should be cleared
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ # Look if it's really really fixed
+ $QEMU_IO -c "$OPEN_RW" -c "write -P 0x2a 0 512" | _filter_qemu_io
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ echo
+ echo "=== Testing cluster data reference into inactive L2 table ==="
+@@ -139,13 +139,13 @@ $QEMU_IO -c "$OPEN_RW" -c "write -P 2 0 512" | _filter_qemu_io
+ poke_file "$TEST_IMG" "$l2_offset_after_snapshot" \
+                       "\x80\x00\x00\x00\x00\x04\x00\x00"
+ _check_test_img
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ $QEMU_IO -c "$OPEN_RW" -c "write -P 3 0 512" | _filter_qemu_io
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ _check_test_img -r all
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ $QEMU_IO -c "$OPEN_RW" -c "write -P 4 0 512" | _filter_qemu_io
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ # Check data
+ $QEMU_IO -c "$OPEN_RO" -c "read -P 4 0 512" | _filter_qemu_io
+diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
+index 9507c223bda41067797dd19be095..70edf1a1635e1e5df529e130d314 100755
+--- a/tests/qemu-iotests/061
++++ b/tests/qemu-iotests/061
+@@ -55,9 +55,9 @@ echo "=== Testing version downgrade with zero expansion ==="
+ echo
+ _make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
+ $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
+-$PYTHON qcow2.py "$TEST_IMG" dump-header
++_qcow2_dump_header
+ $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
+-$PYTHON qcow2.py "$TEST_IMG" dump-header
++_qcow2_dump_header
+ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
+ _check_test_img
+ 
+@@ -68,10 +68,10 @@ _make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
+ $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
+ $QEMU_IO -c "write -z 32M 128k" "$TEST_IMG" | _filter_qemu_io
+ $QEMU_IO -c map "$TEST_IMG" | _filter_qemu_io
+-$PYTHON qcow2.py "$TEST_IMG" dump-header
++_qcow2_dump_header
+ $QEMU_IMG amend -o "compat=0.10" --image-opts \
+           driver=qcow2,file.filename=$TEST_IMG,l2-cache-entry-size=4096
+-$PYTHON qcow2.py "$TEST_IMG" dump-header
++_qcow2_dump_header
+ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
+ $QEMU_IO -c "read -P 0 32M 128k" "$TEST_IMG" | _filter_qemu_io
+ $QEMU_IO -c map "$TEST_IMG" | _filter_qemu_io
+@@ -84,9 +84,9 @@ _make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
+ _NO_VALGRIND \
+ $QEMU_IO -c "write -P 0x2a 0 128k" -c flush \
+          -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io
+-$PYTHON qcow2.py "$TEST_IMG" dump-header
++_qcow2_dump_header
+ $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
+-$PYTHON qcow2.py "$TEST_IMG" dump-header
++_qcow2_dump_header
+ $QEMU_IO -c "read -P 0x2a 0 128k" "$TEST_IMG" | _filter_qemu_io
+ _check_test_img
+ 
+@@ -96,9 +96,9 @@ echo
+ _make_test_img -o "compat=1.1" 64M
+ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit compatible 42
+ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 42
+-$PYTHON qcow2.py "$TEST_IMG" dump-header
++_qcow2_dump_header
+ $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
+-$PYTHON qcow2.py "$TEST_IMG" dump-header
++_qcow2_dump_header
+ _check_test_img
+ 
+ echo
+@@ -106,9 +106,9 @@ echo "=== Testing version upgrade and resize ==="
+ echo
+ _make_test_img -o "compat=0.10" 64M
+ $QEMU_IO -c "write -P 0x2a 42M 64k" "$TEST_IMG" | _filter_qemu_io
+-$PYTHON qcow2.py "$TEST_IMG" dump-header
++_qcow2_dump_header
+ $QEMU_IMG amend -o "compat=1.1,lazy_refcounts=on,size=128M" "$TEST_IMG"
+-$PYTHON qcow2.py "$TEST_IMG" dump-header
++_qcow2_dump_header
+ $QEMU_IO -c "read -P 0x2a 42M 64k" "$TEST_IMG" | _filter_qemu_io
+ _check_test_img
+ 
+@@ -120,29 +120,29 @@ $QEMU_IO -c "write -P 0x2a 24M 64k" "$TEST_IMG" | _filter_qemu_io
+ $QEMU_IMG snapshot -c foo "$TEST_IMG"
+ $QEMU_IMG resize "$TEST_IMG" 64M &&
+     echo "unexpected pass"
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep '^\(version\|size\|nb_snap\)'
++_qcow2_dump_header | grep '^\(version\|size\|nb_snap\)'
+ 
+ $QEMU_IMG amend -o "compat=1.1,size=128M" "$TEST_IMG" ||
+     echo "unexpected fail"
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep '^\(version\|size\|nb_snap\)'
++_qcow2_dump_header | grep '^\(version\|size\|nb_snap\)'
+ 
+ $QEMU_IMG snapshot -c bar "$TEST_IMG"
+ $QEMU_IMG resize --shrink "$TEST_IMG" 64M ||
+     echo "unexpected fail"
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep '^\(version\|size\|nb_snap\)'
++_qcow2_dump_header | grep '^\(version\|size\|nb_snap\)'
+ 
+ $QEMU_IMG amend -o "compat=0.10,size=32M" "$TEST_IMG" &&
+     echo "unexpected pass"
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep '^\(version\|size\|nb_snap\)'
++_qcow2_dump_header | grep '^\(version\|size\|nb_snap\)'
+ 
+ $QEMU_IMG snapshot -a bar "$TEST_IMG" ||
+     echo "unexpected fail"
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep '^\(version\|size\|nb_snap\)'
++_qcow2_dump_header | grep '^\(version\|size\|nb_snap\)'
+ 
+ $QEMU_IMG snapshot -d bar "$TEST_IMG"
+ $QEMU_IMG amend -o "compat=0.10,size=32M" "$TEST_IMG" ||
+     echo "unexpected fail"
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep '^\(version\|size\|nb_snap\)'
++_qcow2_dump_header | grep '^\(version\|size\|nb_snap\)'
+ 
+ _check_test_img
+ 
+@@ -154,9 +154,9 @@ _make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
+ _NO_VALGRIND \
+ $QEMU_IO -c "write -P 0x2a 0 128k" -c flush \
+          -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io
+-$PYTHON qcow2.py "$TEST_IMG" dump-header
++_qcow2_dump_header
+ $QEMU_IMG amend -o "lazy_refcounts=off" "$TEST_IMG"
+-$PYTHON qcow2.py "$TEST_IMG" dump-header
++_qcow2_dump_header
+ $QEMU_IO -c "read -P 0x2a 0 128k" "$TEST_IMG" | _filter_qemu_io
+ _check_test_img
+ 
+diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
+index 4680d5df3d0fe8be4041f4df3833..52ee135184011e8e1655efd063f9 100755
+--- a/tests/qemu-iotests/137
++++ b/tests/qemu-iotests/137
+@@ -140,7 +140,7 @@ $QEMU_IO \
+ 
+ # The dirty bit must not be set
+ # (Filter the external data file bit)
+-if $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features \
++if _qcow2_dump_header | grep incompatible_features \
+     | grep -q '\<0\>'
+ then
+     echo 'ERROR: Dirty bit set'
+diff --git a/tests/qemu-iotests/287 b/tests/qemu-iotests/287
+index 2d5334e8bfb72dc88a3ddd958994..5427ad5456aba89d04e573758679 100755
+--- a/tests/qemu-iotests/287
++++ b/tests/qemu-iotests/287
+@@ -61,13 +61,13 @@ echo
+ echo "=== Testing compression type incompatible bit setting for zlib ==="
+ echo
+ _make_test_img -o compression_type=zlib 64M
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ echo
+ echo "=== Testing compression type incompatible bit setting for zstd ==="
+ echo
+ _make_test_img -o compression_type=zstd 64M
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ echo
+ echo "=== Testing zlib with incompatible bit set ==="
+@@ -75,7 +75,7 @@ echo
+ _make_test_img -o compression_type=zlib 64M
+ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 3
+ # to make sure the bit was actually set
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ if $QEMU_IMG info "$TEST_IMG" >/dev/null 2>&1 ; then
+     echo "Error: The image opened successfully. The image must not be opened."
+@@ -87,7 +87,7 @@ echo
+ _make_test_img -o compression_type=zstd 64M
+ $PYTHON qcow2.py "$TEST_IMG" set-header incompatible_features 0
+ # to make sure the bit was actually unset
+-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
++_qcow2_dump_header | grep incompatible_features
+ 
+ if $QEMU_IMG info "$TEST_IMG" >/dev/null 2>&1 ; then
+     echo "Error: The image opened successfully. The image must not be opened."

iotests-specify-some-unsupported_imgopts.patch

@@ -0,0 +1,222 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:28 +0100
+Subject: iotests: specify some unsupported_imgopts for python iotests
+
+Git-commit: b30b8077243ea5dc93a540eedfecee3c74b19fa2
+
+We are going to support IMGOPTS for python iotests. Still some iotests
+will not work with common IMGOPTS used with bash iotests like
+specifying refcount_bits and compat qcow2 options. So we
+should define corresponding unsupported_imgopts for now.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Message-Id: <20211223160144.1097696-4-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/044                                 | 3 ++-
+ tests/qemu-iotests/065                                 | 3 ++-
+ tests/qemu-iotests/163                                 | 3 ++-
+ tests/qemu-iotests/165                                 | 3 ++-
+ tests/qemu-iotests/196                                 | 3 ++-
+ tests/qemu-iotests/242                                 | 3 ++-
+ tests/qemu-iotests/246                                 | 3 ++-
+ tests/qemu-iotests/254                                 | 3 ++-
+ tests/qemu-iotests/260                                 | 3 ++-
+ tests/qemu-iotests/274                                 | 3 ++-
+ tests/qemu-iotests/281                                 | 3 ++-
+ tests/qemu-iotests/303                                 | 3 ++-
+ tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test | 3 ++-
+ tests/qemu-iotests/tests/migrate-bitmaps-test          | 3 ++-
+ tests/qemu-iotests/tests/remove-bitmap-from-backing    | 3 ++-
+ 15 files changed, 30 insertions(+), 15 deletions(-)
+
+diff --git a/tests/qemu-iotests/044 b/tests/qemu-iotests/044
+index 64b18eb7c89f49c8fc7192dbb0e8..d696e6442ad5b595d16a61f5c0dd 100755
+--- a/tests/qemu-iotests/044
++++ b/tests/qemu-iotests/044
+@@ -117,4 +117,5 @@ class TestRefcountTableGrowth(iotests.QMPTestCase):
+ 
+ if __name__ == '__main__':
+     iotests.main(supported_fmts=['qcow2'],
+-                 supported_protocols=['file'])
++                 supported_protocols=['file'],
++                 unsupported_imgopts=['refcount_bits'])
+diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065
+index 3c2ca27627f0d6343ba04c857b38..dc7716275f0d5e8b6aeb572244fb 100755
+--- a/tests/qemu-iotests/065
++++ b/tests/qemu-iotests/065
+@@ -139,4 +139,5 @@ TestQMP = None
+ 
+ if __name__ == '__main__':
+     iotests.main(supported_fmts=['qcow2'],
+-                 supported_protocols=['file'])
++                 supported_protocols=['file'],
++                 unsupported_imgopts=['refcount_bits'])
+diff --git a/tests/qemu-iotests/163 b/tests/qemu-iotests/163
+index dedce8ef4322d3cec0303049b280..b8bfc95358e4652c199655030c8a 100755
+--- a/tests/qemu-iotests/163
++++ b/tests/qemu-iotests/163
+@@ -169,4 +169,5 @@ ShrinkBaseClass = None
+ 
+ if __name__ == '__main__':
+     iotests.main(supported_fmts=['raw', 'qcow2'],
+-                 supported_protocols=['file'])
++                 supported_protocols=['file'],
++                 unsupported_imgopts=['compat'])
+diff --git a/tests/qemu-iotests/165 b/tests/qemu-iotests/165
+index ce499946b842e71f45c7b24ca162..e3ef28e2ee84277ff7bbe65d5fff 100755
+--- a/tests/qemu-iotests/165
++++ b/tests/qemu-iotests/165
+@@ -157,4 +157,5 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase):
+ 
+ if __name__ == '__main__':
+     iotests.main(supported_fmts=['qcow2'],
+-                 supported_protocols=['file'])
++                 supported_protocols=['file'],
++                 unsupported_imgopts=['compat'])
+diff --git a/tests/qemu-iotests/196 b/tests/qemu-iotests/196
+index 2451515094f2e582dc8dbe838e60..76509a5ad1c541f572ab9c918046 100755
+--- a/tests/qemu-iotests/196
++++ b/tests/qemu-iotests/196
+@@ -65,4 +65,5 @@ class TestInvalidateAutoclear(iotests.QMPTestCase):
+ 
+ if __name__ == '__main__':
+     iotests.main(supported_fmts=['qcow2'],
+-                 supported_protocols=['file'])
++                 supported_protocols=['file'],
++                 unsupported_imgopts=['compat'])
+diff --git a/tests/qemu-iotests/242 b/tests/qemu-iotests/242
+index a9b27668c2757711fc3f21db87d4..96a30152b04a8fba7eed2514a48c 100755
+--- a/tests/qemu-iotests/242
++++ b/tests/qemu-iotests/242
+@@ -26,7 +26,8 @@ from iotests import qemu_img_create, qemu_io, qemu_img_pipe, \
+     file_path, img_info_log, log, filter_qemu_io
+ 
+ iotests.script_initialize(supported_fmts=['qcow2'],
+-                          supported_protocols=['file'])
++                          supported_protocols=['file'],
++                          unsupported_imgopts=['refcount_bits', 'compat'])
+ 
+ disk = file_path('disk')
+ chunk = 256 * 1024
+diff --git a/tests/qemu-iotests/246 b/tests/qemu-iotests/246
+index 5932a0e8a97bdd5975a4bc0813f9..b009a78397752bdd60bf2ec34af5 100755
+--- a/tests/qemu-iotests/246
++++ b/tests/qemu-iotests/246
+@@ -23,7 +23,8 @@
+ import iotests
+ from iotests import log
+ 
+-iotests.script_initialize(supported_fmts=['qcow2'])
++iotests.script_initialize(supported_fmts=['qcow2'],
++                          unsupported_imgopts=['compat'])
+ size = 64 * 1024 * 1024 * 1024
+ gran_small = 32 * 1024
+ gran_large = 128 * 1024
+diff --git a/tests/qemu-iotests/254 b/tests/qemu-iotests/254
+index 108bf5f894c6b3328c144a5de1ee..7ea098818cf0a39c0a624989cdc8 100755
+--- a/tests/qemu-iotests/254
++++ b/tests/qemu-iotests/254
+@@ -22,7 +22,8 @@
+ import iotests
+ from iotests import qemu_img_create, file_path, log
+ 
+-iotests.script_initialize(supported_fmts=['qcow2'])
++iotests.script_initialize(supported_fmts=['qcow2'],
++                          unsupported_imgopts=['compat'])
+ 
+ disk, top = file_path('disk', 'top')
+ size = 1024 * 1024
+diff --git a/tests/qemu-iotests/260 b/tests/qemu-iotests/260
+index 2ec64a9b9952cd26ac7c795fca36..c2133f998010bef3111abb98f0be 100755
+--- a/tests/qemu-iotests/260
++++ b/tests/qemu-iotests/260
+@@ -23,7 +23,8 @@ import iotests
+ from iotests import qemu_img_create, file_path, log, filter_qmp_event
+ 
+ iotests.script_initialize(
+-    supported_fmts=['qcow2']
++    supported_fmts=['qcow2'],
++    unsupported_imgopts=['compat']
+ )
+ 
+ base, top = file_path('base', 'top')
+diff --git a/tests/qemu-iotests/274 b/tests/qemu-iotests/274
+index caab008e0737ba5d88e2ae46bc11..080a90f10f7af42c09e380b5953b 100755
+--- a/tests/qemu-iotests/274
++++ b/tests/qemu-iotests/274
+@@ -23,7 +23,8 @@
+ import iotests
+ 
+ iotests.script_initialize(supported_fmts=['qcow2'],
+-                          supported_platforms=['linux'])
++                          supported_platforms=['linux'],
++                          unsupported_imgopts=['refcount_bits', 'compat'])
+ 
+ size_short = 1 * 1024 * 1024
+ size_long = 2 * 1024 * 1024
+diff --git a/tests/qemu-iotests/281 b/tests/qemu-iotests/281
+index 956698083f03a7d80f2076cc18c1..318e33393919f2b89295700bbf05 100755
+--- a/tests/qemu-iotests/281
++++ b/tests/qemu-iotests/281
+@@ -245,4 +245,5 @@ class TestBlockdevBackupAbort(iotests.QMPTestCase):
+ 
+ if __name__ == '__main__':
+     iotests.main(supported_fmts=['qcow2'],
+-                 supported_protocols=['file'])
++                 supported_protocols=['file'],
++                 unsupported_imgopts=['compat'])
+diff --git a/tests/qemu-iotests/303 b/tests/qemu-iotests/303
+index 425544c064d247af86925696bf6d..475cb5428db4f047b7db63776ca0 100755
+--- a/tests/qemu-iotests/303
++++ b/tests/qemu-iotests/303
+@@ -23,7 +23,8 @@ import iotests
+ import subprocess
+ from iotests import qemu_img_create, qemu_io, file_path, log, filter_qemu_io
+ 
+-iotests.script_initialize(supported_fmts=['qcow2'])
++iotests.script_initialize(supported_fmts=['qcow2'],
++                          unsupported_imgopts=['refcount_bits', 'compat'])
+ 
+ disk = file_path('disk')
+ chunk = 1024 * 1024
+diff --git a/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test b/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test
+index 00ebb5c2516fb7a6b9ee5c7cceaa..fc9c4b4ef411dc93e1abba0e58d2 100755
+--- a/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test
++++ b/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test
+@@ -272,4 +272,5 @@ class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase):
+ 
+ 
+ if __name__ == '__main__':
+-    iotests.main(supported_fmts=['qcow2'])
++    iotests.main(supported_fmts=['qcow2'],
++                 unsupported_imgopts=['compat'])
+diff --git a/tests/qemu-iotests/tests/migrate-bitmaps-test b/tests/qemu-iotests/tests/migrate-bitmaps-test
+index c23df3d75c7fd0efc5a4c79aa1f2..59f33575805c79a2ea24157fdb03 100755
+--- a/tests/qemu-iotests/tests/migrate-bitmaps-test
++++ b/tests/qemu-iotests/tests/migrate-bitmaps-test
+@@ -307,7 +307,8 @@ def main() -> None:
+ 
+     iotests.main(
+         supported_fmts=['qcow2'],
+-        supported_protocols=['file']
++        supported_protocols=['file'],
++        unsupported_imgopts=['compat']
+     )
+ 
+ 
+diff --git a/tests/qemu-iotests/tests/remove-bitmap-from-backing b/tests/qemu-iotests/tests/remove-bitmap-from-backing
+index 8d48fc0f3ce158182733d744b365..3c397b08ea439d6d4c9da76374c0 100755
+--- a/tests/qemu-iotests/tests/remove-bitmap-from-backing
++++ b/tests/qemu-iotests/tests/remove-bitmap-from-backing
+@@ -21,7 +21,8 @@
+ import iotests
+ from iotests import log, qemu_img_create, qemu_img, qemu_img_pipe
+ 
+-iotests.script_initialize(supported_fmts=['qcow2'])
++iotests.script_initialize(supported_fmts=['qcow2'],
++                          unsupported_imgopts=['compat'])
+ 
+ top, base = iotests.file_path('top', 'base')
+ size = '1M'

iotests.py-filter-out-successful-output-.patch

@@ -0,0 +1,447 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:34 +0100
+Subject: iotests.py: filter out successful output of qemu-img create
+
+Git-commit:  e877bba308c38033f73f444395b3cdcde48a3393
+
+The only "feature" of this "Formatting ..." line is that we have to
+update it every time we add new option. Let's drop it.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Hanna Reitz <hreitz@redhat.com>
+Message-Id: <20211223160144.1097696-10-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/149.out    | 21 ---------------------
+ tests/qemu-iotests/237.out    |  3 ---
+ tests/qemu-iotests/255.out    |  4 ----
+ tests/qemu-iotests/274.out    | 29 -----------------------------
+ tests/qemu-iotests/280.out    |  1 -
+ tests/qemu-iotests/296.out    | 10 +++-------
+ tests/qemu-iotests/iotests.py | 10 ++++++++--
+ 7 files changed, 11 insertions(+), 67 deletions(-)
+
+diff --git a/tests/qemu-iotests/149.out b/tests/qemu-iotests/149.out
+index 6877ab6c4a4580d31d5565baad49..ab879596ce2f8811e236428afca5 100644
+--- a/tests/qemu-iotests/149.out
++++ b/tests/qemu-iotests/149.out
+@@ -61,7 +61,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha1.img
+ # ================= qemu-img aes-256-xts-plain64-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-aes-256-xts-plain64-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha1.img qiotest-145-aes-256-xts-plain64-sha1
+@@ -181,7 +180,6 @@ unlink TEST_DIR/luks-twofish-256-xts-plain64-sha1.img
+ # ================= qemu-img twofish-256-xts-plain64-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=twofish-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-twofish-256-xts-plain64-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-twofish-256-xts-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=twofish-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-256-xts-plain64-sha1.img qiotest-145-twofish-256-xts-plain64-sha1
+@@ -301,7 +299,6 @@ unlink TEST_DIR/luks-serpent-256-xts-plain64-sha1.img
+ # ================= qemu-img serpent-256-xts-plain64-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=serpent-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-serpent-256-xts-plain64-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-serpent-256-xts-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=serpent-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-256-xts-plain64-sha1.img qiotest-145-serpent-256-xts-plain64-sha1
+@@ -421,7 +418,6 @@ unlink TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img
+ # ================= qemu-img cast5-128-cbc-plain64-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=cast5-128,cipher-mode=cbc,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=cast5-128 cipher-mode=cbc ivgen-alg=plain64 hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img qiotest-145-cast5-128-cbc-plain64-sha1
+@@ -542,7 +538,6 @@ unlink TEST_DIR/luks-aes-256-cbc-plain-sha1.img
+ # ================= qemu-img aes-256-cbc-plain-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=cbc,ivgen-alg=plain,hash-alg=sha1 TEST_DIR/luks-aes-256-cbc-plain-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-256-cbc-plain-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=cbc ivgen-alg=plain hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain-sha1.img qiotest-145-aes-256-cbc-plain-sha1
+@@ -662,7 +657,6 @@ unlink TEST_DIR/luks-aes-256-cbc-plain64-sha1.img
+ # ================= qemu-img aes-256-cbc-plain64-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=cbc,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-aes-256-cbc-plain64-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-256-cbc-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=cbc ivgen-alg=plain64 hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha1.img qiotest-145-aes-256-cbc-plain64-sha1
+@@ -782,7 +776,6 @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img
+ # ================= qemu-img aes-256-cbc-essiv-sha256-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=cbc,ivgen-alg=essiv,hash-alg=sha1,ivgen-hash-alg=sha256 TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=cbc ivgen-alg=essiv ivgen-hash-alg=sha256 hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img qiotest-145-aes-256-cbc-essiv-sha256-sha1
+@@ -902,7 +895,6 @@ unlink TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img
+ # ================= qemu-img aes-256-xts-essiv-sha256-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=essiv,hash-alg=sha1,ivgen-hash-alg=sha256 TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=essiv ivgen-hash-alg=sha256 hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img qiotest-145-aes-256-xts-essiv-sha256-sha1
+@@ -1022,7 +1014,6 @@ unlink TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img
+ # ================= qemu-img aes-128-xts-plain64-sha256-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-128,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-128 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img qiotest-145-aes-128-xts-plain64-sha256-sha1
+@@ -1142,7 +1133,6 @@ unlink TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img
+ # ================= qemu-img aes-192-xts-plain64-sha256-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-192,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-192 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img qiotest-145-aes-192-xts-plain64-sha256-sha1
+@@ -1262,7 +1252,6 @@ unlink TEST_DIR/luks-twofish-128-xts-plain64-sha1.img
+ # ================= qemu-img twofish-128-xts-plain64-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=twofish-128,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-twofish-128-xts-plain64-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-twofish-128-xts-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=twofish-128 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-128-xts-plain64-sha1.img qiotest-145-twofish-128-xts-plain64-sha1
+@@ -1383,7 +1372,6 @@ unlink TEST_DIR/luks-serpent-128-xts-plain64-sha1.img
+ # ================= qemu-img serpent-128-xts-plain64-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=serpent-128,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-serpent-128-xts-plain64-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-serpent-128-xts-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=serpent-128 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-128-xts-plain64-sha1.img qiotest-145-serpent-128-xts-plain64-sha1
+@@ -1503,7 +1491,6 @@ unlink TEST_DIR/luks-serpent-192-xts-plain64-sha1.img
+ # ================= qemu-img serpent-192-xts-plain64-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=serpent-192,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-serpent-192-xts-plain64-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-serpent-192-xts-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=serpent-192 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-192-xts-plain64-sha1.img qiotest-145-serpent-192-xts-plain64-sha1
+@@ -1625,7 +1612,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha224.img
+ # ================= qemu-img aes-256-xts-plain64-sha224 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha224 TEST_DIR/luks-aes-256-xts-plain64-sha224.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha224.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha224 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha224.img qiotest-145-aes-256-xts-plain64-sha224
+@@ -1745,7 +1731,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha256.img
+ # ================= qemu-img aes-256-xts-plain64-sha256 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha256 TEST_DIR/luks-aes-256-xts-plain64-sha256.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha256.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha256 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha256.img qiotest-145-aes-256-xts-plain64-sha256
+@@ -1865,7 +1850,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha384.img
+ # ================= qemu-img aes-256-xts-plain64-sha384 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha384 TEST_DIR/luks-aes-256-xts-plain64-sha384.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha384.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha384 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha384.img qiotest-145-aes-256-xts-plain64-sha384
+@@ -1985,7 +1969,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha512.img
+ # ================= qemu-img aes-256-xts-plain64-sha512 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha512 TEST_DIR/luks-aes-256-xts-plain64-sha512.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha512.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha512 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha512.img qiotest-145-aes-256-xts-plain64-sha512
+@@ -2105,7 +2088,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img
+ # ================= qemu-img aes-256-xts-plain64-ripemd160 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=ripemd160 TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=ripemd160 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img qiotest-145-aes-256-xts-plain64-ripemd160
+@@ -2299,7 +2281,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img
+ # ================= qemu-img aes-256-xts-plain-sha1-pwallslots =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=c2xvdDE=,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain,hash-alg=sha1 TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img qiotest-145-aes-256-xts-plain-sha1-pwallslots
+@@ -2419,7 +2400,6 @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img
+ # ================= qemu-img aes-256-cbc-essiv-auto-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=cbc,ivgen-alg=essiv,hash-alg=sha1 TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=cbc ivgen-alg=essiv hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img qiotest-145-aes-256-cbc-essiv-auto-sha1
+@@ -2539,7 +2519,6 @@ unlink TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img
+ # ================= qemu-img aes-256-cbc-plain64-sha256-sha1 =================
+ # Create image
+ qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=cbc,ivgen-alg=plain64,hash-alg=sha1,ivgen-hash-alg=sha256 TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img 4194304M
+-Formatting 'TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=cbc ivgen-alg=plain64 ivgen-hash-alg=sha256 hash-alg=sha1 iter-time=10
+ 
+ # Open dev
+ sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img qiotest-145-aes-256-cbc-plain64-sha256-sha1
+diff --git a/tests/qemu-iotests/237.out b/tests/qemu-iotests/237.out
+index 2f09ff5512cf7e586280fe37c571..aeb972449289e73ab955b200c2b3 100644
+--- a/tests/qemu-iotests/237.out
++++ b/tests/qemu-iotests/237.out
+@@ -129,11 +129,8 @@ Job failed: Cannot find device='this doesn't exist' nor node-name='this doesn't
+ 
+ === Other subformats ===
+ 
+-Formatting 'TEST_DIR/PID-t.vmdk.1', fmt=vmdk size=0 compat6=off hwversion=undefined
+ 
+-Formatting 'TEST_DIR/PID-t.vmdk.2', fmt=vmdk size=0 compat6=off hwversion=undefined
+ 
+-Formatting 'TEST_DIR/PID-t.vmdk.3', fmt=vmdk size=0 compat6=off hwversion=undefined
+ 
+ == Missing extent ==
+ 
+diff --git a/tests/qemu-iotests/255.out b/tests/qemu-iotests/255.out
+index 33b7f22de3f2eb7ce724c2285a71..11a05a5213e6a66e1ead1fa1abc2 100644
+--- a/tests/qemu-iotests/255.out
++++ b/tests/qemu-iotests/255.out
+@@ -3,9 +3,7 @@ Finishing a commit job with background reads
+ 
+ === Create backing chain and start VM ===
+ 
+-Formatting 'TEST_DIR/PID-t.qcow2.mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-t.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 lazy_refcounts=off refcount_bits=16
+ 
+ === Start background read requests ===
+ 
+@@ -23,9 +21,7 @@ Closing the VM while a job is being cancelled
+ 
+ === Create images and start VM ===
+ 
+-Formatting 'TEST_DIR/PID-src.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-dst.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 lazy_refcounts=off refcount_bits=16
+ 
+ wrote 1048576/1048576 bytes at offset 0
+ 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+diff --git a/tests/qemu-iotests/274.out b/tests/qemu-iotests/274.out
+index 16a95a48508b5c56ba146063a604..1d2928e14daac9aed9df887f566c 100644
+--- a/tests/qemu-iotests/274.out
++++ b/tests/qemu-iotests/274.out
+@@ -1,9 +1,6 @@
+ == Commit tests ==
+-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+ wrote 2097152/2097152 bytes at offset 0
+ 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -66,11 +63,8 @@ read 1048576/1048576 bytes at offset 1048576
+ 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+ 
+ === Testing HMP commit (top -> mid) ===
+-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+ wrote 2097152/2097152 bytes at offset 0
+ 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -98,11 +92,8 @@ read 1048576/1048576 bytes at offset 1048576
+ 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+ 
+ === Testing QMP active commit (top -> mid) ===
+-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+ wrote 2097152/2097152 bytes at offset 0
+ 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -136,11 +127,8 @@ read 1048576/1048576 bytes at offset 1048576
+ 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+ 
+ === Testing qemu-img commit (top -> base) ===
+-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+ wrote 2097152/2097152 bytes at offset 0
+ 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -166,11 +154,8 @@ read 1048576/1048576 bytes at offset 1048576
+ 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+ 
+ === Testing QMP active commit (top -> base) ===
+-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+ wrote 2097152/2097152 bytes at offset 0
+ 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -205,9 +190,7 @@ read 1048576/1048576 bytes at offset 1048576
+ 
+ == Resize tests ==
+ === preallocation=off ===
+-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=6442450944 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1073741824 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+ wrote 65536/65536 bytes at offset 5368709120
+ 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -224,9 +207,7 @@ read 65536/65536 bytes at offset 5368709120
+ { "start": 1073741824, "length": 7516192768, "depth": 0, "present": true, "zero": true, "data": false}]
+ 
+ === preallocation=metadata ===
+-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=34359738368 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=32212254720 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+ wrote 65536/65536 bytes at offset 33285996544
+ 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -248,9 +229,7 @@ read 65536/65536 bytes at offset 33285996544
+ { "start": 34896609280, "length": 536870912, "depth": 0, "present": true, "zero": true, "data": false, "offset": 2685075456}]
+ 
+ === preallocation=falloc ===
+-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=10485760 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=5242880 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+ wrote 65536/65536 bytes at offset 9437184
+ 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -267,9 +246,7 @@ read 65536/65536 bytes at offset 9437184
+ { "start": 5242880, "length": 10485760, "depth": 0, "present": true, "zero": false, "data": true, "offset": 327680}]
+ 
+ === preallocation=full ===
+-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=16777216 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=8388608 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+ wrote 65536/65536 bytes at offset 11534336
+ 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -286,9 +263,7 @@ read 65536/65536 bytes at offset 11534336
+ { "start": 8388608, "length": 4194304, "depth": 0, "present": true, "zero": false, "data": true, "offset": 327680}]
+ 
+ === preallocation=off ===
+-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=393216 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=259072 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+ wrote 65536/65536 bytes at offset 259072
+ 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -306,9 +281,7 @@ read 65536/65536 bytes at offset 259072
+ { "start": 262144, "length": 262144, "depth": 0, "present": true, "zero": true, "data": false}]
+ 
+ === preallocation=off ===
+-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=409600 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=262144 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+ wrote 65536/65536 bytes at offset 344064
+ 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -325,9 +298,7 @@ read 65536/65536 bytes at offset 344064
+ { "start": 262144, "length": 262144, "depth": 0, "present": true, "zero": true, "data": false}]
+ 
+ === preallocation=off ===
+-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=524288 lazy_refcounts=off refcount_bits=16
+ 
+-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=262144 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16
+ 
+ wrote 65536/65536 bytes at offset 446464
+ 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+diff --git a/tests/qemu-iotests/280.out b/tests/qemu-iotests/280.out
+index 09a0f1a7cb42ff5934e549530e65..e39164c579ff1c1644159e263945 100644
+--- a/tests/qemu-iotests/280.out
++++ b/tests/qemu-iotests/280.out
+@@ -1,4 +1,3 @@
+-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=67108864 lazy_refcounts=off refcount_bits=16
+ 
+ === Launch VM ===
+ Enabling migration QMP events on VM...
+diff --git a/tests/qemu-iotests/296.out b/tests/qemu-iotests/296.out
+index 6c69735604532c161dad12e5d97b..42205cc98141fce2d094755e8224 100644
+--- a/tests/qemu-iotests/296.out
++++ b/tests/qemu-iotests/296.out
+@@ -1,4 +1,3 @@
+-Formatting 'TEST_DIR/test.img', fmt=luks size=1048576 key-secret=keysec0 iter-time=10
+ 
+ {"execute": "job-dismiss", "arguments": {"id": "job0"}}
+ {"return": {}}
+@@ -13,8 +12,7 @@ Job failed: Failed to get shared "consistent read" lock
+ qemu-img: Failed to get shared "consistent read" lock
+ Is another process using the image [TEST_DIR/test.img]?
+ 
+-.Formatting 'TEST_DIR/test.img', fmt=luks size=1048576 key-secret=keysec0 iter-time=10
+-
++.
+ Job failed: Block node is read-only
+ {"execute": "job-dismiss", "arguments": {"id": "job0"}}
+ {"return": {}}
+@@ -26,12 +24,10 @@ Job failed: Failed to get shared "consistent read" lock
+ {"return": {}}
+ {"execute": "job-dismiss", "arguments": {"id": "job0"}}
+ {"return": {}}
+-.Formatting 'TEST_DIR/test.img', fmt=luks size=1048576 key-secret=keysec0 iter-time=10
+-
++.
+ {"return": {}}
+ {"error": {"class": "GenericError", "desc": "Failed to get \"write\" lock"}}
+-.Formatting 'TEST_DIR/test.img', fmt=luks size=1048576 key-secret=keysec0 iter-time=10
+-
++.
+ {"return": {}}
+ {"return": {}}
+ .
+diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
+index f424e04573a7f7f07474e5d96f3e..4bb740634df7a0841456aed78c42 100644
+--- a/tests/qemu-iotests/iotests.py
++++ b/tests/qemu-iotests/iotests.py
+@@ -140,7 +140,9 @@ def unarchive_sample_image(sample, fname):
+ 
+ 
+ def qemu_tool_pipe_and_status(tool: str, args: Sequence[str],
+-                              connect_stderr: bool = True) -> Tuple[str, int]:
++                              connect_stderr: bool = True,
++                              drop_successful_output: bool = False) \
++        -> Tuple[str, int]:
+     """
+     Run a tool and return both its output and its exit code
+     """
+@@ -152,6 +154,8 @@ def qemu_tool_pipe_and_status(tool: str, args: Sequence[str],
+             cmd = ' '.join(args)
+             sys.stderr.write(f'{tool} received signal \
+                                {-subp.returncode}: {cmd}\n')
++        if drop_successful_output and subp.returncode == 0:
++            output = ''
+         return (output, subp.returncode)
+ 
+ def qemu_img_create_prepare_args(args: List[str]) -> List[str]:
+@@ -196,8 +200,10 @@ def qemu_img_pipe_and_status(*args: str) -> Tuple[str, int]:
+     """
+     Run qemu-img and return both its output and its exit code
+     """
++    is_create = bool(args and args[0] == 'create')
+     full_args = qemu_img_args + qemu_img_create_prepare_args(list(args))
+-    return qemu_tool_pipe_and_status('qemu-img', full_args)
++    return qemu_tool_pipe_and_status('qemu-img', full_args,
++                                     drop_successful_output=is_create)
+ 
+ def qemu_img(*args: str) -> int:
+     '''Run qemu-img and return the exit code'''

iotests.py-img_info_log-rename-imgopts-a.patch

@@ -0,0 +1,75 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:26 +0100
+Subject: iotests.py: img_info_log(): rename imgopts argument
+
+Git-commit: 3bd2b942d9a8a10bb7a504a1ecf4a3e70803840e
+
+We are going to support IMGOPTS environment variable like in bash
+tests. Corresponding global variable in iotests.py should be called
+imgopts. So to not interfere with function argument, rename it in
+advance.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Max Reitz <mreitz@redhat.com>
+Message-Id: <20211223160144.1097696-2-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/210        | 8 ++++----
+ tests/qemu-iotests/iotests.py | 5 +++--
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/tests/qemu-iotests/210 b/tests/qemu-iotests/210
+index a4dcc5fe59d8ec9ec66b9cfe4770..10b0a0b87cd1c38c4f675472f560 100755
+--- a/tests/qemu-iotests/210
++++ b/tests/qemu-iotests/210
+@@ -62,7 +62,7 @@ with iotests.FilePath('t.luks') as disk_path, \
+         'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path),
+         filter_path=disk_path,
+         extra_args=['--object', 'secret,id=keysec0,data=foo'],
+-        imgopts=True)
++        use_image_opts=True)
+ 
+     #
+     # Successful image creation (with non-default options)
+@@ -96,7 +96,7 @@ with iotests.FilePath('t.luks') as disk_path, \
+         'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path),
+         filter_path=disk_path,
+         extra_args=['--object', 'secret,id=keysec0,data=foo'],
+-        imgopts=True)
++        use_image_opts=True)
+ 
+     #
+     # Invalid BlockdevRef
+@@ -132,7 +132,7 @@ with iotests.FilePath('t.luks') as disk_path, \
+         'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path),
+         filter_path=disk_path,
+         extra_args=['--object', 'secret,id=keysec0,data=foo'],
+-        imgopts=True)
++        use_image_opts=True)
+ 
+     #
+     # Invalid sizes
+@@ -176,4 +176,4 @@ with iotests.FilePath('t.luks') as disk_path, \
+         'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path),
+         filter_path=disk_path,
+         extra_args=['--object', 'secret,id=keysec0,data=foo'],
+-        imgopts=True)
++        use_image_opts=True)
+diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
+index 83bfedb90201ce96118f62dc2b37..9b374dad3dd063fbcbd10963ce5b 100644
+--- a/tests/qemu-iotests/iotests.py
++++ b/tests/qemu-iotests/iotests.py
+@@ -219,9 +219,10 @@ def qemu_img_log(*args):
+     log(result, filters=[filter_testfiles])
+     return result
+ 
+-def img_info_log(filename, filter_path=None, imgopts=False, extra_args=()):
++def img_info_log(filename, filter_path=None, use_image_opts=False,
++                 extra_args=()):
+     args = ['info']
+-    if imgopts:
++    if use_image_opts:
+         args.append('--image-opts')
+     else:
+         args += ['-f', imgfmt]

iotests.py-implement-unsupported_imgopts.patch

@@ -0,0 +1,64 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:27 +0100
+Subject: iotests.py: implement unsupported_imgopts
+
+Git-commit: 7c15400cdd06b7b9b26c86eac1858fb9c0d77c1c
+
+We are going to support some addition IMGOPTS in python iotests like
+in bash iotests. Similarly to bash iotests, we want a way to skip some
+tests which can't work with specific IMGOPTS.
+
+Globally for python iotests we will not support things like
+'data_file=$TEST_IMG.ext_data_file' in IMGOPTS, so, forbid this
+globally in iotests.py.
+
+Suggested-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Hanna Reitz <hreitz@redhat.com>
+Message-Id: <20211223160144.1097696-3-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/iotests.py | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
+index 9b374dad3dd063fbcbd10963ce5b..35d92715ccf4defe721a38982788 100644
+--- a/tests/qemu-iotests/iotests.py
++++ b/tests/qemu-iotests/iotests.py
+@@ -1215,6 +1215,17 @@ def _verify_virtio_scsi_pci_or_ccw() -> None:
+         notrun('Missing virtio-scsi-pci or virtio-scsi-ccw in QEMU binary')
+ 
+ 
++def _verify_imgopts(unsupported: Sequence[str] = ()) -> None:
++    imgopts = os.environ.get('IMGOPTS')
++    # One of usage examples for IMGOPTS is "data_file=$TEST_IMG.ext_data_file"
++    # but it supported only for bash tests. We don't have a concept of global
++    # TEST_IMG in iotests.py, not saying about somehow parsing $variables.
++    # So, for simplicity let's just not support any IMGOPTS with '$' inside.
++    unsup = list(unsupported) + ['$']
++    if imgopts and any(x in imgopts for x in unsup):
++        notrun(f'not suitable for this imgopts: {imgopts}')
++
++
+ def supports_quorum():
+     return 'quorum' in qemu_img_pipe('--help')
+ 
+@@ -1391,7 +1402,8 @@ def execute_setup_common(supported_fmts: Sequence[str] = (),
+                          unsupported_fmts: Sequence[str] = (),
+                          supported_protocols: Sequence[str] = (),
+                          unsupported_protocols: Sequence[str] = (),
+-                         required_fmts: Sequence[str] = ()) -> bool:
++                         required_fmts: Sequence[str] = (),
++                         unsupported_imgopts: Sequence[str] = ()) -> bool:
+     """
+     Perform necessary setup for either script-style or unittest-style tests.
+ 
+@@ -1411,6 +1423,7 @@ def execute_setup_common(supported_fmts: Sequence[str] = (),
+     _verify_aio_mode(supported_aio_modes)
+     _verify_formats(required_fmts)
+     _verify_virtio_blk()
++    _verify_imgopts(unsupported_imgopts)
+ 
+     return debug
+ 

iotests.py-qemu_img-create-support-IMGOP.patch

@@ -0,0 +1,91 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:29 +0100
+Subject: iotests.py: qemu_img*("create"): support
+ IMGOPTS='compression_type=zstd'
+
+Git-commit: 22e29bcea12ccf0e127b91917d959c69bebbd952
+
+Adding support of IMGOPTS (like in bash tests) allows user to pass a
+lot of different options. Still, some may require additional logic.
+
+Now we want compression_type option, so add some smart logic around it:
+ignore compression_type=zstd in IMGOPTS, if test want qcow2 in
+compatibility mode. As well, ignore compression_type for non-qcow2
+formats.
+
+Note that we may instead add support only to qemu_img_create(), but
+that works bad:
+
+1. We'll have to update a lot of tests to use qemu_img_create instead
+   of qemu_img('create'). (still, we may want do it anyway, but no
+   reason to create a dependancy between task of supporting IMGOPTS and
+   updating a lot of tests)
+
+2. Some tests use qemu_img_pipe('create', ..) - even more work on
+   updating
+
+3. Even if we update all tests to go through qemu_img_create, we'll
+   need a way to avoid creating new tests using qemu_img*('create') -
+   add assertions.. That doesn't seem good.
+
+So, let's add support of IMGOPTS to most generic
+qemu_img_pipe_and_status().
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Hanna Reitz <hreitz@redhat.com>
+Message-Id: <20211223160144.1097696-5-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/iotests.py | 27 ++++++++++++++++++++++++++-
+ 1 file changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
+index 35d92715ccf4defe721a38982788..f0370b520651aa4ccc1cdb0cf28e 100644
+--- a/tests/qemu-iotests/iotests.py
++++ b/tests/qemu-iotests/iotests.py
+@@ -16,6 +16,7 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
++import argparse
+ import atexit
+ import bz2
+ from collections import OrderedDict
+@@ -153,11 +154,35 @@ def qemu_tool_pipe_and_status(tool: str, args: Sequence[str],
+                                {-subp.returncode}: {cmd}\n')
+         return (output, subp.returncode)
+ 
++def qemu_img_create_prepare_args(args: List[str]) -> List[str]:
++    if not args or args[0] != 'create':
++        return list(args)
++    args = args[1:]
++
++    p = argparse.ArgumentParser(allow_abbrev=False)
++    p.add_argument('-f')
++    parsed, remaining = p.parse_known_args(args)
++
++    result = ['create']
++    if parsed.f is not None:
++        result += ['-f', parsed.f]
++
++    # IMGOPTS most probably contain options specific for the selected format,
++    # like extended_l2 or compression_type for qcow2. Test may want to create
++    # additional images in other formats that doesn't support these options.
++    # So, use IMGOPTS only for images created in imgfmt format.
++    if parsed.f == imgfmt and 'IMGOPTS' in os.environ:
++        result += ['-o', os.environ['IMGOPTS']]
++
++    result += remaining
++
++    return result
++
+ def qemu_img_pipe_and_status(*args: str) -> Tuple[str, int]:
+     """
+     Run qemu-img and return both its output and its exit code
+     """
+-    full_args = qemu_img_args + list(args)
++    full_args = qemu_img_args + qemu_img_create_prepare_args(list(args))
+     return qemu_tool_pipe_and_status('qemu-img', full_args)
+ 
+ def qemu_img(*args: str) -> int:

iotests.py-rewrite-default-luks-support-.patch

@@ -0,0 +1,83 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:31 +0100
+Subject: iotests.py: rewrite default luks support in qemu_img
+
+Git-commit: 28a5ad93da08ae55c8dfac0db8615936ca14b822
+
+Move the logic to more generic qemu_img_pipe_and_status(). Also behave
+better when we have several -o options. And reuse argument parser of
+course.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Hanna Reitz <hreitz@redhat.com>
+Message-Id: <20211223160144.1097696-7-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/iotests.py | 36 +++++++++++++++++------------------
+ 1 file changed, 17 insertions(+), 19 deletions(-)
+
+diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
+index 5a6bfcbb6adbb84d412e37966360..f424e04573a7f7f07474e5d96f3e 100644
+--- a/tests/qemu-iotests/iotests.py
++++ b/tests/qemu-iotests/iotests.py
+@@ -160,9 +160,13 @@ def qemu_img_create_prepare_args(args: List[str]) -> List[str]:
+     args = args[1:]
+ 
+     p = argparse.ArgumentParser(allow_abbrev=False)
++    # -o option may be specified several times
++    p.add_argument('-o', action='append', default=[])
+     p.add_argument('-f')
+     parsed, remaining = p.parse_known_args(args)
+ 
++    opts_list = parsed.o
++
+     result = ['create']
+     if parsed.f is not None:
+         result += ['-f', parsed.f]
+@@ -171,8 +175,18 @@ def qemu_img_create_prepare_args(args: List[str]) -> List[str]:
+     # like extended_l2 or compression_type for qcow2. Test may want to create
+     # additional images in other formats that doesn't support these options.
+     # So, use IMGOPTS only for images created in imgfmt format.
+-    if parsed.f == imgfmt and 'IMGOPTS' in os.environ:
+-        result += ['-o', os.environ['IMGOPTS']]
++    imgopts = os.environ.get('IMGOPTS')
++    if imgopts and parsed.f == imgfmt:
++        opts_list.insert(0, imgopts)
++
++    # default luks support
++    if parsed.f == 'luks' and \
++            all('key-secret' not in opts for opts in opts_list):
++        result += ['--object', luks_default_secret_object]
++        opts_list.append(luks_default_key_secret_opt)
++
++    for opts in opts_list:
++        result += ['-o', opts]
+ 
+     result += remaining
+ 
+@@ -203,23 +217,7 @@ def ordered_qmp(qmsg, conv_keys=True):
+     return qmsg
+ 
+ def qemu_img_create(*args):
+-    args = list(args)
+-
+-    # default luks support
+-    if '-f' in args and args[args.index('-f') + 1] == 'luks':
+-        if '-o' in args:
+-            i = args.index('-o')
+-            if 'key-secret' not in args[i + 1]:
+-                args[i + 1].append(luks_default_key_secret_opt)
+-                args.insert(i + 2, '--object')
+-                args.insert(i + 3, luks_default_secret_object)
+-        else:
+-            args = ['-o', luks_default_key_secret_opt,
+-                    '--object', luks_default_secret_object] + args
+-
+-    args.insert(0, 'create')
+-
+-    return qemu_img(*args)
++    return qemu_img('create', *args)
+ 
+ def qemu_img_measure(*args):
+     return json.loads(qemu_img_pipe("measure", "--output", "json", *args))

qcow2-simple-case-support-for-downgradin.patch

@@ -0,0 +1,108 @@
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Date: Thu, 23 Dec 2021 17:01:37 +0100
+Subject: qcow2: simple case support for downgrading of qcow2 images with zstd
+
+Git-commit: 083c24561a1f52829b5b31a0fb2f7c77efb979c0
+
+If image doesn't have any compressed cluster we can easily switch to
+zlib compression, which may allow to downgrade the image.
+
+That's mostly needed to support IMGOPTS='compression_type=zstd' in some
+iotests which do qcow2 downgrade.
+
+While being here also fix checkpatch complain against '#' in printf
+formatting.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Max Reitz <mreitz@redhat.com>
+Message-Id: <20211223160144.1097696-13-vsementsov@virtuozzo.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ block/qcow2.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 56 insertions(+), 2 deletions(-)
+
+diff --git a/block/qcow2.c b/block/qcow2.c
+index d50901675699ef3806bacb780ee0..c8115e1cba0f8ed09254f7889d38 100644
+--- a/block/qcow2.c
++++ b/block/qcow2.c
+@@ -5279,6 +5279,38 @@ static int qcow2_load_vmstate(BlockDriverState *bs, QEMUIOVector *qiov,
+     return bs->drv->bdrv_co_preadv_part(bs, offset, qiov->size, qiov, 0, 0);
+ }
+ 
++static int qcow2_has_compressed_clusters(BlockDriverState *bs)
++{
++    int64_t offset = 0;
++    int64_t bytes = bdrv_getlength(bs);
++
++    if (bytes < 0) {
++        return bytes;
++    }
++
++    while (bytes != 0) {
++        int ret;
++        QCow2SubclusterType type;
++        unsigned int cur_bytes = MIN(INT_MAX, bytes);
++        uint64_t host_offset;
++
++        ret = qcow2_get_host_offset(bs, offset, &cur_bytes, &host_offset,
++                                    &type);
++        if (ret < 0) {
++            return ret;
++        }
++
++        if (type == QCOW2_SUBCLUSTER_COMPRESSED) {
++            return 1;
++        }
++
++        offset += cur_bytes;
++        bytes -= cur_bytes;
++    }
++
++    return 0;
++}
++
+ /*
+  * Downgrades an image's version. To achieve this, any incompatible features
+  * have to be removed.
+@@ -5336,9 +5368,10 @@ static int qcow2_downgrade(BlockDriverState *bs, int target_version,
+      * the first place; if that happens nonetheless, returning -ENOTSUP is the
+      * best thing to do anyway */
+ 
+-    if (s->incompatible_features) {
++    if (s->incompatible_features & ~QCOW2_INCOMPAT_COMPRESSION) {
+         error_setg(errp, "Cannot downgrade an image with incompatible features "
+-                   "%#" PRIx64 " set", s->incompatible_features);
++                   "0x%" PRIx64 " set",
++                   s->incompatible_features & ~QCOW2_INCOMPAT_COMPRESSION);
+         return -ENOTSUP;
+     }
+ 
+@@ -5356,6 +5389,27 @@ static int qcow2_downgrade(BlockDriverState *bs, int target_version,
+         return ret;
+     }
+ 
++    if (s->incompatible_features & QCOW2_INCOMPAT_COMPRESSION) {
++        ret = qcow2_has_compressed_clusters(bs);
++        if (ret < 0) {
++            error_setg(errp, "Failed to check block status");
++            return -EINVAL;
++        }
++        if (ret) {
++            error_setg(errp, "Cannot downgrade an image with zstd compression "
++                       "type and existing compressed clusters");
++            return -ENOTSUP;
++        }
++        /*
++         * No compressed clusters for now, so just chose default zlib
++         * compression.
++         */
++        s->incompatible_features &= ~QCOW2_INCOMPAT_COMPRESSION;
++        s->compression_type = QCOW2_COMPRESSION_TYPE_ZLIB;
++    }
++
++    assert(s->incompatible_features == 0);
++
+     s->qcow_version = target_version;
+     ret = qcow2_update_header(bs);
+     if (ret < 0) {

qemu.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Feb 18 11:47:54 UTC 2022 - Li Zhang <li.zhang@suse.com>
+
+* Patches added:
+  block-backend-Retain-permissions-after-m.patch
+  iotest-065-explicit-compression-type.patch
+  iotest-214-explicit-compression-type.patch
+  iotest-302-use-img_info_log-helper.patch
+  iotest-303-explicit-compression-type.patch
+  iotest-39-use-_qcow2_dump_header.patch
+  iotests-60-more-accurate-set-dirty-bit-i.patch
+  iotests-bash-tests-filter-compression-ty.patch
+  iotests-common.rc-introduce-_qcow2_dump_.patch
+  iotests-declare-lack-of-support-for-comp.patch
+  iotests-drop-qemu_img_verbose-helper.patch
+  iotests-massive-use-_qcow2_dump_header.patch
+  iotests-MRCE-Write-data-to-source.patch
+  iotests.py-filter-out-successful-output-.patch
+  iotests.py-img_info_log-rename-imgopts-a.patch
+  iotests.py-implement-unsupported_imgopts.patch
+  iotests.py-qemu_img-create-support-IMGOP.patch
+  iotests.py-rewrite-default-luks-support-.patch
+  iotests-specify-some-unsupported_imgopts.patch
+  qcow2-simple-case-support-for-downgradin.patch
+  tests-qemu-iotests-Fix-051-for-binaries-.patch
+
 -------------------------------------------------------------------
 Wed Feb 16 10:58:52 UTC 2022 - Li Zhang <li.zhang@suse.com>
 

qemu.spec

@@ -181,6 +181,27 @@ Patch00045:     qemu-binfmt-conf.sh-allow-overriding-SUS.patch
 Patch00046:     scsi-generic-replace-logical-block-count.patch
 Patch00047:     meson-build-all-modules-by-default.patch
 Patch00048:     acpi-validate-hotplug-selector-on-access.patch
+Patch00049:     tests-qemu-iotests-Fix-051-for-binaries-.patch
+Patch00050:     iotests-MRCE-Write-data-to-source.patch
+Patch00051:     iotests.py-img_info_log-rename-imgopts-a.patch
+Patch00052:     iotests.py-implement-unsupported_imgopts.patch
+Patch00053:     iotests-specify-some-unsupported_imgopts.patch
+Patch00054:     iotests.py-qemu_img-create-support-IMGOP.patch
+Patch00055:     iotests-drop-qemu_img_verbose-helper.patch
+Patch00056:     iotests.py-rewrite-default-luks-support-.patch
+Patch00057:     iotest-303-explicit-compression-type.patch
+Patch00058:     iotest-065-explicit-compression-type.patch
+Patch00059:     iotests.py-filter-out-successful-output-.patch
+Patch00060:     iotest-302-use-img_info_log-helper.patch
+Patch00061:     qcow2-simple-case-support-for-downgradin.patch
+Patch00062:     iotests-common.rc-introduce-_qcow2_dump_.patch
+Patch00063:     iotests-massive-use-_qcow2_dump_header.patch
+Patch00064:     iotest-39-use-_qcow2_dump_header.patch
+Patch00065:     iotests-bash-tests-filter-compression-ty.patch
+Patch00066:     iotests-60-more-accurate-set-dirty-bit-i.patch
+Patch00067:     iotest-214-explicit-compression-type.patch
+Patch00068:     iotests-declare-lack-of-support-for-comp.patch
+Patch00069:     block-backend-Retain-permissions-after-m.patch
 # Patches applied in roms/seabios/:
 Patch01000:     seabios-use-python2-explicitly-as-needed.patch
 Patch01001:     seabios-switch-to-python3-as-needed.patch
@@ -1129,6 +1150,27 @@ This package records qemu testsuite results and represents successful testing.
 %patch00046 -p1
 %patch00047 -p1
 %patch00048 -p1
+%patch00049 -p1
+%patch00050 -p1
+%patch00051 -p1
+%patch00052 -p1
+%patch00053 -p1
+%patch00054 -p1
+%patch00055 -p1
+%patch00056 -p1
+%patch00057 -p1
+%patch00058 -p1
+%patch00059 -p1
+%patch00060 -p1
+%patch00061 -p1
+%patch00062 -p1
+%patch00063 -p1
+%patch00064 -p1
+%patch00065 -p1
+%patch00066 -p1
+%patch00067 -p1
+%patch00068 -p1
+%patch00069 -p1
 %patch01000 -p1
 %patch01001 -p1
 %patch01002 -p1

tests-qemu-iotests-Fix-051-for-binaries-.patch

@@ -0,0 +1,34 @@
+From: Thomas Huth <thuth@redhat.com>
+Date: Mon, 6 Dec 2021 15:34:04 +0100
+Subject: tests/qemu-iotests: Fix 051 for binaries without 'lsi53c895a'
+
+Git-commit: 0c83471bd75d329f4945e27dc1aa3a6cc2fda3bf
+
+The lsi53c895a SCSI adaptor might not be enabled in each and every
+x86 QEMU binary, e.g. it's disabled in the RHEL/CentOS build.
+Thus let's add a check to the 051 test so that it does not fail if
+this device is not available.
+
+Signed-off-by: Thomas Huth <thuth@redhat.com>
+Message-Id: <20211206143404.247032-1-thuth@redhat.com>
+Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+Signed-off-by: Li Zhang <lizhang@suse.de>
+---
+ tests/qemu-iotests/051 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
+index 1d2fa93a11593ffa70cecf106532..e9042a621420332ac288060cbec2 100755
+--- a/tests/qemu-iotests/051
++++ b/tests/qemu-iotests/051
+@@ -45,6 +45,10 @@ _supported_proto file
+ _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
+ _require_drivers nbd
+ 
++if [ "$QEMU_DEFAULT_MACHINE" = "pc" ]; then
++    _require_devices lsi53c895a
++fi
++
+ do_run_qemu()
+ {
+     echo Testing: "$@"