Series comparison

-[PULL 00/34] Block patches
+[PULL 00/14] Block patches
-The following changes since commit f17783e706ab9c7b3a2b69cf48e4f0ba40664f54:
+The following changes since commit f5fe7c17ac4e309e47e78f0f9761aebc8d2f2c81:
-  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20191220' into staging (2020-01-03 18:50:33 +0000)
+  Merge tag 'pull-tcg-20230823-2' of https://gitlab.com/rth7680/qemu into staging (2023-08-28 16:07:04 -0400)
 are available in the Git repository at:
-  https://github.com/XanClic/qemu.git tags/pull-block-2020-01-06
+  https://gitlab.com/hreitz/qemu.git tags/pull-block-2023-09-01
-for you to fetch changes up to 503ca1262bab2c11c533a4816d1ff4297d4f58a6:
+for you to fetch changes up to 380448464dd89291cf7fd7434be6c225482a334d:
-  backup-top: Begin drain earlier (2020-01-06 14:26:23 +0100)
+  tests/file-io-error: New test (2023-08-29 13:01:24 +0200)
 ----------------------------------------------------------------
-Block patches:
+Block patches
-- Minor fixes and tests from the freeze period (too minor to be included
-  in 4.2)
+- Fix for file-posix's zoning code crashing on I/O errors
-- Allow many bash iotests to test qcow2's external data file feature
+- Throttling refactoring
 - Add compress filter driver
 - Fix Python iotests after 6f6e1698a6
 - Fix for the backup job
 ----------------------------------------------------------------
-Andrey Shinkevich (3):
+Hanna Czenczek (5):
-  block: introduce compress filter driver
+  file-posix: Clear bs->bl.zoned on error
-  qcow2: Allow writing compressed data of multiple clusters
+  file-posix: Check bs->bl.zoned for zone info
-  tests/qemu-iotests: add case to write compressed data of multiple
+  file-posix: Fix zone update in I/O error path
-    clusters
+  file-posix: Simplify raw_co_prw's 'out' zone code
   tests/file-io-error: New test
-Max Reitz (28):
+Zhenwei Pi (9):
-  block: Add bdrv_qapi_perm_to_blk_perm()
+  throttle: introduce enum ThrottleDirection
-  block: Use bdrv_qapi_perm_to_blk_perm()
+  test-throttle: use enum ThrottleDirection
-  blkdebug: Allow taking/unsharing permissions
+  throttle: support read-only and write-only
-  iotests: Add @error to wait_until_completed
+  test-throttle: test read only and write only
-  iotests: Add test for failing mirror complete
+  cryptodev: use NULL throttle timer cb for read direction
-  iotests: s/qocw2/qcow2/
+  throttle: use enum ThrottleDirection instead of bool is_write
-  iotests/qcow2.py: Add dump-header-exts
+  throttle: use THROTTLE_MAX/ARRAY_SIZE for hard code
-  iotests/qcow2.py: Split feature fields into bits
+  fsdev: Use ThrottleDirection instread of bool is_write
-  iotests: Add _filter_json_filename
+  block/throttle-groups: Use ThrottleDirection instread of bool is_write
   iotests: Filter refcount_order in 036
   iotests: Replace IMGOPTS by _unsupported_imgopts
   iotests: Drop compat=1.1 in 050
   iotests: Let _make_test_img parse its parameters
   iotests: Add -o and --no-opts to _make_test_img
   iotests: Inject space into -ocompat=0.10 in 051
   iotests: Replace IMGOPTS= by -o
   iotests: Replace IMGOPTS='' by --no-opts
   iotests: Drop IMGOPTS use in 267
   iotests: Avoid qemu-img create
   iotests: Use _rm_test_img for deleting test images
   iotests: Avoid cp/mv of test images
   iotests: Make 091 work with data_file
   iotests: Make 110 work with data_file
   iotests: Make 137 work with data_file
   iotests: Make 198 work with data_file
   iotests: Disable data_file where it cannot be used
   iotests: Allow check -o data_file
   backup-top: Begin drain earlier
-PanNengyuan (1):
+ fsdev/qemu-fsdev-throttle.h                |   4 +-
-  throttle-groups: fix memory leak in throttle_group_set_limit:
+ include/block/throttle-groups.h            |   6 +-
+ include/qemu/throttle.h                    |  16 +-
-Philippe Mathieu-Daudé (1):
+ backends/cryptodev.c                       |  12 +-
-  tests/qemu-iotests: Update tests to recent desugarized -accel option
+ block/block-backend.c                      |   4 +-
+ block/file-posix.c                         |  42 +++---
-Vladimir Sementsov-Ogievskiy (1):
+ block/throttle-groups.c                    | 163 +++++++++++----------
-  qcow2-bitmaps: fix qcow2_can_store_new_dirty_bitmap
+ block/throttle.c                           |   8 +-
+ fsdev/qemu-fsdev-throttle.c                |  18 ++-
- block.c                          |  47 +++++----
+ hw/9pfs/cofile.c                           |   4 +-
- block/Makefile.objs              |   1 +
+ tests/unit/test-throttle.c                 |  76 +++++++++-
- block/backup-top.c               |   4 +-
+ util/throttle.c                            |  84 +++++++----
- block/blkdebug.c                 |  93 ++++++++++++++++-
+ tests/qemu-iotests/tests/file-io-error     | 119 +++++++++++++++
- block/filter-compress.c          | 168 +++++++++++++++++++++++++++++++
+ tests/qemu-iotests/tests/file-io-error.out |  33 +++++
- block/qcow2-bitmap.c             |  41 ++++----
+files changed, 418 insertions(+), 171 deletions(-)
- block/qcow2.c                    | 102 ++++++++++++++-----
+ create mode 100755 tests/qemu-iotests/tests/file-io-error
- block/throttle-groups.c          |   4 +-
+ create mode 100644 tests/qemu-iotests/tests/file-io-error.out
  include/block/block.h            |   1 +
  qapi/block-core.json             |  24 ++++-
  tests/qemu-iotests/007           |   5 +-
  tests/qemu-iotests/014           |   2 +
  tests/qemu-iotests/015           |   5 +-
  tests/qemu-iotests/019           |   6 +-
  tests/qemu-iotests/020           |   6 +-
  tests/qemu-iotests/024           |  10 +-
  tests/qemu-iotests/026           |   5 +-
  tests/qemu-iotests/028           |   2 +-
  tests/qemu-iotests/029           |   7 +-
  tests/qemu-iotests/031           |   9 +-
  tests/qemu-iotests/031.out       |  36 +++----
  tests/qemu-iotests/036           |  15 +--
  tests/qemu-iotests/036.out       |  66 ++----------
  tests/qemu-iotests/039           |  27 ++---
  tests/qemu-iotests/039.out       |  22 ++--
  tests/qemu-iotests/041           |  44 ++++++++
  tests/qemu-iotests/041.out       |   4 +-
  tests/qemu-iotests/043           |   4 +-
  tests/qemu-iotests/046           |   2 +
  tests/qemu-iotests/048           |   4 +-
  tests/qemu-iotests/050           |   8 +-
  tests/qemu-iotests/051           |   7 +-
  tests/qemu-iotests/053           |   4 +-
  tests/qemu-iotests/058           |   7 +-
  tests/qemu-iotests/059           |  20 ++--
  tests/qemu-iotests/060           |  14 +--
  tests/qemu-iotests/060.out       |  20 ++--
  tests/qemu-iotests/061           |  63 ++++++------
  tests/qemu-iotests/061.out       |  72 ++++++-------
  tests/qemu-iotests/062           |   5 +-
  tests/qemu-iotests/063           |  18 ++--
  tests/qemu-iotests/063.out       |   3 +-
  tests/qemu-iotests/066           |   7 +-
  tests/qemu-iotests/067           |   6 +-
  tests/qemu-iotests/068           |   6 +-
  tests/qemu-iotests/069           |   2 +-
  tests/qemu-iotests/071           |   7 +-
  tests/qemu-iotests/073           |   4 +
  tests/qemu-iotests/074           |   4 +-
  tests/qemu-iotests/079           |   3 +-
  tests/qemu-iotests/080           |   7 +-
  tests/qemu-iotests/081           |   6 +-
  tests/qemu-iotests/085           |  18 ++--
  tests/qemu-iotests/085.out       |   8 +-
  tests/qemu-iotests/088           |   2 +-
  tests/qemu-iotests/090           |   2 +
  tests/qemu-iotests/091           |   2 +-
  tests/qemu-iotests/091.out       |   2 -
  tests/qemu-iotests/092           |   2 +-
  tests/qemu-iotests/094           |   4 +-
  tests/qemu-iotests/095           |   5 +-
  tests/qemu-iotests/098           |   6 +-
  tests/qemu-iotests/099           |  10 +-
  tests/qemu-iotests/103           |   5 +-
  tests/qemu-iotests/106           |   2 +-
  tests/qemu-iotests/108           |  10 +-
  tests/qemu-iotests/109           |   4 +-
  tests/qemu-iotests/110           |  11 +-
  tests/qemu-iotests/110.out       |   4 +-
  tests/qemu-iotests/111           |   3 +-
  tests/qemu-iotests/112           |  37 +++----
  tests/qemu-iotests/114           |   2 +
  tests/qemu-iotests/115           |   3 +-
  tests/qemu-iotests/121           |   9 +-
  tests/qemu-iotests/122           |   6 +-
  tests/qemu-iotests/123           |   4 +-
  tests/qemu-iotests/125           |   2 +-
  tests/qemu-iotests/137           |  17 +++-
  tests/qemu-iotests/137.out       |   6 +-
  tests/qemu-iotests/138           |   8 +-
  tests/qemu-iotests/141           |   4 +-
  tests/qemu-iotests/142           |   2 +-
  tests/qemu-iotests/144           |   4 +-
  tests/qemu-iotests/153           |  12 +--
  tests/qemu-iotests/156           |  10 +-
  tests/qemu-iotests/159           |   2 +-
  tests/qemu-iotests/160           |   3 +-
  tests/qemu-iotests/161           |   4 +-
  tests/qemu-iotests/170           |   2 +-
  tests/qemu-iotests/172           |   6 +-
  tests/qemu-iotests/173           |   3 +-
  tests/qemu-iotests/174           |   2 +-
  tests/qemu-iotests/175           |   2 +-
  tests/qemu-iotests/176           |   7 +-
  tests/qemu-iotests/178           |   6 +-
  tests/qemu-iotests/182           |   2 +-
  tests/qemu-iotests/183           |   2 +-
  tests/qemu-iotests/185           |   4 +-
  tests/qemu-iotests/187           |   6 +-
  tests/qemu-iotests/190           |   4 +-
  tests/qemu-iotests/191           |  11 +-
  tests/qemu-iotests/195           |   2 +-
  tests/qemu-iotests/197           |   6 +-
  tests/qemu-iotests/198           |   6 +-
  tests/qemu-iotests/198.out       |   4 +-
  tests/qemu-iotests/200           |   7 +-
  tests/qemu-iotests/201           |   6 +-
  tests/qemu-iotests/214           |  46 ++++++++-
  tests/qemu-iotests/214.out       |  14 +++
  tests/qemu-iotests/215           |   6 +-
  tests/qemu-iotests/217           |   3 +-
  tests/qemu-iotests/220           |   5 +-
  tests/qemu-iotests/225           |   2 +-
  tests/qemu-iotests/229           |   3 +-
  tests/qemu-iotests/232           |   4 +-
  tests/qemu-iotests/235           |   2 +-
  tests/qemu-iotests/243           |  10 +-
  tests/qemu-iotests/244           |  15 +--
  tests/qemu-iotests/247           |   4 +-
  tests/qemu-iotests/249           |   4 +-
  tests/qemu-iotests/250           |   5 +-
  tests/qemu-iotests/252           |   2 +-
  tests/qemu-iotests/261           |   5 +-
  tests/qemu-iotests/265           |   2 +-
  tests/qemu-iotests/267           |  17 ++--
  tests/qemu-iotests/273           |   3 +
  tests/qemu-iotests/check         |   6 +-
  tests/qemu-iotests/common.filter |  47 ++++++++-
  tests/qemu-iotests/common.rc     |  63 ++++++++++--
  tests/qemu-iotests/iotests.py    |  18 ++--
  tests/qemu-iotests/qcow2.py      |  23 ++++-
 files changed, 1139 insertions(+), 552 deletions(-)
  create mode 100644 block/filter-compress.c
 --
-.24.1
+.41.0

-[PULL 01/34] block: Add bdrv_qapi_perm_to_blk_perm()
+Deleted patch
-We need some way to correlate QAPI BlockPermission values with
-BLK_PERM_* flags.  We could:
-(1) have the same order in the QAPI definition as the the BLK_PERM_*
-    flags are in LSb-first order.  However, then there is no guarantee
-    that they actually match (e.g. when someone modifies the QAPI schema
-    without thinking of the BLK_PERM_* definitions).
-    We could add static assertions, but these would break what’s good
-    about this solution, namely its simplicity.
-(2) define the BLK_PERM_* flags based on the BlockPermission values.
-    But this way whenever someone were to modify the QAPI order
-    (perfectly sensible in theory), the BLK_PERM_* values would change.
-    Because these values are used for file locking, this might break
-    file locking between different qemu versions.
-Therefore, go the slightly more cumbersome way: Add a function to
-translate from the QAPI constants to the BLK_PERM_* flags.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20191108123455.39445-2-mreitz@redhat.com
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block.c               | 18 ++++++++++++++++++
- include/block/block.h |  1 +
-files changed, 19 insertions(+)
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c,
-     *nshared = shared;
- }
-+uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm)
-+{
-+    static const uint64_t permissions[] = {
-+        [BLOCK_PERMISSION_CONSISTENT_READ]  = BLK_PERM_CONSISTENT_READ,
-+        [BLOCK_PERMISSION_WRITE]            = BLK_PERM_WRITE,
-+        [BLOCK_PERMISSION_WRITE_UNCHANGED]  = BLK_PERM_WRITE_UNCHANGED,
-+        [BLOCK_PERMISSION_RESIZE]           = BLK_PERM_RESIZE,
-+        [BLOCK_PERMISSION_GRAPH_MOD]        = BLK_PERM_GRAPH_MOD,
-+    };
-+
-+    QEMU_BUILD_BUG_ON(ARRAY_SIZE(permissions) != BLOCK_PERMISSION__MAX);
-+    QEMU_BUILD_BUG_ON(1UL << ARRAY_SIZE(permissions) != BLK_PERM_ALL + 1);
-+
-+    assert(qapi_perm < BLOCK_PERMISSION__MAX);
-+
-+    return permissions[qapi_perm];
-+}
-+
- static void bdrv_replace_child_noperm(BdrvChild *child,
-                                       BlockDriverState *new_bs)
- {
-diff --git a/include/block/block.h b/include/block/block.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/block.h
-+++ b/include/block/block.h
-@@ -XXX,XX +XXX,XX @@ enum {
- };
- char *bdrv_perm_names(uint64_t perm);
-+uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm);
- /* disk I/O throttling */
- void bdrv_init(void);
---
-.24.1

-[PULL 23/34] iotests: Avoid cp/mv of test images
+[PULL 01/14] throttle: introduce enum ThrottleDirection
-This will not work with external data files, so try to get tests working
+From: zhenwei pi <pizhenwei@bytedance.com>
 without it as far as possible.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Use enum ThrottleDirection instead of number index.
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-17-mreitz@redhat.com
+Reviewed-by: Alberto Garcia <berto@igalia.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
 Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
 Message-Id: <20230728022006.1098509-2-pizhenwei@bytedance.com>
 Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
 ---
- tests/qemu-iotests/063     | 12 ++++--------
+ include/qemu/throttle.h | 11 ++++++++---
- tests/qemu-iotests/063.out |  3 ++-
+ util/throttle.c         | 16 +++++++++-------
- tests/qemu-iotests/085     |  9 +++------
+files changed, 17 insertions(+), 10 deletions(-)
  tests/qemu-iotests/085.out |  8 ++++----
 files changed, 13 insertions(+), 19 deletions(-)
-diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
+diff --git a/include/qemu/throttle.h b/include/qemu/throttle.h
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/063
 +++ b/tests/qemu-iotests/063
@@ -XXX,XX +XXX,XX @@ _unsupported_imgopts "subformat=monolithicFlat" \
  _make_test_img 4M
  echo "== Testing conversion with -n fails with no target file =="
 -# check .orig file does not exist
 -rm -f "$TEST_IMG.orig"
  if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" >/dev/null 2>&1; then
      exit 1
  fi
  echo "== Testing conversion with -n succeeds with a target file =="
 -rm -f "$TEST_IMG.orig"
 -cp "$TEST_IMG" "$TEST_IMG.orig"
 +_rm_test_img "$TEST_IMG.orig"
 +TEST_IMG="$TEST_IMG.orig" _make_test_img 4M
  if ! $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" ; then
      exit 1
  fi
@@ -XXX,XX +XXX,XX @@ fi
  _check_test_img
  echo "== Testing conversion to a smaller file fails =="
 -rm -f "$TEST_IMG.orig"
 -mv "$TEST_IMG" "$TEST_IMG.orig"
 -_make_test_img 2M
 -if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev/null 2>&1; then
 +TEST_IMG="$TEST_IMG.target" _make_test_img 2M
 +if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.target" >/dev/null 2>&1; then
      exit 1
  fi
 diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/063.out
+--- a/include/qemu/throttle.h
-+++ b/tests/qemu-iotests/063.out
++++ b/include/qemu/throttle.h
-@@ -XXX,XX +XXX,XX @@ QA output created by 063
+@@ -XXX,XX +XXX,XX @@ typedef struct ThrottleState {
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
+     int64_t previous_leak;    /* timestamp of the last leak done */
- == Testing conversion with -n fails with no target file ==
+ } ThrottleState;
- == Testing conversion with -n succeeds with a target file ==
-+Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=4194304
++typedef enum {
- == Testing conversion to raw is the same after conversion with -n ==
++    THROTTLE_READ = 0,
- == Testing conversion back to original format ==
++    THROTTLE_WRITE,
- No errors were found on the image.
++    THROTTLE_MAX
- == Testing conversion to a smaller file fails ==
++} ThrottleDirection;
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
++
-+Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=2097152
+ typedef struct ThrottleTimers {
- == Regression testing for copy offloading bug ==
+-    QEMUTimer *timers[2];     /* timers used to do the throttling */
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
++    QEMUTimer *timers[THROTTLE_MAX];    /* timers used to do the throttling */
- Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=1048576
+     QEMUClockType clock_type; /* the clock used */
-diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
-index XXXXXXX..XXXXXXX 100755
+     /* Callbacks */
---- a/tests/qemu-iotests/085
+-    QEMUTimerCB *read_timer_cb;
-+++ b/tests/qemu-iotests/085
+-    QEMUTimerCB *write_timer_cb;
-@@ -XXX,XX +XXX,XX @@ add_snapshot_image()
++    QEMUTimerCB *timer_cb[THROTTLE_MAX];
      void *timer_opaque;
  } ThrottleTimers;
 diff --git a/util/throttle.c b/util/throttle.c
 index XXXXXXX..XXXXXXX 100644
 --- a/util/throttle.c
 +++ b/util/throttle.c
@@ -XXX,XX +XXX,XX @@ static bool throttle_compute_timer(ThrottleState *ts,
  void throttle_timers_attach_aio_context(ThrottleTimers *tt,
                                          AioContext *new_context)
  {
-     base_image="${TEST_DIR}/$((${1}-1))-${snapshot_virt0}"
+-    tt->timers[0] = aio_timer_new(new_context, tt->clock_type, SCALE_NS,
-     snapshot_file="${TEST_DIR}/${1}-${snapshot_virt0}"
+-                                  tt->read_timer_cb, tt->timer_opaque);
--    _make_test_img -u -b "${base_image}" "$size"
+-    tt->timers[1] = aio_timer_new(new_context, tt->clock_type, SCALE_NS,
--    mv "${TEST_IMG}" "${snapshot_file}"
+-                                  tt->write_timer_cb, tt->timer_opaque);
-+    TEST_IMG=$snapshot_file _make_test_img -u -b "${base_image}" "$size"
++    tt->timers[THROTTLE_READ] =
-     do_blockdev_add "$1" "'backing': null, " "${snapshot_file}"
++        aio_timer_new(new_context, tt->clock_type, SCALE_NS,
 +                      tt->timer_cb[THROTTLE_READ], tt->timer_opaque);
 +    tt->timers[THROTTLE_WRITE] =
 +        aio_timer_new(new_context, tt->clock_type, SCALE_NS,
 +                      tt->timer_cb[THROTTLE_WRITE], tt->timer_opaque);
  }
-@@ -XXX,XX +XXX,XX @@ blockdev_snapshot()
+ /*
+@@ -XXX,XX +XXX,XX @@ void throttle_timers_init(ThrottleTimers *tt,
- size=128M
+     memset(tt, 0, sizeof(ThrottleTimers));
--_make_test_img $size
+     tt->clock_type = clock_type;
--mv "${TEST_IMG}" "${TEST_IMG}.1"
+-    tt->read_timer_cb = read_timer_cb;
--_make_test_img $size
+-    tt->write_timer_cb = write_timer_cb;
--mv "${TEST_IMG}" "${TEST_IMG}.2"
++    tt->timer_cb[THROTTLE_READ] = read_timer_cb;
-+TEST_IMG="$TEST_IMG.1" _make_test_img $size
++    tt->timer_cb[THROTTLE_WRITE] = write_timer_cb;
-+TEST_IMG="$TEST_IMG.2" _make_test_img $size
+     tt->timer_opaque = timer_opaque;
+     throttle_timers_attach_aio_context(tt, aio_context);
- echo
+ }
- echo === Running QEMU ===
+@@ -XXX,XX +XXX,XX @@ void throttle_timers_detach_aio_context(ThrottleTimers *tt)
-diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out
+ {
-index XXXXXXX..XXXXXXX 100644
+     int i;
---- a/tests/qemu-iotests/085.out
-+++ b/tests/qemu-iotests/085.out
+-    for (i = 0; i < 2; i++) {
-@@ -XXX,XX +XXX,XX @@
++    for (i = 0; i < THROTTLE_MAX; i++) {
- QA output created by 085
+         throttle_timer_destroy(&tt->timers[i]);
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+     }
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+ }
 +Formatting 'TEST_DIR/t.IMGFMT.1', fmt=IMGFMT size=134217728
 +Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=134217728
  === Running QEMU ===
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=qcow2 size=134217728 backing_fil
  === Create a couple of snapshots using blockdev-snapshot ===
 -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
 +Formatting 'TEST_DIR/11-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
  { 'execute': 'blockdev-add', 'arguments': { 'driver': 'IMGFMT', 'node-name': 'snap_11', 'backing': null, 'file': { 'driver': 'file', 'filename': 'TEST_DIR/11-snapshot-v0.IMGFMT', 'node-name': 'file_11' } } }
  {"return": {}}
  { 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_11' } }
  {"return": {}}
 -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
 +Formatting 'TEST_DIR/12-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
  { 'execute': 'blockdev-add', 'arguments': { 'driver': 'IMGFMT', 'node-name': 'snap_12', 'backing': null, 'file': { 'driver': 'file', 'filename': 'TEST_DIR/12-snapshot-v0.IMGFMT', 'node-name': 'file_12' } } }
  {"return": {}}
  { 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_12' } }
 --
-.24.1
+.41.0

-[PULL 34/34] backup-top: Begin drain earlier
+[PULL 02/14] test-throttle: use enum ThrottleDirection
-When dropping backup-top, we need to drain the node before freeing the
+From: zhenwei pi <pizhenwei@bytedance.com>
 BlockCopyState.  Otherwise, requests may still be in flight and then the
 assertion in shres_destroy() will fail.
-(This becomes visible in intermittent failure of 056.)
+Use enum ThrottleDirection instead in the throttle test codes.
-Cc: qemu-stable@nongnu.org
+Reviewed-by: Alberto Garcia <berto@igalia.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
-Message-id: 20191219182638.104621-1-mreitz@redhat.com
+Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Message-Id: <20230728022006.1098509-3-pizhenwei@bytedance.com>
 Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
 ---
- block/backup-top.c | 4 ++--
+ tests/unit/test-throttle.c | 6 +++---
-file changed, 2 insertions(+), 2 deletions(-)
+file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/block/backup-top.c b/block/backup-top.c
+diff --git a/tests/unit/test-throttle.c b/tests/unit/test-throttle.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/backup-top.c
+--- a/tests/unit/test-throttle.c
-+++ b/block/backup-top.c
++++ b/tests/unit/test-throttle.c
-@@ -XXX,XX +XXX,XX @@ void bdrv_backup_top_drop(BlockDriverState *bs)
+@@ -XXX,XX +XXX,XX @@ static void test_init(void)
-     BDRVBackupTopState *s = bs->opaque;
-     AioContext *aio_context = bdrv_get_aio_context(bs);
+     /* check initialized fields */
+     g_assert(tt->clock_type == QEMU_CLOCK_VIRTUAL);
--    block_copy_state_free(s->bcs);
+-    g_assert(tt->timers[0]);
--
+-    g_assert(tt->timers[1]);
-     aio_context_acquire(aio_context);
++    g_assert(tt->timers[THROTTLE_READ]);
++    g_assert(tt->timers[THROTTLE_WRITE]);
-     bdrv_drained_begin(bs);
+     /* check other fields where cleared */
-+    block_copy_state_free(s->bcs);
+     g_assert(!ts.previous_leak);
-+
+@@ -XXX,XX +XXX,XX @@ static void test_destroy(void)
-     s->active = false;
+     throttle_timers_init(tt, ctx, QEMU_CLOCK_VIRTUAL,
-     bdrv_child_refresh_perms(bs, bs->backing, &error_abort);
+                          read_timer_cb, write_timer_cb, &ts);
-     bdrv_replace_node(bs, backing_bs(bs), &error_abort);
+     throttle_timers_destroy(tt);
 -    for (i = 0; i < 2; i++) {
 +    for (i = 0; i < THROTTLE_MAX; i++) {
          g_assert(!tt->timers[i]);
      }
  }
 --
-.24.1
+.41.0

-[PULL 07/34] qcow2-bitmaps: fix qcow2_can_store_new_dirty_bitmap
+[PULL 03/14] throttle: support read-only and write-only
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+From: zhenwei pi <pizhenwei@bytedance.com>
-qcow2_can_store_new_dirty_bitmap works wrong, as it considers only
+Only one direction is necessary in several scenarios:
-bitmaps already stored in the qcow2 image and ignores persistent
+- a read-only disk
-BdrvDirtyBitmap objects.
+- operations on a device are considered as *write* only. For example,
   encrypt/decrypt/sign/verify operations on a cryptodev use a single
   *write* timer(read timer callback is defined, but never invoked).
-So, let's instead count persistent BdrvDirtyBitmaps. We load all qcow2
+Allow a single direction in throttle, this reduces memory, and uplayer
-bitmaps on open, so there should not be any bitmap in the image for
+does not need a dummy callback any more.
 which we don't have BdrvDirtyBitmaps version. If it is - it's a kind of
 corruption, and no reason to check for corruptions here (open() and
 close() are better places for it).
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Alberto Garcia <berto@igalia.com>
-Message-id: 20191014115126.15360-2-vsementsov@virtuozzo.com
+Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
+Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
-Cc: qemu-stable@nongnu.org
+Message-Id: <20230728022006.1098509-4-pizhenwei@bytedance.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
 ---
- block/qcow2-bitmap.c | 41 ++++++++++++++++++-----------------------
+ util/throttle.c | 42 ++++++++++++++++++++++++++++--------------
-file changed, 18 insertions(+), 23 deletions(-)
+file changed, 28 insertions(+), 14 deletions(-)
-diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
+diff --git a/util/throttle.c b/util/throttle.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2-bitmap.c
+--- a/util/throttle.c
-+++ b/block/qcow2-bitmap.c
++++ b/util/throttle.c
-@@ -XXX,XX +XXX,XX @@ bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs,
+@@ -XXX,XX +XXX,XX @@ static bool throttle_compute_timer(ThrottleState *ts,
-                                                       Error **errp)
+ void throttle_timers_attach_aio_context(ThrottleTimers *tt,
                                          AioContext *new_context)
  {
-     BDRVQcow2State *s = bs->opaque;
+-    tt->timers[THROTTLE_READ] =
--    bool found;
+-        aio_timer_new(new_context, tt->clock_type, SCALE_NS,
--    Qcow2BitmapList *bm_list;
+-                      tt->timer_cb[THROTTLE_READ], tt->timer_opaque);
-+    BdrvDirtyBitmap *bitmap;
+-    tt->timers[THROTTLE_WRITE] =
-+    uint64_t bitmap_directory_size = 0;
+-        aio_timer_new(new_context, tt->clock_type, SCALE_NS,
-+    uint32_t nb_bitmaps = 0;
+-                      tt->timer_cb[THROTTLE_WRITE], tt->timer_opaque);
 +    ThrottleDirection dir;
 +
-+    if (bdrv_find_dirty_bitmap(bs, name)) {
++    for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
-+        error_setg(errp, "Bitmap already exists: %s", name);
++        if (tt->timer_cb[dir]) {
-+        return false;
++            tt->timers[dir] =
 +                aio_timer_new(new_context, tt->clock_type, SCALE_NS,
 +                              tt->timer_cb[dir], tt->timer_opaque);
 +        }
 +    }
+ }
-     if (s->qcow_version < 3) {
-         /* Without autoclear_features, we would always have to assume
+ /*
-@@ -XXX,XX +XXX,XX @@ bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs,
+@@ -XXX,XX +XXX,XX @@ void throttle_timers_init(ThrottleTimers *tt,
-         goto fail;
+                           QEMUTimerCB *write_timer_cb,
                            void *timer_opaque)
  {
 +    assert(read_timer_cb || write_timer_cb);
      memset(tt, 0, sizeof(ThrottleTimers));
      tt->clock_type = clock_type;
@@ -XXX,XX +XXX,XX @@ void throttle_timers_init(ThrottleTimers *tt,
  /* destroy a timer */
  static void throttle_timer_destroy(QEMUTimer **timer)
  {
 -    assert(*timer != NULL);
 +    if (*timer == NULL) {
 +        return;
 +    }
      timer_free(*timer);
      *timer = NULL;
@@ -XXX,XX +XXX,XX @@ static void throttle_timer_destroy(QEMUTimer **timer)
  /* Remove timers from event loop */
  void throttle_timers_detach_aio_context(ThrottleTimers *tt)
  {
 -    int i;
 +    ThrottleDirection dir;
 -    for (i = 0; i < THROTTLE_MAX; i++) {
 -        throttle_timer_destroy(&tt->timers[i]);
 +    for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
 +        throttle_timer_destroy(&tt->timers[dir]);
      }
+ }
--    if (s->nb_bitmaps == 0) {
@@ -XXX,XX +XXX,XX @@ void throttle_timers_destroy(ThrottleTimers *tt)
  /* is any throttling timer configured */
  bool throttle_timers_are_initialized(ThrottleTimers *tt)
  {
 -    if (tt->timers[0]) {
 -        return true;
-+    FOR_EACH_DIRTY_BITMAP(bs, bitmap) {
++    ThrottleDirection dir;
-+        if (bdrv_dirty_bitmap_get_persistence(bitmap)) {
++
-+            nb_bitmaps++;
++    for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
-+            bitmap_directory_size +=
++        if (tt->timers[dir]) {
-+                calc_dir_entry_size(strlen(bdrv_dirty_bitmap_name(bitmap)), 0);
++            return true;
 +        }
      }
-+    nb_bitmaps++;
-+    bitmap_directory_size += calc_dir_entry_size(strlen(name), 0);
+     return false;
+@@ -XXX,XX +XXX,XX @@ bool throttle_schedule_timer(ThrottleState *ts,
--    if (s->nb_bitmaps >= QCOW2_MAX_BITMAPS) {
+ {
-+    if (nb_bitmaps > QCOW2_MAX_BITMAPS) {
+     int64_t now = qemu_clock_get_ns(tt->clock_type);
-         error_setg(errp,
+     int64_t next_timestamp;
-                    "Maximum number of persistent bitmaps is already reached");
++    QEMUTimer *timer;
-         goto fail;
+     bool must_wait;
 +    timer = is_write ? tt->timers[THROTTLE_WRITE] : tt->timers[THROTTLE_READ];
 +    assert(timer);
 +
      must_wait = throttle_compute_timer(ts,
                                         is_write,
                                         now,
@@ -XXX,XX +XXX,XX @@ bool throttle_schedule_timer(ThrottleState *ts,
      }
--    if (s->bitmap_directory_size + calc_dir_entry_size(strlen(name), 0) >
+     /* request throttled and timer pending -> do nothing */
--        QCOW2_MAX_BITMAP_DIRECTORY_SIZE)
+-    if (timer_pending(tt->timers[is_write])) {
--    {
++    if (timer_pending(timer)) {
-+    if (bitmap_directory_size > QCOW2_MAX_BITMAP_DIRECTORY_SIZE) {
+         return true;
          error_setg(errp, "Not enough space in the bitmap directory");
          goto fail;
      }
--    qemu_co_mutex_lock(&s->lock);
+     /* request throttled and timer not pending -> arm timer */
--    bm_list = bitmap_list_load(bs, s->bitmap_directory_offset,
+-    timer_mod(tt->timers[is_write], next_timestamp);
--                               s->bitmap_directory_size, errp);
++    timer_mod(timer, next_timestamp);
 -    qemu_co_mutex_unlock(&s->lock);
 -    if (bm_list == NULL) {
 -        goto fail;
 -    }
 -
 -    found = find_bitmap_by_name(bm_list, name);
 -    bitmap_list_free(bm_list);
 -    if (found) {
 -        error_setg(errp, "Bitmap with the same name is already stored");
 -        goto fail;
 -    }
 -
      return true;
+ }
- fail:
 --
-.24.1
+.41.0

-[PULL 31/34] qcow2: Allow writing compressed data of multiple clusters
+[PULL 04/14] test-throttle: test read only and write only
-From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
+From: zhenwei pi <pizhenwei@bytedance.com>
-QEMU currently supports writing compressed data of the size equal to
+Reviewed-by: Alberto Garcia <berto@igalia.com>
-one cluster. This patch allows writing QCOW2 compressed data that
+Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
-exceed one cluster. Now, we split buffered data into separate clusters
+Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
-and write them compressed using the block/aio_task API.
+Message-Id: <20230728022006.1098509-5-pizhenwei@bytedance.com>
 Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
 ---
  tests/unit/test-throttle.c | 66 ++++++++++++++++++++++++++++++++++++++
 file changed, 66 insertions(+)
-Suggested-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
+diff --git a/tests/unit/test-throttle.c b/tests/unit/test-throttle.c
 Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
 Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Reviewed-by: Max Reitz <mreitz@redhat.com>
 Message-id: 1575288906-551879-3-git-send-email-andrey.shinkevich@virtuozzo.com
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
  block/qcow2.c | 102 +++++++++++++++++++++++++++++++++++++-------------
 file changed, 75 insertions(+), 27 deletions(-)
 diff --git a/block/qcow2.c b/block/qcow2.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
+--- a/tests/unit/test-throttle.c
-+++ b/block/qcow2.c
++++ b/tests/unit/test-throttle.c
-@@ -XXX,XX +XXX,XX @@ fail:
+@@ -XXX,XX +XXX,XX @@ static void test_init(void)
-     return ret;
+     throttle_timers_destroy(tt);
  }
--/* XXX: put compressed sectors first, then all the cluster aligned
++static void test_init_readonly(void)
 -   tables to avoid losing bytes in alignment */
  static coroutine_fn int
 -qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
 +qcow2_co_pwritev_compressed_task(BlockDriverState *bs,
                                   uint64_t offset, uint64_t bytes,
                                   QEMUIOVector *qiov, size_t qiov_offset)
  {
@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
      uint8_t *buf, *out_buf;
      uint64_t cluster_offset;
 -    if (has_data_file(bs)) {
 -        return -ENOTSUP;
 -    }
 -
 -    if (bytes == 0) {
 -        /* align end of file to a sector boundary to ease reading with
 -           sector based I/Os */
 -        int64_t len = bdrv_getlength(bs->file->bs);
 -        if (len < 0) {
 -            return len;
 -        }
 -        return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
 -    }
 -
 -    if (offset_into_cluster(s, offset)) {
 -        return -EINVAL;
 -    }
 +    assert(bytes == s->cluster_size || (bytes < s->cluster_size &&
 +           (offset + bytes == bs->total_sectors << BDRV_SECTOR_BITS)));
      buf = qemu_blockalign(bs, s->cluster_size);
 -    if (bytes != s->cluster_size) {
 -        if (bytes > s->cluster_size ||
 -            offset + bytes != bs->total_sectors << BDRV_SECTOR_BITS)
 -        {
 -            qemu_vfree(buf);
 -            return -EINVAL;
 -        }
 +    if (bytes < s->cluster_size) {
          /* Zero-pad last write if image size is not cluster aligned */
          memset(buf + bytes, 0, s->cluster_size - bytes);
      }
@@ -XXX,XX +XXX,XX @@ fail:
      return ret;
  }
 +static coroutine_fn int qcow2_co_pwritev_compressed_task_entry(AioTask *task)
 +{
-+    Qcow2AioTask *t = container_of(task, Qcow2AioTask, task);
++    int i;
 +
-+    assert(!t->cluster_type && !t->l2meta);
++    tt = &tgm.throttle_timers;
 +
-+    return qcow2_co_pwritev_compressed_task(t->bs, t->offset, t->bytes, t->qiov,
++    /* fill the structures with crap */
-+                                            t->qiov_offset);
++    memset(&ts, 1, sizeof(ts));
 +    memset(tt, 1, sizeof(*tt));
 +
 +    /* init structures */
 +    throttle_init(&ts);
 +    throttle_timers_init(tt, ctx, QEMU_CLOCK_VIRTUAL,
 +                         read_timer_cb, NULL, &ts);
 +
 +    /* check initialized fields */
 +    g_assert(tt->clock_type == QEMU_CLOCK_VIRTUAL);
 +    g_assert(tt->timers[THROTTLE_READ]);
 +    g_assert(!tt->timers[THROTTLE_WRITE]);
 +
 +    /* check other fields where cleared */
 +    g_assert(!ts.previous_leak);
 +    g_assert(!ts.cfg.op_size);
 +    for (i = 0; i < BUCKETS_COUNT; i++) {
 +        g_assert(!ts.cfg.buckets[i].avg);
 +        g_assert(!ts.cfg.buckets[i].max);
 +        g_assert(!ts.cfg.buckets[i].level);
 +    }
 +
 +    throttle_timers_destroy(tt);
 +}
 +
-+/*
++static void test_init_writeonly(void)
 + * XXX: put compressed sectors first, then all the cluster aligned
 + * tables to avoid losing bytes in alignment
 + */
 +static coroutine_fn int
 +qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
 +                                 uint64_t offset, uint64_t bytes,
 +                                 QEMUIOVector *qiov, size_t qiov_offset)
 +{
-+    BDRVQcow2State *s = bs->opaque;
++    int i;
 +    AioTaskPool *aio = NULL;
 +    int ret = 0;
 +
-+    if (has_data_file(bs)) {
++    tt = &tgm.throttle_timers;
-+        return -ENOTSUP;
++
 +    /* fill the structures with crap */
 +    memset(&ts, 1, sizeof(ts));
 +    memset(tt, 1, sizeof(*tt));
 +
 +    /* init structures */
 +    throttle_init(&ts);
 +    throttle_timers_init(tt, ctx, QEMU_CLOCK_VIRTUAL,
 +                         NULL, write_timer_cb, &ts);
 +
 +    /* check initialized fields */
 +    g_assert(tt->clock_type == QEMU_CLOCK_VIRTUAL);
 +    g_assert(!tt->timers[THROTTLE_READ]);
 +    g_assert(tt->timers[THROTTLE_WRITE]);
 +
 +    /* check other fields where cleared */
 +    g_assert(!ts.previous_leak);
 +    g_assert(!ts.cfg.op_size);
 +    for (i = 0; i < BUCKETS_COUNT; i++) {
 +        g_assert(!ts.cfg.buckets[i].avg);
 +        g_assert(!ts.cfg.buckets[i].max);
 +        g_assert(!ts.cfg.buckets[i].level);
 +    }
 +
-+    if (bytes == 0) {
++    throttle_timers_destroy(tt);
 +        /*
 +         * align end of file to a sector boundary to ease reading with
 +         * sector based I/Os
 +         */
 +        int64_t len = bdrv_getlength(bs->file->bs);
 +        if (len < 0) {
 +            return len;
 +        }
 +        return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
 +    }
 +
 +    if (offset_into_cluster(s, offset)) {
 +        return -EINVAL;
 +    }
 +
 +    while (bytes && aio_task_pool_status(aio) == 0) {
 +        uint64_t chunk_size = MIN(bytes, s->cluster_size);
 +
 +        if (!aio && chunk_size != bytes) {
 +            aio = aio_task_pool_new(QCOW2_MAX_WORKERS);
 +        }
 +
 +        ret = qcow2_add_task(bs, aio, qcow2_co_pwritev_compressed_task_entry,
 +                             0, 0, offset, chunk_size, qiov, qiov_offset, NULL);
 +        if (ret < 0) {
 +            break;
 +        }
 +        qiov_offset += chunk_size;
 +        offset += chunk_size;
 +        bytes -= chunk_size;
 +    }
 +
 +    if (aio) {
 +        aio_task_pool_wait_all(aio);
 +        if (ret == 0) {
 +            ret = aio_task_pool_status(aio);
 +        }
 +        g_free(aio);
 +    }
 +
 +    return ret;
 +}
 +
- static int coroutine_fn
+ static void test_destroy(void)
- qcow2_co_preadv_compressed(BlockDriverState *bs,
+ {
-                            uint64_t file_cluster_offset,
+     int i;
@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv)
      g_test_add_func("/throttle/leak_bucket",        test_leak_bucket);
      g_test_add_func("/throttle/compute_wait",       test_compute_wait);
      g_test_add_func("/throttle/init",               test_init);
 +    g_test_add_func("/throttle/init_readonly",      test_init_readonly);
 +    g_test_add_func("/throttle/init_writeonly",     test_init_writeonly);
      g_test_add_func("/throttle/destroy",            test_destroy);
      g_test_add_func("/throttle/have_timer",         test_have_timer);
      g_test_add_func("/throttle/detach_attach",      test_detach_attach);
 --
-.24.1
+.41.0

-[PULL 33/34] tests/qemu-iotests: Update tests to recent desugarized -accel option
+[PULL 05/14] cryptodev: use NULL throttle timer cb for read direction
-From: Philippe Mathieu-Daudé <philmd@redhat.com>
+From: zhenwei pi <pizhenwei@bytedance.com>
-Commit 6f6e1698a6 desugarized "-machine accel=" to a list
+Operations on a cryptodev are considered as *write* only, the callback
-of "-accel" options. Since now "-machine accel" and "-accel"
+of read direction is never invoked. Use NULL instead of an unreachable
-became incompatible, update the iotests to the new format.
+path(cryptodev_backend_throttle_timer_cb on read direction).
-Error reported here:
+The dummy read timer(never invoked) is already removed here, it means
-https://gitlab.com/qemu-project/qemu/-/jobs/385801004#L3400
+that the 'FIXME' tag is no longer needed.
-Reported-by: GitLab CI
+Reviewed-by: Alberto Garcia <berto@igalia.com>
-Fixes: 6f6e1698a6 (vl: configure accelerators from -accel options)
+Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
-Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
-Message-id: 20200106130951.29873-1-philmd@redhat.com
+Message-Id: <20230728022006.1098509-6-pizhenwei@bytedance.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
 ---
- tests/qemu-iotests/235   | 2 +-
+ backends/cryptodev.c | 3 +--
- tests/qemu-iotests/check | 6 +++---
+file changed, 1 insertion(+), 2 deletions(-)
 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235
+diff --git a/backends/cryptodev.c b/backends/cryptodev.c
-index XXXXXXX..XXXXXXX 100755
+index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/235
+--- a/backends/cryptodev.c
-+++ b/tests/qemu-iotests/235
++++ b/backends/cryptodev.c
-@@ -XXX,XX +XXX,XX @@ qemu_img_create('-f', iotests.imgfmt, '-o', 'preallocation=metadata', disk,
+@@ -XXX,XX +XXX,XX @@ static void cryptodev_backend_set_throttle(CryptoDevBackend *backend, int field,
-                 str(size))
+     if (!enabled) {
+         throttle_init(&backend->ts);
- vm = QEMUMachine(iotests.qemu_prog)
+         throttle_timers_init(&backend->tt, qemu_get_aio_context(),
--vm.add_args('-machine', 'accel=kvm:tcg')
+-                             QEMU_CLOCK_REALTIME,
-+vm.add_args('-accel', 'kvm', '-accel', 'tcg')
+-                             cryptodev_backend_throttle_timer_cb, /* FIXME */
- if iotests.qemu_default_machine == 's390-ccw-virtio':
++                             QEMU_CLOCK_REALTIME, NULL,
-         vm.add_args('-no-shutdown')
+                              cryptodev_backend_throttle_timer_cb, backend);
- vm.add_args('-drive', 'id=src,file=' + disk)
+     }
 diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/check
 +++ b/tests/qemu-iotests/check
@@ -XXX,XX +XXX,XX @@ export QEMU_PROG="$(type -p "$QEMU_PROG")"
  case "$QEMU_PROG" in
      *qemu-system-arm|*qemu-system-aarch64)
 -        export QEMU_OPTIONS="-nodefaults -display none -machine virt,accel=qtest"
 +        export QEMU_OPTIONS="-nodefaults -display none -machine virt -accel qtest"
          ;;
      *qemu-system-tricore)
 -        export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard,accel=qtest"
 +        export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard -accel qtest"
          ;;
      *)
 -        export QEMU_OPTIONS="-nodefaults -display none -machine accel=qtest"
 +        export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
          ;;
  esac
 --
-.24.1
+.41.0

-[PULL 22/34] iotests: Use _rm_test_img for deleting test images
+[PULL 06/14] throttle: use enum ThrottleDirection instead of bool is_write
-Just rm will not delete external data files.  Use _rm_test_img every
+From: zhenwei pi <pizhenwei@bytedance.com>
 time we delete a test image.
-(In the process, clean up the indentation of every _cleanup() this patch
+enum ThrottleDirection is already there, use ThrottleDirection instead
-touches.)
+of 'bool is_write' for throttle API, also modify related codes from
 block, fsdev, cryptodev and tests.
-((Also, use quotes consistently.  I am happy to see unquoted instances
+Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
-like "rm -rf $TEST_DIR/..." go.))
+Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
 Message-Id: <20230728022006.1098509-7-pizhenwei@bytedance.com>
 Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
 ---
  include/qemu/throttle.h     |  5 +++--
  backends/cryptodev.c        |  9 +++++----
  block/throttle-groups.c     |  6 ++++--
  fsdev/qemu-fsdev-throttle.c |  8 +++++---
  tests/unit/test-throttle.c  |  4 ++--
  util/throttle.c             | 31 +++++++++++++++++--------------
 files changed, 36 insertions(+), 27 deletions(-)
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+diff --git a/include/qemu/throttle.h b/include/qemu/throttle.h
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
+index XXXXXXX..XXXXXXX 100644
-Message-id: 20191107163708.833192-16-mreitz@redhat.com
+--- a/include/qemu/throttle.h
-Signed-off-by: Max Reitz <mreitz@redhat.com>
++++ b/include/qemu/throttle.h
----
+@@ -XXX,XX +XXX,XX @@ void throttle_config_init(ThrottleConfig *cfg);
- tests/qemu-iotests/019 |  6 +++---
+ /* usage */
- tests/qemu-iotests/020 |  6 +++---
+ bool throttle_schedule_timer(ThrottleState *ts,
- tests/qemu-iotests/024 | 10 +++++-----
+                              ThrottleTimers *tt,
- tests/qemu-iotests/028 |  2 +-
+-                             bool is_write);
- tests/qemu-iotests/029 |  2 +-
++                             ThrottleDirection direction);
- tests/qemu-iotests/043 |  4 +++-
- tests/qemu-iotests/048 |  2 +-
+-void throttle_account(ThrottleState *ts, bool is_write, uint64_t size);
- tests/qemu-iotests/050 |  4 ++--
++void throttle_account(ThrottleState *ts, ThrottleDirection direction,
- tests/qemu-iotests/053 |  4 ++--
++                      uint64_t size);
- tests/qemu-iotests/058 |  2 +-
+ void throttle_limits_to_config(ThrottleLimits *arg, ThrottleConfig *cfg,
- tests/qemu-iotests/059 |  2 +-
+                                Error **errp);
- tests/qemu-iotests/061 |  2 +-
+ void throttle_config_to_limits(ThrottleConfig *cfg, ThrottleLimits *var);
- tests/qemu-iotests/063 |  6 ++++--
+diff --git a/backends/cryptodev.c b/backends/cryptodev.c
- tests/qemu-iotests/069 |  2 +-
+index XXXXXXX..XXXXXXX 100644
- tests/qemu-iotests/074 |  2 +-
+--- a/backends/cryptodev.c
- tests/qemu-iotests/080 |  2 +-
++++ b/backends/cryptodev.c
- tests/qemu-iotests/081 |  6 +++---
+@@ -XXX,XX +XXX,XX @@ static void cryptodev_backend_throttle_timer_cb(void *opaque)
- tests/qemu-iotests/085 |  9 ++++++---
+             continue;
- tests/qemu-iotests/088 |  2 +-
+         }
- tests/qemu-iotests/092 |  2 +-
- tests/qemu-iotests/094 |  2 +-
+-        throttle_account(&backend->ts, true, ret);
- tests/qemu-iotests/095 |  5 +++--
++        throttle_account(&backend->ts, THROTTLE_WRITE, ret);
- tests/qemu-iotests/099 |  7 ++++---
+         cryptodev_backend_operation(backend, op_info);
- tests/qemu-iotests/109 |  4 ++--
+         if (throttle_enabled(&backend->tc) &&
- tests/qemu-iotests/110 |  4 ++--
+-            throttle_schedule_timer(&backend->ts, &backend->tt, true)) {
- tests/qemu-iotests/122 |  6 ++++--
++            throttle_schedule_timer(&backend->ts, &backend->tt,
- tests/qemu-iotests/123 |  2 +-
++                                    THROTTLE_WRITE)) {
- tests/qemu-iotests/141 |  4 +++-
+             break;
- tests/qemu-iotests/142 |  2 +-
+         }
- tests/qemu-iotests/144 |  4 +++-
+     }
- tests/qemu-iotests/153 | 10 +++-------
+@@ -XXX,XX +XXX,XX @@ int cryptodev_backend_crypto_operation(
- tests/qemu-iotests/156 |  8 ++++++--
+         goto do_account;
- tests/qemu-iotests/159 |  2 +-
+     }
- tests/qemu-iotests/160 |  3 ++-
- tests/qemu-iotests/161 |  4 ++--
+-    if (throttle_schedule_timer(&backend->ts, &backend->tt, true) ||
- tests/qemu-iotests/170 |  2 +-
++    if (throttle_schedule_timer(&backend->ts, &backend->tt, THROTTLE_WRITE) ||
- tests/qemu-iotests/172 |  6 +++---
+         !QTAILQ_EMPTY(&backend->opinfos)) {
- tests/qemu-iotests/173 |  3 ++-
+         QTAILQ_INSERT_TAIL(&backend->opinfos, op_info, next);
- tests/qemu-iotests/178 |  2 +-
+         return 0;
- tests/qemu-iotests/182 |  2 +-
+@@ -XXX,XX +XXX,XX @@ do_account:
- tests/qemu-iotests/183 |  2 +-
+         return ret;
- tests/qemu-iotests/185 |  4 ++--
+     }
- tests/qemu-iotests/187 |  6 +++---
- tests/qemu-iotests/190 |  2 +-
+-    throttle_account(&backend->ts, true, ret);
- tests/qemu-iotests/191 |  6 +++---
++    throttle_account(&backend->ts, THROTTLE_WRITE, ret);
- tests/qemu-iotests/195 |  2 +-
- tests/qemu-iotests/197 |  2 +-
+     return cryptodev_backend_operation(backend, op_info);
  tests/qemu-iotests/200 |  3 ++-
  tests/qemu-iotests/215 |  2 +-
  tests/qemu-iotests/225 |  2 +-
  tests/qemu-iotests/229 |  3 ++-
  tests/qemu-iotests/232 |  4 +++-
  tests/qemu-iotests/243 |  2 +-
  tests/qemu-iotests/244 |  4 ++--
  tests/qemu-iotests/247 |  4 +++-
  tests/qemu-iotests/249 |  4 ++--
  tests/qemu-iotests/252 |  2 +-
 files changed, 118 insertions(+), 95 deletions(-)
 diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/019
 +++ b/tests/qemu-iotests/019
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 -    _cleanup_test_img
 -    rm -f "$TEST_IMG.base"
 -    rm -f "$TEST_IMG.orig"
 +    _cleanup_test_img
 +    _rm_test_img "$TEST_IMG.base"
 +    _rm_test_img "$TEST_IMG.orig"
  }
- trap "_cleanup; exit \$status" 0 1 2 3 15
+diff --git a/block/throttle-groups.c b/block/throttle-groups.c
+index XXXXXXX..XXXXXXX 100644
-diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
+--- a/block/throttle-groups.c
-index XXXXXXX..XXXXXXX 100755
++++ b/block/throttle-groups.c
---- a/tests/qemu-iotests/020
+@@ -XXX,XX +XXX,XX @@ static bool throttle_group_schedule_timer(ThrottleGroupMember *tgm,
-+++ b/tests/qemu-iotests/020
+     ThrottleState *ts = tgm->throttle_state;
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
+     ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
+     ThrottleTimers *tt = &tgm->throttle_timers;
- _cleanup()
++    ThrottleDirection direction = is_write ? THROTTLE_WRITE : THROTTLE_READ;
- {
+     bool must_wait;
--    _cleanup_test_img
--    rm -f "$TEST_IMG.base"
+     if (qatomic_read(&tgm->io_limits_disabled)) {
--    rm -f "$TEST_IMG.orig"
+@@ -XXX,XX +XXX,XX @@ static bool throttle_group_schedule_timer(ThrottleGroupMember *tgm,
-+    _cleanup_test_img
+         return true;
-+    _rm_test_img "$TEST_IMG.base"
+     }
-+    _rm_test_img "$TEST_IMG.orig"
- }
+-    must_wait = throttle_schedule_timer(ts, tt, is_write);
- trap "_cleanup; exit \$status" 0 1 2 3 15
++    must_wait = throttle_schedule_timer(ts, tt, direction);
-diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
+     /* If a timer just got armed, set tgm as the current token */
-index XXXXXXX..XXXXXXX 100755
+     if (must_wait) {
---- a/tests/qemu-iotests/024
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn throttle_group_co_io_limits_intercept(ThrottleGroupMember *tgm
-+++ b/tests/qemu-iotests/024
+     bool must_wait;
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
+     ThrottleGroupMember *token;
- _cleanup()
+     ThrottleGroup *tg = container_of(tgm->throttle_state, ThrottleGroup, ts);
- {
++    ThrottleDirection direction = is_write ? THROTTLE_WRITE : THROTTLE_READ;
-     _cleanup_test_img
--    rm -f "$TEST_DIR/t.$IMGFMT.base_old"
+     assert(bytes >= 0);
--    rm -f "$TEST_DIR/t.$IMGFMT.base_new"
-+    _rm_test_img "$TEST_DIR/t.$IMGFMT.base_old"
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn throttle_group_co_io_limits_intercept(ThrottleGroupMember *tgm
-+    _rm_test_img "$TEST_DIR/t.$IMGFMT.base_new"
+     }
--    rm -f "$TEST_DIR/subdir/t.$IMGFMT"
+     /* The I/O will be executed, so do the accounting */
--    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_old"
+-    throttle_account(tgm->throttle_state, is_write, bytes);
--    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_new"
++    throttle_account(tgm->throttle_state, direction, bytes);
-+    _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT"
-+    _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_old"
+     /* Schedule the next request */
-+    _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_new"
+     schedule_next_request(tgm, is_write);
-     rmdir "$TEST_DIR/subdir" 2> /dev/null
+diff --git a/fsdev/qemu-fsdev-throttle.c b/fsdev/qemu-fsdev-throttle.c
- }
+index XXXXXXX..XXXXXXX 100644
- trap "_cleanup; exit \$status" 0 1 2 3 15
+--- a/fsdev/qemu-fsdev-throttle.c
-diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
++++ b/fsdev/qemu-fsdev-throttle.c
-index XXXXXXX..XXXXXXX 100755
+@@ -XXX,XX +XXX,XX @@ void fsdev_throttle_init(FsThrottle *fst)
---- a/tests/qemu-iotests/028
+ void coroutine_fn fsdev_co_throttle_request(FsThrottle *fst, bool is_write,
-+++ b/tests/qemu-iotests/028
+                                             struct iovec *iov, int iovcnt)
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
+ {
- _cleanup()
++    ThrottleDirection direction = is_write ? THROTTLE_WRITE : THROTTLE_READ;
  {
      _cleanup_qemu
 -    rm -f "${TEST_IMG}.copy"
 +    _rm_test_img "${TEST_IMG}.copy"
      _cleanup_test_img
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/029
 +++ b/tests/qemu-iotests/029
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 -    rm -f $TEST_IMG.snap
 +    _rm_test_img "$TEST_IMG.snap"
      _cleanup_test_img
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/043
 +++ b/tests/qemu-iotests/043
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG".[123].base
 +    for img in "$TEST_IMG".[123].base; do
 +        _rm_test_img "$img"
 +    done
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/048
 +++ b/tests/qemu-iotests/048
@@ -XXX,XX +XXX,XX @@ _cleanup()
  {
      echo "Cleanup"
      _cleanup_test_img
 -    rm "${TEST_IMG_FILE2}"
 +    _rm_test_img "${TEST_IMG_FILE2}"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/050
 +++ b/tests/qemu-iotests/050
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG.old"
 -    rm -f "$TEST_IMG.new"
 +    _rm_test_img "$TEST_IMG.old"
 +    _rm_test_img "$TEST_IMG.new"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/053
 +++ b/tests/qemu-iotests/053
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 -    rm -f "$TEST_IMG.orig"
 -    _cleanup_test_img
 +    _rm_test_img "$TEST_IMG.orig"
 +    _cleanup_test_img
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/058
 +++ b/tests/qemu-iotests/058
@@ -XXX,XX +XXX,XX @@ _cleanup()
  {
      nbd_server_stop
      _cleanup_test_img
 -    rm -f "$converted_image"
 +    _rm_test_img "$converted_image"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/059
 +++ b/tests/qemu-iotests/059
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG.qcow2"
 +    IMGFMT=qcow2 _rm_test_img "$TEST_IMG.qcow2"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/061
 +++ b/tests/qemu-iotests/061
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f $TEST_IMG.data
 +    _rm_test_img "$TEST_IMG.data"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/063
 +++ b/tests/qemu-iotests/063
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 -    _cleanup_test_img
 -    rm -f "$TEST_IMG.orig" "$TEST_IMG.raw1" "$TEST_IMG.raw2"
 +    _cleanup_test_img
 +    for img in "$TEST_IMG".{orig,raw1,raw2,target}; do
 +        _rm_test_img "$img"
 +    done
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/069
 +++ b/tests/qemu-iotests/069
@@ -XXX,XX +XXX,XX @@ echo "=== Creating an image with a backing file and deleting that file ==="
  echo
  TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE
  _make_test_img -b "$TEST_IMG.base" $IMG_SIZE
 -rm -f "$TEST_IMG.base"
 +_rm_test_img "$TEST_IMG.base"
  # Just open the image and close it right again (this should print an error message)
  $QEMU_IO -c quit "$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt
 diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/074
 +++ b/tests/qemu-iotests/074
@@ -XXX,XX +XXX,XX @@ _cleanup()
  {
      echo "Cleanup"
      _cleanup_test_img
 -    rm "${TEST_IMG2}"
 +    _rm_test_img "${TEST_IMG2}"
      rm -f "$TEST_DIR/blkdebug.conf"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/080
 +++ b/tests/qemu-iotests/080
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 -    rm -f $TEST_IMG.snap
 +    _rm_test_img "$TEST_IMG.snap"
      _cleanup_test_img
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/081
 +++ b/tests/qemu-iotests/081
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 -    rm -rf $TEST_DIR/1.raw
 -    rm -rf $TEST_DIR/2.raw
 -    rm -rf $TEST_DIR/3.raw
 +    _rm_test_img "$TEST_DIR/1.raw"
 +    _rm_test_img "$TEST_DIR/2.raw"
 +    _rm_test_img "$TEST_DIR/3.raw"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/085
 +++ b/tests/qemu-iotests/085
@@ -XXX,XX +XXX,XX @@ _cleanup()
      _cleanup_qemu
      for i in $(seq 1 ${SNAPSHOTS})
      do
 -        rm -f "${TEST_DIR}/${i}-${snapshot_virt0}"
 -        rm -f "${TEST_DIR}/${i}-${snapshot_virt1}"
 +        _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt0}"
 +        _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt1}"
 +    done
 +    for img in "${TEST_IMG}".{1,2,base}
 +    do
 +        _rm_test_img "$img"
      done
 -    rm -f "${TEST_IMG}" "${TEST_IMG}.1" "${TEST_IMG}.2" "${TEST_IMG}.base"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/088
 +++ b/tests/qemu-iotests/088
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 -    rm -f $TEST_IMG.snap
 +    _rm_test_img "$TEST_IMG.snap"
      _cleanup_test_img
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/092
 +++ b/tests/qemu-iotests/092
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 -    rm -f $TEST_IMG.snap
 +    _rm_test_img "$TEST_IMG.snap"
      _cleanup_test_img
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/094
 +++ b/tests/qemu-iotests/094
@@ -XXX,XX +XXX,XX @@ _cleanup()
  {
      _cleanup_qemu
      _cleanup_test_img
 -    rm -f "$TEST_DIR/source.$IMGFMT"
 +    _rm_test_img "$TEST_DIR/source.$IMGFMT"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/095
 +++ b/tests/qemu-iotests/095
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_qemu
 -    rm  -f "${TEST_IMG}.base" "${TEST_IMG}.snp1"
 -    _cleanup_test_img
 +    _rm_test_img "${TEST_IMG}.base"
 +    _rm_test_img "${TEST_IMG}.snp1"
 +    _cleanup_test_img
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/099
 +++ b/tests/qemu-iotests/099
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 -    _cleanup_test_img
 +    _cleanup_test_img
 +    _rm_test_img "$TEST_IMG.compare"
 +    rm -f "$TEST_DIR/blkdebug.conf"
 +
- }
+     if (throttle_enabled(&fst->cfg)) {
- trap "_cleanup; exit \$status" 0 1 2 3 15
+-        if (throttle_schedule_timer(&fst->ts, &fst->tt, is_write) ||
++        if (throttle_schedule_timer(&fst->ts, &fst->tt, direction) ||
-@@ -XXX,XX +XXX,XX @@ echo
+             !qemu_co_queue_empty(&fst->throttled_reqs[is_write])) {
- test_qemu "file.driver=blkdebug,file.image.filename=$TEST_IMG"
+             qemu_co_queue_wait(&fst->throttled_reqs[is_write], NULL);
+         }
--rm -f "$TEST_IMG.compare" "$TEST_DIR/blkdebug.conf"
+-        throttle_account(&fst->ts, is_write, iov_size(iov, iovcnt));
--
++        throttle_account(&fst->ts, direction, iov_size(iov, iovcnt));
- # success, all done
- echo "*** done"
+         if (!qemu_co_queue_empty(&fst->throttled_reqs[is_write]) &&
- rm -f $seq.full
+-            !throttle_schedule_timer(&fst->ts, &fst->tt, is_write)) {
-diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
++            !throttle_schedule_timer(&fst->ts, &fst->tt, direction)) {
-index XXXXXXX..XXXXXXX 100755
+             qemu_co_queue_next(&fst->throttled_reqs[is_write]);
---- a/tests/qemu-iotests/109
+         }
-+++ b/tests/qemu-iotests/109
+     }
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
+diff --git a/tests/unit/test-throttle.c b/tests/unit/test-throttle.c
- _cleanup()
+index XXXXXXX..XXXXXXX 100644
- {
+--- a/tests/unit/test-throttle.c
-     _cleanup_qemu
++++ b/tests/unit/test-throttle.c
--    rm -f $TEST_IMG.src
+@@ -XXX,XX +XXX,XX @@ static bool do_test_accounting(bool is_ops, /* are we testing bps or ops */
--    _cleanup_test_img
+     throttle_config(&ts, QEMU_CLOCK_VIRTUAL, &cfg);
-+    _rm_test_img "$TEST_IMG.src"
-+    _cleanup_test_img
+     /* account a read */
- }
+-    throttle_account(&ts, false, size);
- trap "_cleanup; exit \$status" 0 1 2 3 15
++    throttle_account(&ts, THROTTLE_READ, size);
+     /* account a write */
-diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
+-    throttle_account(&ts, true, size);
-index XXXXXXX..XXXXXXX 100755
++    throttle_account(&ts, THROTTLE_WRITE, size);
---- a/tests/qemu-iotests/110
-+++ b/tests/qemu-iotests/110
+     /* check total result */
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
+     index = to_test[is_ops][0];
+diff --git a/util/throttle.c b/util/throttle.c
- _cleanup()
+index XXXXXXX..XXXXXXX 100644
- {
+--- a/util/throttle.c
--    _cleanup_test_img
++++ b/util/throttle.c
--        rm -f "$TEST_IMG.copy"
+@@ -XXX,XX +XXX,XX @@ int64_t throttle_compute_wait(LeakyBucket *bkt)
-+    _cleanup_test_img
-+    _rm_test_img "$TEST_IMG.copy"
+ /* This function compute the time that must be waited while this IO
- }
+  *
- trap "_cleanup; exit \$status" 0 1 2 3 15
+- * @is_write:   true if the current IO is a write, false if it's a read
++ * @direction:  throttle direction
-diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122
+  * @ret:        time to wait
-index XXXXXXX..XXXXXXX 100755
+  */
---- a/tests/qemu-iotests/122
+ static int64_t throttle_compute_wait_for(ThrottleState *ts,
-+++ b/tests/qemu-iotests/122
+-                                         bool is_write)
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
++                                         ThrottleDirection direction)
+ {
- _cleanup()
+     BucketType to_check[2][4] = { {THROTTLE_BPS_TOTAL,
- {
+                                    THROTTLE_OPS_TOTAL,
--    rm -f "$TEST_IMG".[123]
+@@ -XXX,XX +XXX,XX @@ static int64_t throttle_compute_wait_for(ThrottleState *ts,
--    _cleanup_test_img
+     int i;
-+    for img in "$TEST_IMG".[123]; do
-+        _rm_test_img "$img"
+     for (i = 0; i < 4; i++) {
-+    done
+-        BucketType index = to_check[is_write][i];
-+    _cleanup_test_img
++        BucketType index = to_check[direction][i];
- }
+         wait = throttle_compute_wait(&ts->cfg.buckets[index]);
- trap "_cleanup; exit \$status" 0 1 2 3 15
+         if (wait > max_wait) {
+             max_wait = wait;
-diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
+@@ -XXX,XX +XXX,XX @@ static int64_t throttle_compute_wait_for(ThrottleState *ts,
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/123
+ /* compute the timer for this type of operation
-+++ b/tests/qemu-iotests/123
+  *
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
+- * @is_write:   the type of operation
- _cleanup()
++ * @direction:  throttle direction
- {
+  * @now:        the current clock timestamp
-     _cleanup_test_img
+  * @next_timestamp: the resulting timer
--    rm -f "$SRC_IMG"
+  * @ret:        true if a timer must be set
-+    _rm_test_img "$SRC_IMG"
+  */
- }
+ static bool throttle_compute_timer(ThrottleState *ts,
- trap "_cleanup; exit \$status" 0 1 2 3 15
+-                                   bool is_write,
++                                   ThrottleDirection direction,
-diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
+                                    int64_t now,
-index XXXXXXX..XXXXXXX 100755
+                                    int64_t *next_timestamp)
---- a/tests/qemu-iotests/141
+ {
-+++ b/tests/qemu-iotests/141
+@@ -XXX,XX +XXX,XX @@ static bool throttle_compute_timer(ThrottleState *ts,
-@@ -XXX,XX +XXX,XX @@ _cleanup()
+     throttle_do_leak(ts, now);
- {
-     _cleanup_qemu
+     /* compute the wait time if any */
-     _cleanup_test_img
+-    wait = throttle_compute_wait_for(ts, is_write);
--    rm -f "$TEST_DIR"/{b,m,o}.$IMGFMT
++    wait = throttle_compute_wait_for(ts, direction);
-+    for img in "$TEST_DIR"/{b,m,o}.$IMGFMT; do
-+        _rm_test_img "$img"
+     /* if the code must wait compute when the next timer should fire */
-+    done
+     if (wait) {
- }
+@@ -XXX,XX +XXX,XX @@ void throttle_get_config(ThrottleState *ts, ThrottleConfig *cfg)
- trap "_cleanup; exit \$status" 0 1 2 3 15
+  * NOTE: this function is not unit tested due to it's usage of timer_mod
+  *
-diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142
+  * @tt:       the timers structure
-index XXXXXXX..XXXXXXX 100755
+- * @is_write: the type of operation (read/write)
---- a/tests/qemu-iotests/142
++ * @direction: throttle direction
-+++ b/tests/qemu-iotests/142
+  * @ret:      true if the timer has been scheduled else false
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
+  */
- _cleanup()
+ bool throttle_schedule_timer(ThrottleState *ts,
- {
+                              ThrottleTimers *tt,
-     _cleanup_test_img
+-                             bool is_write)
--    rm -f $TEST_IMG.snap
++                             ThrottleDirection direction)
-+    _rm_test_img "$TEST_IMG.snap"
+ {
- }
+     int64_t now = qemu_clock_get_ns(tt->clock_type);
- trap "_cleanup; exit \$status" 0 1 2 3 15
+     int64_t next_timestamp;
+     QEMUTimer *timer;
-diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
+     bool must_wait;
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/144
+-    timer = is_write ? tt->timers[THROTTLE_WRITE] : tt->timers[THROTTLE_READ];
-+++ b/tests/qemu-iotests/144
++    assert(direction < THROTTLE_MAX);
-@@ -XXX,XX +XXX,XX @@ TMP_SNAP2=${TEST_DIR}/tmp2.qcow2
++    timer = tt->timers[direction];
- _cleanup()
+     assert(timer);
- {
-     _cleanup_qemu
+     must_wait = throttle_compute_timer(ts,
--    rm -f "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"
+-                                       is_write,
-+    for img in "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"; do
++                                       direction,
-+        _rm_test_img "$img"
+                                        now,
-+    done
+                                        &next_timestamp);
- }
+@@ -XXX,XX +XXX,XX @@ bool throttle_schedule_timer(ThrottleState *ts,
- trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
+ /* do the accounting for this operation
-index XXXXXXX..XXXXXXX 100755
+  *
---- a/tests/qemu-iotests/153
+- * @is_write: the type of operation (read/write)
-+++ b/tests/qemu-iotests/153
++ * @direction: throttle direction
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
+  * @size:     the size of the operation
- _cleanup()
+  */
- {
+-void throttle_account(ThrottleState *ts, bool is_write, uint64_t size)
-     _cleanup_test_img
++void throttle_account(ThrottleState *ts, ThrottleDirection direction,
--    rm -f "${TEST_IMG}.base"
++                      uint64_t size)
--    rm -f "${TEST_IMG}.overlay"
+ {
--    rm -f "${TEST_IMG}.convert"
+     const BucketType bucket_types_size[2][2] = {
--    rm -f "${TEST_IMG}.a"
+         { THROTTLE_BPS_TOTAL, THROTTLE_BPS_READ },
--    rm -f "${TEST_IMG}.b"
+@@ -XXX,XX +XXX,XX @@ void throttle_account(ThrottleState *ts, bool is_write, uint64_t size)
--    rm -f "${TEST_IMG}.c"
+     double units = 1.0;
--    rm -f "${TEST_IMG}.lnk"
+     unsigned i;
-+    for img in "${TEST_IMG}".{base,overlay,convert,a,b,c,lnk}; do
-+        _rm_test_img "$img"
++    assert(direction < THROTTLE_MAX);
-+    done
+     /* if cfg.op_size is defined and smaller than size we compute unit count */
- }
+     if (ts->cfg.op_size && size > ts->cfg.op_size) {
- trap "_cleanup; exit \$status" 0 1 2 3 15
+         units = (double) size / ts->cfg.op_size;
+@@ -XXX,XX +XXX,XX @@ void throttle_account(ThrottleState *ts, bool is_write, uint64_t size)
-diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
+     for (i = 0; i < 2; i++) {
-index XXXXXXX..XXXXXXX 100755
+         LeakyBucket *bkt;
---- a/tests/qemu-iotests/156
-+++ b/tests/qemu-iotests/156
+-        bkt = &ts->cfg.buckets[bucket_types_size[is_write][i]];
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
++        bkt = &ts->cfg.buckets[bucket_types_size[direction][i]];
- _cleanup()
+         bkt->level += size;
- {
+         if (bkt->burst_length > 1) {
-     _cleanup_qemu
+             bkt->burst_level += size;
--    rm -f "$TEST_IMG"{,.target}{,.backing,.overlay}
+         }
-+    for img in "$TEST_IMG"{,.target}{,.backing,.overlay}; do
-+        _rm_test_img "$img"
+-        bkt = &ts->cfg.buckets[bucket_types_units[is_write][i]];
-+    done
++        bkt = &ts->cfg.buckets[bucket_types_units[direction][i]];
- }
+         bkt->level += units;
- trap "_cleanup; exit \$status" 0 1 2 3 15
+         if (bkt->burst_length > 1) {
+             bkt->burst_level += units;
@@ -XXX,XX +XXX,XX @@ _send_qemu_cmd $QEMU_HANDLE \
      '"status": "null"'
  # Remove the source images
 -rm -f "$TEST_IMG{,.backing,.overlay}"
 +for img in "$TEST_IMG{,.backing,.overlay}"; do
 +    _rm_test_img "$img"
 +done
  echo
 diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/159
 +++ b/tests/qemu-iotests/159
@@ -XXX,XX +XXX,XX @@ status=1
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG.out"
 +    _rm_test_img "$TEST_IMG.out"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/160
 +++ b/tests/qemu-iotests/160
@@ -XXX,XX +XXX,XX @@ status=1
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG.out" "$TEST_IMG.out.dd"
 +    _rm_test_img "$TEST_IMG.out"
 +    _rm_test_img "$TEST_IMG.out.dd"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/161
 +++ b/tests/qemu-iotests/161
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG.base"
 -    rm -f "$TEST_IMG.int"
 +    _rm_test_img "$TEST_IMG.base"
 +    _rm_test_img "$TEST_IMG.int"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/170
 +++ b/tests/qemu-iotests/170
@@ -XXX,XX +XXX,XX @@ status=1
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG.out"
 +    _rm_test_img  "$TEST_IMG.out"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/172
 +++ b/tests/qemu-iotests/172
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 -    _cleanup_test_img
 -    rm -f "$TEST_IMG.2"
 -    rm -f "$TEST_IMG.3"
 +    _cleanup_test_img
 +    _rm_test_img "$TEST_IMG.2"
 +    _rm_test_img "$TEST_IMG.3"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/173
 +++ b/tests/qemu-iotests/173
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_qemu
 -    rm  -f "${QEMU_TEST_DIR}/image.base" "${QEMU_TEST_DIR}/image.snp1"
 +    _rm_test_img "${TEST_DIR}/image.base"
 +    _rm_test_img "${TEST_DIR}/image.snp1"
      _cleanup_test_img
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/178
 +++ b/tests/qemu-iotests/178
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG.converted"
 +    _rm_test_img "$TEST_IMG.converted"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/182
 +++ b/tests/qemu-iotests/182
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG.overlay"
 +    _rm_test_img "$TEST_IMG.overlay"
      rm -f "$SOCK_DIR/nbd.socket"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/183
 +++ b/tests/qemu-iotests/183
@@ -XXX,XX +XXX,XX @@ MIG_SOCKET="${SOCK_DIR}/migrate"
  _cleanup()
  {
      rm -f "${MIG_SOCKET}"
 -    rm -f "${TEST_IMG}.dest"
 +    _rm_test_img "${TEST_IMG}.dest"
      _cleanup_test_img
      _cleanup_qemu
  }
 diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/185
 +++ b/tests/qemu-iotests/185
@@ -XXX,XX +XXX,XX @@ status=1 # failure is the default!
  _cleanup()
  {
 -    rm -f "${TEST_IMG}.mid"
 -    rm -f "${TEST_IMG}.copy"
 +    _rm_test_img "${TEST_IMG}.mid"
 +    _rm_test_img "${TEST_IMG}.copy"
      _cleanup_test_img
      _cleanup_qemu
  }
 diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/187
 +++ b/tests/qemu-iotests/187
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 -    _cleanup_test_img
 -    rm -f "$TEST_IMG.2"
 -    rm -f "$TEST_IMG.3"
 +    _cleanup_test_img
 +    _rm_test_img "$TEST_IMG.2"
 +    _rm_test_img "$TEST_IMG.3"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/190
 +++ b/tests/qemu-iotests/190
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG.converted"
 +    _rm_test_img "$TEST_IMG.converted"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/191
 +++ b/tests/qemu-iotests/191
@@ -XXX,XX +XXX,XX @@ status=1 # failure is the default!
  _cleanup()
  {
 -    rm -f "${TEST_IMG}.mid"
 -    rm -f "${TEST_IMG}.ovl2"
 -    rm -f "${TEST_IMG}.ovl3"
 +    _rm_test_img "${TEST_IMG}.mid"
 +    _rm_test_img "${TEST_IMG}.ovl2"
 +    _rm_test_img "${TEST_IMG}.ovl3"
      _cleanup_test_img
      _cleanup_qemu
  }
 diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/195
 +++ b/tests/qemu-iotests/195
@@ -XXX,XX +XXX,XX @@ status=1 # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG.mid"
 +    _rm_test_img "$TEST_IMG.mid"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/197
 +++ b/tests/qemu-iotests/197
@@ -XXX,XX +XXX,XX @@ esac
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_WRAP"
 +    _rm_test_img "$TEST_WRAP"
      rm -f "$BLKDBG_CONF"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/200
 +++ b/tests/qemu-iotests/200
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_qemu
 -    rm -f "${TEST_IMG}" "${BACKING_IMG}"
 +    _rm_test_img "${TEST_IMG}"
 +    _rm_test_img "${BACKING_IMG}"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/215
 +++ b/tests/qemu-iotests/215
@@ -XXX,XX +XXX,XX @@ esac
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_WRAP"
 +    _rm_test_img "$TEST_WRAP"
      rm -f "$BLKDBG_CONF"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/225 b/tests/qemu-iotests/225
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/225
 +++ b/tests/qemu-iotests/225
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG.not_base"
 +    _rm_test_img "$TEST_IMG.not_base"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/229
 +++ b/tests/qemu-iotests/229
@@ -XXX,XX +XXX,XX @@ _cleanup()
  {
      _cleanup_qemu
      _cleanup_test_img
 -    rm -f "$TEST_IMG" "$DEST_IMG"
 +    _rm_test_img "$TEST_IMG"
 +    _rm_test_img "$DEST_IMG"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/232
 +++ b/tests/qemu-iotests/232
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f $TEST_IMG.[01234]
 +    for img in "$TEST_IMG".[01234]; do
 +        _rm_test_img "$img"
 +    done
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/243
 +++ b/tests/qemu-iotests/243
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f $TEST_IMG.data
 +    _rm_test_img "$TEST_IMG.data"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/244
 +++ b/tests/qemu-iotests/244
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f $TEST_IMG.data
 -    rm -f $TEST_IMG.src
 +    _rm_test_img "$TEST_IMG.data"
 +    _rm_test_img "$TEST_IMG.src"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/247
 +++ b/tests/qemu-iotests/247
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f $TEST_IMG.[01234]
 +    for img in "$TEST_IMG".[01234]; do
 +        _rm_test_img "$img"
 +    done
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/249
 +++ b/tests/qemu-iotests/249
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG.base"
 -    rm -f "$TEST_IMG.int"
 +    _rm_test_img "$TEST_IMG.base"
 +    _rm_test_img "$TEST_IMG.int"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/252 b/tests/qemu-iotests/252
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/252
 +++ b/tests/qemu-iotests/252
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
      _cleanup_test_img
 -    rm -f "$TEST_IMG.base_new"
 +    _rm_test_img "$TEST_IMG.base_new"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 --
-.24.1
+.41.0

-[PULL 32/34] tests/qemu-iotests: add case to write compressed data of multiple clusters
+[PULL 07/14] throttle: use THROTTLE_MAX/ARRAY_SIZE for hard code
-From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
+From: zhenwei pi <pizhenwei@bytedance.com>
-Add the case to the iotest #214 that checks possibility of writing
+The first dimension of both to_check and
-compressed data of more than one cluster size. The test case involves
+bucket_types_size/bucket_types_units is used as throttle direction,
-the compress filter driver showing a sample usage of that.
+use THROTTLE_MAX instead of hard coded number. Also use ARRAY_SIZE()
 to avoid hard coded number for the second dimension.
-Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
+Hanna noticed that the two array should be static. Yes, turn them
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+into static variables.
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Message-id: 1575288906-551879-4-git-send-email-andrey.shinkevich@virtuozzo.com
+Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
 Message-Id: <20230728022006.1098509-8-pizhenwei@bytedance.com>
 Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
 ---
- tests/qemu-iotests/214     | 43 ++++++++++++++++++++++++++++++++++++++
+ util/throttle.c | 11 ++++++-----
- tests/qemu-iotests/214.out | 14 +++++++++++++
+file changed, 6 insertions(+), 5 deletions(-)
 files changed, 57 insertions(+)
-diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
+diff --git a/util/throttle.c b/util/throttle.c
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/214
 +++ b/tests/qemu-iotests/214
@@ -XXX,XX +XXX,XX @@ _check_test_img -r all
  $QEMU_IO -c "read  -P 0x11  0 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
  $QEMU_IO -c "read  -P 0x22 4M 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
 +echo
 +echo "=== Write compressed data of multiple clusters ==="
 +echo
 +cluster_size=0x10000
 +_make_test_img 2M -o cluster_size=$cluster_size
 +
 +echo "Write uncompressed data:"
 +let data_size="8 * $cluster_size"
 +$QEMU_IO -c "write -P 0xaa 0 $data_size" "$TEST_IMG" \
 +         2>&1 | _filter_qemu_io | _filter_testdir
 +sizeA=$($QEMU_IMG info --output=json "$TEST_IMG" |
 +        sed -n '/"actual-size":/ s/[^0-9]//gp')
 +
 +_make_test_img 2M -o cluster_size=$cluster_size
 +echo "Write compressed data:"
 +let data_size="3 * $cluster_size + $cluster_size / 2"
 +# Set compress on. That will align the written data
 +# by the cluster size and will write them compressed.
 +QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \
 +$QEMU_IO -c "write -P 0xbb 0 $data_size" --image-opts \
 +         "driver=compress,file.driver=$IMGFMT,file.file.driver=file,file.file.filename=$TEST_IMG" \
 +         2>&1 | _filter_qemu_io | _filter_testdir
 +
 +let offset="4 * $cluster_size + $cluster_size / 4"
 +QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \
 +$QEMU_IO -c "write -P 0xcc $offset $data_size" "json:{\
 +    'driver': 'compress',
 +    'file': {'driver': '$IMGFMT',
 +             'file': {'driver': 'file',
 +                      'filename': '$TEST_IMG'}}}" | \
 +                          _filter_qemu_io | _filter_testdir
 +
 +sizeB=$($QEMU_IMG info --output=json "$TEST_IMG" |
 +        sed -n '/"actual-size":/ s/[^0-9]//gp')
 +
 +if [ $sizeA -le $sizeB ]
 +then
 +    echo "Compression ERROR"
 +fi
 +
 +$QEMU_IMG check --output=json "$TEST_IMG" |
 +          sed -n 's/,$//; /"compressed-clusters":/ s/^ *//p'
 +
  # success, all done
  echo '*** done'
  rm -f $seq.full
 diff --git a/tests/qemu-iotests/214.out b/tests/qemu-iotests/214.out
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/214.out
+--- a/util/throttle.c
-+++ b/tests/qemu-iotests/214.out
++++ b/util/throttle.c
-@@ -XXX,XX +XXX,XX @@ read 4194304/4194304 bytes at offset 0
+@@ -XXX,XX +XXX,XX @@ int64_t throttle_compute_wait(LeakyBucket *bkt)
-MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+ static int64_t throttle_compute_wait_for(ThrottleState *ts,
- read 4194304/4194304 bytes at offset 4194304
+                                          ThrottleDirection direction)
-MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+ {
-+
+-    BucketType to_check[2][4] = { {THROTTLE_BPS_TOTAL,
-+=== Write compressed data of multiple clusters ===
++    static const BucketType to_check[THROTTLE_MAX][4] = {
-+
++                                  {THROTTLE_BPS_TOTAL,
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
+                                    THROTTLE_OPS_TOTAL,
-+Write uncompressed data:
+                                    THROTTLE_BPS_READ,
-+wrote 524288/524288 bytes at offset 0
+                                    THROTTLE_OPS_READ},
-+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -XXX,XX +XXX,XX @@ static int64_t throttle_compute_wait_for(ThrottleState *ts,
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
+     int64_t wait, max_wait = 0;
-+Write compressed data:
+     int i;
-+wrote 229376/229376 bytes at offset 0
-+224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+-    for (i = 0; i < 4; i++) {
-+wrote 229376/229376 bytes at offset 278528
++    for (i = 0; i < ARRAY_SIZE(to_check[THROTTLE_READ]); i++) {
-+224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+         BucketType index = to_check[direction][i];
-+"compressed-clusters": 8
+         wait = throttle_compute_wait(&ts->cfg.buckets[index]);
- *** done
+         if (wait > max_wait) {
@@ -XXX,XX +XXX,XX @@ bool throttle_schedule_timer(ThrottleState *ts,
  void throttle_account(ThrottleState *ts, ThrottleDirection direction,
                        uint64_t size)
  {
 -    const BucketType bucket_types_size[2][2] = {
 +    static const BucketType bucket_types_size[THROTTLE_MAX][2] = {
          { THROTTLE_BPS_TOTAL, THROTTLE_BPS_READ },
          { THROTTLE_BPS_TOTAL, THROTTLE_BPS_WRITE }
      };
 -    const BucketType bucket_types_units[2][2] = {
 +    static const BucketType bucket_types_units[THROTTLE_MAX][2] = {
          { THROTTLE_OPS_TOTAL, THROTTLE_OPS_READ },
          { THROTTLE_OPS_TOTAL, THROTTLE_OPS_WRITE }
      };
@@ -XXX,XX +XXX,XX @@ void throttle_account(ThrottleState *ts, ThrottleDirection direction,
          units = (double) size / ts->cfg.op_size;
      }
 -    for (i = 0; i < 2; i++) {
 +    for (i = 0; i < ARRAY_SIZE(bucket_types_size[THROTTLE_READ]); i++) {
          LeakyBucket *bkt;
          bkt = &ts->cfg.buckets[bucket_types_size[direction][i]];
 --
-.24.1
+.41.0

-[PULL 03/34] blkdebug: Allow taking/unsharing permissions
+[PULL 08/14] fsdev: Use ThrottleDirection instread of bool is_write
-Sometimes it is useful to be able to add a node to the block graph that
+From: zhenwei pi <pizhenwei@bytedance.com>
 takes or unshare a certain set of permissions for debugging purposes.
 This patch adds this capability to blkdebug.
-(Note that you cannot make blkdebug release or share permissions that it
+'bool is_write' style is obsolete from throttle framework, adapt
-needs to take or cannot share, because this might result in assertion
+fsdev to the new style.
 failures in the block layer.  But if the blkdebug node has no parents,
 it will not take any permissions and share everything by default, so you
 can then freely choose what permissions to take and share.)
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Cc: Greg Kurz <groug@kaod.org>
-Message-id: 20191108123455.39445-4-mreitz@redhat.com
+Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Message-Id: <20230728022006.1098509-9-pizhenwei@bytedance.com>
 Reviewed-by: Greg Kurz <groug@kaod.org>
 Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
 ---
- block/blkdebug.c     | 93 +++++++++++++++++++++++++++++++++++++++++++-
+ fsdev/qemu-fsdev-throttle.h |  4 ++--
- qapi/block-core.json | 14 ++++++-
+ fsdev/qemu-fsdev-throttle.c | 14 +++++++-------
-files changed, 105 insertions(+), 2 deletions(-)
+ hw/9pfs/cofile.c            |  4 ++--
 files changed, 11 insertions(+), 11 deletions(-)
-diff --git a/block/blkdebug.c b/block/blkdebug.c
+diff --git a/fsdev/qemu-fsdev-throttle.h b/fsdev/qemu-fsdev-throttle.h
 index XXXXXXX..XXXXXXX 100644
---- a/block/blkdebug.c
+--- a/fsdev/qemu-fsdev-throttle.h
-+++ b/block/blkdebug.c
++++ b/fsdev/qemu-fsdev-throttle.h
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ typedef struct FsThrottle {
- #include "qemu/cutils.h"
+     ThrottleState ts;
- #include "qemu/config-file.h"
+     ThrottleTimers tt;
- #include "block/block_int.h"
+     ThrottleConfig cfg;
-+#include "block/qdict.h"
+-    CoQueue      throttled_reqs[2];
- #include "qemu/module.h"
++    CoQueue      throttled_reqs[THROTTLE_MAX];
- #include "qemu/option.h"
+ } FsThrottle;
-+#include "qapi/qapi-visit-block-core.h"
- #include "qapi/qmp/qdict.h"
+ int fsdev_throttle_parse_opts(QemuOpts *, FsThrottle *, Error **);
-+#include "qapi/qmp/qlist.h"
- #include "qapi/qmp/qstring.h"
+ void fsdev_throttle_init(FsThrottle *);
-+#include "qapi/qobject-input-visitor.h"
- #include "sysemu/qtest.h"
+-void coroutine_fn fsdev_co_throttle_request(FsThrottle *, bool ,
++void coroutine_fn fsdev_co_throttle_request(FsThrottle *, ThrottleDirection ,
- typedef struct BDRVBlkdebugState {
+                                             struct iovec *, int);
-@@ -XXX,XX +XXX,XX @@ typedef struct BDRVBlkdebugState {
-     uint64_t opt_discard;
+ void fsdev_throttle_cleanup(FsThrottle *);
-     uint64_t max_discard;
+diff --git a/fsdev/qemu-fsdev-throttle.c b/fsdev/qemu-fsdev-throttle.c
+index XXXXXXX..XXXXXXX 100644
-+    uint64_t take_child_perms;
+--- a/fsdev/qemu-fsdev-throttle.c
-+    uint64_t unshare_child_perms;
++++ b/fsdev/qemu-fsdev-throttle.c
-+
+@@ -XXX,XX +XXX,XX @@ void fsdev_throttle_init(FsThrottle *fst)
-     /* For blkdebug_refresh_filename() */
+     }
      char *config_file;
@@ -XXX,XX +XXX,XX @@ static void blkdebug_parse_filename(const char *filename, QDict *options,
      qdict_put_str(options, "x-image", filename);
  }
-+static int blkdebug_parse_perm_list(uint64_t *dest, QDict *options,
+-void coroutine_fn fsdev_co_throttle_request(FsThrottle *fst, bool is_write,
-+                                    const char *prefix, Error **errp)
++void coroutine_fn fsdev_co_throttle_request(FsThrottle *fst,
-+{
++                                            ThrottleDirection direction,
-+    int ret = 0;
+                                             struct iovec *iov, int iovcnt)
-+    QDict *subqdict = NULL;
+ {
-+    QObject *crumpled_subqdict = NULL;
+-    ThrottleDirection direction = is_write ? THROTTLE_WRITE : THROTTLE_READ;
-+    Visitor *v = NULL;
+-
-+    BlockPermissionList *perm_list = NULL, *element;
++    assert(direction < THROTTLE_MAX);
-+    Error *local_err = NULL;
+     if (throttle_enabled(&fst->cfg)) {
-+
+         if (throttle_schedule_timer(&fst->ts, &fst->tt, direction) ||
-+    *dest = 0;
+-            !qemu_co_queue_empty(&fst->throttled_reqs[is_write])) {
-+
+-            qemu_co_queue_wait(&fst->throttled_reqs[is_write], NULL);
-+    qdict_extract_subqdict(options, &subqdict, prefix);
++            !qemu_co_queue_empty(&fst->throttled_reqs[direction])) {
-+    if (!qdict_size(subqdict)) {
++            qemu_co_queue_wait(&fst->throttled_reqs[direction], NULL);
-+        goto out;
+         }
-+    }
-+
+         throttle_account(&fst->ts, direction, iov_size(iov, iovcnt));
-+    crumpled_subqdict = qdict_crumple(subqdict, errp);
-+    if (!crumpled_subqdict) {
+-        if (!qemu_co_queue_empty(&fst->throttled_reqs[is_write]) &&
-+        ret = -EINVAL;
++        if (!qemu_co_queue_empty(&fst->throttled_reqs[direction]) &&
-+        goto out;
+             !throttle_schedule_timer(&fst->ts, &fst->tt, direction)) {
-+    }
+-            qemu_co_queue_next(&fst->throttled_reqs[is_write]);
-+
++            qemu_co_queue_next(&fst->throttled_reqs[direction]);
-+    v = qobject_input_visitor_new(crumpled_subqdict);
+         }
-+    visit_type_BlockPermissionList(v, NULL, &perm_list, &local_err);
+     }
 +    if (local_err) {
 +        error_propagate(errp, local_err);
 +        ret = -EINVAL;
 +        goto out;
 +    }
 +
 +    for (element = perm_list; element; element = element->next) {
 +        *dest |= bdrv_qapi_perm_to_blk_perm(element->value);
 +    }
 +
 +out:
 +    qapi_free_BlockPermissionList(perm_list);
 +    visit_free(v);
 +    qobject_unref(subqdict);
 +    qobject_unref(crumpled_subqdict);
 +    return ret;
 +}
 +
 +static int blkdebug_parse_perms(BDRVBlkdebugState *s, QDict *options,
 +                                Error **errp)
 +{
 +    int ret;
 +
 +    ret = blkdebug_parse_perm_list(&s->take_child_perms, options,
 +                                   "take-child-perms.", errp);
 +    if (ret < 0) {
 +        return ret;
 +    }
 +
 +    ret = blkdebug_parse_perm_list(&s->unshare_child_perms, options,
 +                                   "unshare-child-perms.", errp);
 +    if (ret < 0) {
 +        return ret;
 +    }
 +
 +    return 0;
 +}
 +
  static QemuOptsList runtime_opts = {
      .name = "blkdebug",
      .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
@@ -XXX,XX +XXX,XX @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags,
      /* Set initial state */
      s->state = 1;
 +    /* Parse permissions modifiers before opening the image file */
 +    ret = blkdebug_parse_perms(s, options, errp);
 +    if (ret < 0) {
 +        goto out;
 +    }
 +
      /* Open the image file */
      bs->file = bdrv_open_child(qemu_opt_get(opts, "x-image"), options, "image",
                                 bs, &child_file, false, &local_err);
@@ -XXX,XX +XXX,XX @@ static int blkdebug_reopen_prepare(BDRVReopenState *reopen_state,
      return 0;
  }
+diff --git a/hw/9pfs/cofile.c b/hw/9pfs/cofile.c
 +static void blkdebug_child_perm(BlockDriverState *bs, BdrvChild *c,
 +                                const BdrvChildRole *role,
 +                                BlockReopenQueue *reopen_queue,
 +                                uint64_t perm, uint64_t shared,
 +                                uint64_t *nperm, uint64_t *nshared)
 +{
 +    BDRVBlkdebugState *s = bs->opaque;
 +
 +    bdrv_filter_default_perms(bs, c, role, reopen_queue, perm, shared,
 +                              nperm, nshared);
 +
 +    *nperm |= s->take_child_perms;
 +    *nshared &= ~s->unshare_child_perms;
 +}
 +
  static const char *const blkdebug_strong_runtime_opts[] = {
      "config",
      "inject-error.",
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_blkdebug = {
      .bdrv_file_open         = blkdebug_open,
      .bdrv_close             = blkdebug_close,
      .bdrv_reopen_prepare    = blkdebug_reopen_prepare,
 -    .bdrv_child_perm        = bdrv_filter_default_perms,
 +    .bdrv_child_perm        = blkdebug_child_perm,
      .bdrv_getlength         = blkdebug_getlength,
      .bdrv_refresh_filename  = blkdebug_refresh_filename,
 diff --git a/qapi/block-core.json b/qapi/block-core.json
 index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
+--- a/hw/9pfs/cofile.c
-+++ b/qapi/block-core.json
++++ b/hw/9pfs/cofile.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ int coroutine_fn v9fs_co_pwritev(V9fsPDU *pdu, V9fsFidState *fidp,
- #
+     if (v9fs_request_cancelled(pdu)) {
- # @set-state:       array of state-change descriptions
+         return -EINTR;
- #
+     }
-+# @take-child-perms: Permissions to take on @image in addition to what
+-    fsdev_co_throttle_request(s->ctx.fst, true, iov, iovcnt);
-+#                    is necessary anyway (which depends on how the
++    fsdev_co_throttle_request(s->ctx.fst, THROTTLE_WRITE, iov, iovcnt);
-+#                    blkdebug node is used).  Defaults to none.
+     v9fs_co_run_in_worker(
-+#                    (since 5.0)
+         {
-+#
+             err = s->ops->pwritev(&s->ctx, &fidp->fs, iov, iovcnt, offset);
-+# @unshare-child-perms: Permissions not to share on @image in addition
+@@ -XXX,XX +XXX,XX @@ int coroutine_fn v9fs_co_preadv(V9fsPDU *pdu, V9fsFidState *fidp,
-+#                       to what cannot be shared anyway (which depends
+     if (v9fs_request_cancelled(pdu)) {
-+#                       on how the blkdebug node is used).  Defaults
+         return -EINTR;
-+#                       to none.  (since 5.0)
+     }
-+#
+-    fsdev_co_throttle_request(s->ctx.fst, false, iov, iovcnt);
- # Since: 2.9
++    fsdev_co_throttle_request(s->ctx.fst, THROTTLE_READ, iov, iovcnt);
- ##
+     v9fs_co_run_in_worker(
- { 'struct': 'BlockdevOptionsBlkdebug',
+         {
-@@ -XXX,XX +XXX,XX @@
+             err = s->ops->preadv(&s->ctx, &fidp->fs, iov, iovcnt, offset);
              '*opt-write-zero': 'int32', '*max-write-zero': 'int32',
              '*opt-discard': 'int32', '*max-discard': 'int32',
              '*inject-error': ['BlkdebugInjectErrorOptions'],
 -            '*set-state': ['BlkdebugSetStateOptions'] } }
 +            '*set-state': ['BlkdebugSetStateOptions'],
 +            '*take-child-perms': ['BlockPermission'],
 +            '*unshare-child-perms': ['BlockPermission'] } }
  ##
  # @BlockdevOptionsBlklogwrites:
 --
-.24.1
+.41.0

-[PULL 06/34] throttle-groups: fix memory leak in throttle_group_set_limit:
+[PULL 09/14] block/throttle-groups: Use ThrottleDirection instread of bool is_write
-From: PanNengyuan <pannengyuan@huawei.com>
+From: zhenwei pi <pizhenwei@bytedance.com>
-This avoid a memory leak when qom-set is called to set throttle_group
+'bool is_write' style is obsolete from throttle framework, adapt
-limits, here is an easy way to reproduce:
+block throttle groups to the new style:
+- use ThrottleDirection instead of 'bool is_write'. Ex,
-. run qemu-iotests as follow and check the result with asan:
+  schedule_next_request(ThrottleGroupMember *tgm, bool is_write)
-       ./check -qcow2 184
+  -> schedule_next_request(ThrottleGroupMember *tgm, ThrottleDirection direction)
-Following is the asan output backtrack:
+- use THROTTLE_MAX instead of hard code. Ex, ThrottleGroupMember *tokens[2]
-Direct leak of 912 byte(s) in 3 object(s) allocated from:
+  -> ThrottleGroupMember *tokens[THROTTLE_MAX]
-    #0 0xffff8d7ab3c3 in __interceptor_calloc   (/lib64/libasan.so.4+0xd33c3)
-    #1 0xffff8d4c31cb in g_malloc0   (/lib64/libglib-2.0.so.0+0x571cb)
+- use ThrottleDirection instead of hard code on iteration. Ex, (i = 0; i < 2; i++)
-    #2 0x190c857 in qobject_input_start_struct  /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qapi/qobject-input-visitor.c:295
+  -> for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++)
-    #3 0x19070df in visit_start_struct   /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qapi/qapi-visit-core.c:49
-    #4 0x1948b87 in visit_type_ThrottleLimits   qapi/qapi-visit-block-core.c:3759
+Use a simple python script to test the new style:
-    #5 0x17e4aa3 in throttle_group_set_limits   /mnt/sdc/qemu-master/qemu-4.2.0-rc0/block/throttle-groups.c:900
+ #!/usr/bin/python3
-    #6 0x1650eff in object_property_set     /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/object.c:1272
+import subprocess
-    #7 0x1658517 in object_property_set_qobject   /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/qom-qobject.c:26
+import random
-    #8 0x15880bb in qmp_qom_set  /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/qom-qmp-cmds.c:74
+import time
-    #9 0x157e3e3 in qmp_marshal_qom_set  qapi/qapi-commands-qom.c:154
+commands = ['virsh blkdeviotune jammy vda --write-bytes-sec ', \
-Reported-by: Euler Robot <euler.robot@huawei.com>
+            'virsh blkdeviotune jammy vda --write-iops-sec ', \
-Signed-off-by: PanNengyuan <pannengyuan@huawei.com>
+            'virsh blkdeviotune jammy vda --read-bytes-sec ', \
-Message-id: 1574835614-42028-1-git-send-email-pannengyuan@huawei.com
+            'virsh blkdeviotune jammy vda --read-iops-sec ']
-Signed-off-by: Max Reitz <mreitz@redhat.com>
 for loop in range(1, 1000):
     time.sleep(random.randrange(3, 5))
     command = commands[random.randrange(0, 3)] + str(random.randrange(0, 1000000))
     subprocess.run(command, shell=True, check=True)
 This works fine.
 Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
 Message-Id: <20230728022006.1098509-10-pizhenwei@bytedance.com>
 Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
 Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
 ---
- block/throttle-groups.c | 4 ++--
+ include/block/throttle-groups.h |   6 +-
-file changed, 2 insertions(+), 2 deletions(-)
+ block/block-backend.c           |   4 +-
+ block/throttle-groups.c         | 161 ++++++++++++++++----------------
  block/throttle.c                |   8 +-
 files changed, 90 insertions(+), 89 deletions(-)
 diff --git a/include/block/throttle-groups.h b/include/block/throttle-groups.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/block/throttle-groups.h
 +++ b/include/block/throttle-groups.h
@@ -XXX,XX +XXX,XX @@ typedef struct ThrottleGroupMember {
      AioContext   *aio_context;
      /* throttled_reqs_lock protects the CoQueues for throttled requests.  */
      CoMutex      throttled_reqs_lock;
 -    CoQueue      throttled_reqs[2];
 +    CoQueue      throttled_reqs[THROTTLE_MAX];
      /* Nonzero if the I/O limits are currently being ignored; generally
       * it is zero.  Accessed with atomic operations.
@@ -XXX,XX +XXX,XX @@ typedef struct ThrottleGroupMember {
       * throttle_state tells us if I/O limits are configured. */
      ThrottleState *throttle_state;
      ThrottleTimers throttle_timers;
 -    unsigned       pending_reqs[2];
 +    unsigned       pending_reqs[THROTTLE_MAX];
      QLIST_ENTRY(ThrottleGroupMember) round_robin;
  } ThrottleGroupMember;
@@ -XXX,XX +XXX,XX @@ void throttle_group_restart_tgm(ThrottleGroupMember *tgm);
  void coroutine_fn throttle_group_co_io_limits_intercept(ThrottleGroupMember *tgm,
                                                          int64_t bytes,
 -                                                        bool is_write);
 +                                                        ThrottleDirection direction);
  void throttle_group_attach_aio_context(ThrottleGroupMember *tgm,
                                         AioContext *new_context);
  void throttle_group_detach_aio_context(ThrottleGroupMember *tgm);
 diff --git a/block/block-backend.c b/block/block-backend.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/block-backend.c
 +++ b/block/block-backend.c
@@ -XXX,XX +XXX,XX @@ blk_co_do_preadv_part(BlockBackend *blk, int64_t offset, int64_t bytes,
      /* throttling disk I/O */
      if (blk->public.throttle_group_member.throttle_state) {
          throttle_group_co_io_limits_intercept(&blk->public.throttle_group_member,
 -                bytes, false);
 +                bytes, THROTTLE_READ);
      }
      ret = bdrv_co_preadv_part(blk->root, offset, bytes, qiov, qiov_offset,
@@ -XXX,XX +XXX,XX @@ blk_co_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes,
      /* throttling disk I/O */
      if (blk->public.throttle_group_member.throttle_state) {
          throttle_group_co_io_limits_intercept(&blk->public.throttle_group_member,
 -                bytes, true);
 +                bytes, THROTTLE_WRITE);
      }
      if (!blk->enable_write_cache) {
 diff --git a/block/throttle-groups.c b/block/throttle-groups.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/throttle-groups.c
 +++ b/block/throttle-groups.c
-@@ -XXX,XX +XXX,XX @@ static void throttle_group_set_limits(Object *obj, Visitor *v,
+@@ -XXX,XX +XXX,XX @@
- {
-     ThrottleGroup *tg = THROTTLE_GROUP(obj);
+ static void throttle_group_obj_init(Object *obj);
-     ThrottleConfig cfg;
+ static void throttle_group_obj_complete(UserCreatable *obj, Error **errp);
--    ThrottleLimits arg = { 0 };
+-static void timer_cb(ThrottleGroupMember *tgm, bool is_write);
--    ThrottleLimits *argp = &arg;
++static void timer_cb(ThrottleGroupMember *tgm, ThrottleDirection direction);
-+    ThrottleLimits *argp;
-     Error *local_err = NULL;
+ /* The ThrottleGroup structure (with its ThrottleState) is shared
+  * among different ThrottleGroupMembers and it's independent from
-     visit_type_ThrottleLimits(v, name, &argp, &local_err);
+@@ -XXX,XX +XXX,XX @@ struct ThrottleGroup {
-@@ -XXX,XX +XXX,XX @@ static void throttle_group_set_limits(Object *obj, Visitor *v,
+     QemuMutex lock; /* This lock protects the following four fields */
- unlock:
+     ThrottleState ts;
      QLIST_HEAD(, ThrottleGroupMember) head;
 -    ThrottleGroupMember *tokens[2];
 -    bool any_timer_armed[2];
 +    ThrottleGroupMember *tokens[THROTTLE_MAX];
 +    bool any_timer_armed[THROTTLE_MAX];
      QEMUClockType clock_type;
      /* This field is protected by the global QEMU mutex */
@@ -XXX,XX +XXX,XX @@ static ThrottleGroupMember *throttle_group_next_tgm(ThrottleGroupMember *tgm)
   * This assumes that tg->lock is held.
   *
   * @tgm:        the ThrottleGroupMember
 - * @is_write:   the type of operation (read/write)
 + * @direction:  the ThrottleDirection
   * @ret:        whether the ThrottleGroupMember has pending requests.
   */
  static inline bool tgm_has_pending_reqs(ThrottleGroupMember *tgm,
 -                                        bool is_write)
 +                                        ThrottleDirection direction)
  {
 -    return tgm->pending_reqs[is_write];
 +    return tgm->pending_reqs[direction];
  }
  /* Return the next ThrottleGroupMember in the round-robin sequence with pending
@@ -XXX,XX +XXX,XX @@ static inline bool tgm_has_pending_reqs(ThrottleGroupMember *tgm,
   * This assumes that tg->lock is held.
   *
   * @tgm:       the current ThrottleGroupMember
 - * @is_write:  the type of operation (read/write)
 + * @direction: the ThrottleDirection
   * @ret:       the next ThrottleGroupMember with pending requests, or tgm if
   *             there is none.
   */
  static ThrottleGroupMember *next_throttle_token(ThrottleGroupMember *tgm,
 -                                                bool is_write)
 +                                                ThrottleDirection direction)
  {
      ThrottleState *ts = tgm->throttle_state;
      ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
@@ -XXX,XX +XXX,XX @@ static ThrottleGroupMember *next_throttle_token(ThrottleGroupMember *tgm,
       * it's being drained. Skip the round-robin search and return tgm
       * immediately if it has pending requests. Otherwise we could be
       * forcing it to wait for other member's throttled requests. */
 -    if (tgm_has_pending_reqs(tgm, is_write) &&
 +    if (tgm_has_pending_reqs(tgm, direction) &&
          qatomic_read(&tgm->io_limits_disabled)) {
          return tgm;
      }
 -    start = token = tg->tokens[is_write];
 +    start = token = tg->tokens[direction];
      /* get next bs round in round robin style */
      token = throttle_group_next_tgm(token);
 -    while (token != start && !tgm_has_pending_reqs(token, is_write)) {
 +    while (token != start && !tgm_has_pending_reqs(token, direction)) {
          token = throttle_group_next_tgm(token);
      }
@@ -XXX,XX +XXX,XX @@ static ThrottleGroupMember *next_throttle_token(ThrottleGroupMember *tgm,
       * then decide the token is the current tgm because chances are
       * the current tgm got the current request queued.
       */
 -    if (token == start && !tgm_has_pending_reqs(token, is_write)) {
 +    if (token == start && !tgm_has_pending_reqs(token, direction)) {
          token = tgm;
      }
      /* Either we return the original TGM, or one with pending requests */
 -    assert(token == tgm || tgm_has_pending_reqs(token, is_write));
 +    assert(token == tgm || tgm_has_pending_reqs(token, direction));
      return token;
  }
@@ -XXX,XX +XXX,XX @@ static ThrottleGroupMember *next_throttle_token(ThrottleGroupMember *tgm,
   * This assumes that tg->lock is held.
   *
   * @tgm:        the current ThrottleGroupMember
 - * @is_write:   the type of operation (read/write)
 + * @direction:  the ThrottleDirection
   * @ret:        whether the I/O request needs to be throttled or not
   */
  static bool throttle_group_schedule_timer(ThrottleGroupMember *tgm,
 -                                          bool is_write)
 +                                          ThrottleDirection direction)
  {
      ThrottleState *ts = tgm->throttle_state;
      ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
      ThrottleTimers *tt = &tgm->throttle_timers;
 -    ThrottleDirection direction = is_write ? THROTTLE_WRITE : THROTTLE_READ;
      bool must_wait;
      if (qatomic_read(&tgm->io_limits_disabled)) {
@@ -XXX,XX +XXX,XX @@ static bool throttle_group_schedule_timer(ThrottleGroupMember *tgm,
      }
      /* Check if any of the timers in this group is already armed */
 -    if (tg->any_timer_armed[is_write]) {
 +    if (tg->any_timer_armed[direction]) {
          return true;
      }
@@ -XXX,XX +XXX,XX @@ static bool throttle_group_schedule_timer(ThrottleGroupMember *tgm,
      /* If a timer just got armed, set tgm as the current token */
      if (must_wait) {
 -        tg->tokens[is_write] = tgm;
 -        tg->any_timer_armed[is_write] = true;
 +        tg->tokens[direction] = tgm;
 +        tg->any_timer_armed[direction] = true;
      }
      return must_wait;
@@ -XXX,XX +XXX,XX @@ static bool throttle_group_schedule_timer(ThrottleGroupMember *tgm,
   * any request was actually pending.
   *
   * @tgm:       the current ThrottleGroupMember
 - * @is_write:  the type of operation (read/write)
 + * @direction: the ThrottleDirection
   */
  static bool coroutine_fn throttle_group_co_restart_queue(ThrottleGroupMember *tgm,
 -                                                         bool is_write)
 +                                                         ThrottleDirection direction)
  {
      bool ret;
      qemu_co_mutex_lock(&tgm->throttled_reqs_lock);
 -    ret = qemu_co_queue_next(&tgm->throttled_reqs[is_write]);
 +    ret = qemu_co_queue_next(&tgm->throttled_reqs[direction]);
      qemu_co_mutex_unlock(&tgm->throttled_reqs_lock);
      return ret;
@@ -XXX,XX +XXX,XX @@ static bool coroutine_fn throttle_group_co_restart_queue(ThrottleGroupMember *tg
   * This assumes that tg->lock is held.
   *
   * @tgm:       the current ThrottleGroupMember
 - * @is_write:  the type of operation (read/write)
 + * @direction: the ThrottleDirection
   */
 -static void schedule_next_request(ThrottleGroupMember *tgm, bool is_write)
 +static void schedule_next_request(ThrottleGroupMember *tgm,
 +                                  ThrottleDirection direction)
  {
      ThrottleState *ts = tgm->throttle_state;
      ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
@@ -XXX,XX +XXX,XX @@ static void schedule_next_request(ThrottleGroupMember *tgm, bool is_write)
      ThrottleGroupMember *token;
      /* Check if there's any pending request to schedule next */
 -    token = next_throttle_token(tgm, is_write);
 -    if (!tgm_has_pending_reqs(token, is_write)) {
 +    token = next_throttle_token(tgm, direction);
 +    if (!tgm_has_pending_reqs(token, direction)) {
          return;
      }
      /* Set a timer for the request if it needs to be throttled */
 -    must_wait = throttle_group_schedule_timer(token, is_write);
 +    must_wait = throttle_group_schedule_timer(token, direction);
      /* If it doesn't have to wait, queue it for immediate execution */
      if (!must_wait) {
          /* Give preference to requests from the current tgm */
          if (qemu_in_coroutine() &&
 -            throttle_group_co_restart_queue(tgm, is_write)) {
 +            throttle_group_co_restart_queue(tgm, direction)) {
              token = tgm;
          } else {
              ThrottleTimers *tt = &token->throttle_timers;
              int64_t now = qemu_clock_get_ns(tg->clock_type);
 -            timer_mod(tt->timers[is_write], now);
 -            tg->any_timer_armed[is_write] = true;
 +            timer_mod(tt->timers[direction], now);
 +            tg->any_timer_armed[direction] = true;
          }
 -        tg->tokens[is_write] = token;
 +        tg->tokens[direction] = token;
      }
  }
@@ -XXX,XX +XXX,XX @@ static void schedule_next_request(ThrottleGroupMember *tgm, bool is_write)
   *
   * @tgm:       the current ThrottleGroupMember
   * @bytes:     the number of bytes for this I/O
 - * @is_write:  the type of operation (read/write)
 + * @direction: the ThrottleDirection
   */
  void coroutine_fn throttle_group_co_io_limits_intercept(ThrottleGroupMember *tgm,
                                                          int64_t bytes,
 -                                                        bool is_write)
 +                                                        ThrottleDirection direction)
  {
      bool must_wait;
      ThrottleGroupMember *token;
      ThrottleGroup *tg = container_of(tgm->throttle_state, ThrottleGroup, ts);
 -    ThrottleDirection direction = is_write ? THROTTLE_WRITE : THROTTLE_READ;
      assert(bytes >= 0);
 +    assert(direction < THROTTLE_MAX);
      qemu_mutex_lock(&tg->lock);
      /* First we check if this I/O has to be throttled. */
 -    token = next_throttle_token(tgm, is_write);
 -    must_wait = throttle_group_schedule_timer(token, is_write);
 +    token = next_throttle_token(tgm, direction);
 +    must_wait = throttle_group_schedule_timer(token, direction);
      /* Wait if there's a timer set or queued requests of this type */
 -    if (must_wait || tgm->pending_reqs[is_write]) {
 -        tgm->pending_reqs[is_write]++;
 +    if (must_wait || tgm->pending_reqs[direction]) {
 +        tgm->pending_reqs[direction]++;
          qemu_mutex_unlock(&tg->lock);
          qemu_co_mutex_lock(&tgm->throttled_reqs_lock);
 -        qemu_co_queue_wait(&tgm->throttled_reqs[is_write],
 +        qemu_co_queue_wait(&tgm->throttled_reqs[direction],
                             &tgm->throttled_reqs_lock);
          qemu_co_mutex_unlock(&tgm->throttled_reqs_lock);
          qemu_mutex_lock(&tg->lock);
 -        tgm->pending_reqs[is_write]--;
 +        tgm->pending_reqs[direction]--;
      }
      /* The I/O will be executed, so do the accounting */
      throttle_account(tgm->throttle_state, direction, bytes);
      /* Schedule the next request */
 -    schedule_next_request(tgm, is_write);
 +    schedule_next_request(tgm, direction);
      qemu_mutex_unlock(&tg->lock);
- ret:
+ }
-+    qapi_free_ThrottleLimits(argp);
-     error_propagate(errp, local_err);
+ typedef struct {
-     return;
+     ThrottleGroupMember *tgm;
 -    bool is_write;
 +    ThrottleDirection direction;
  } RestartData;
  static void coroutine_fn throttle_group_restart_queue_entry(void *opaque)
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn throttle_group_restart_queue_entry(void *opaque)
      ThrottleGroupMember *tgm = data->tgm;
      ThrottleState *ts = tgm->throttle_state;
      ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
 -    bool is_write = data->is_write;
 +    ThrottleDirection direction = data->direction;
      bool empty_queue;
 -    empty_queue = !throttle_group_co_restart_queue(tgm, is_write);
 +    empty_queue = !throttle_group_co_restart_queue(tgm, direction);
      /* If the request queue was empty then we have to take care of
       * scheduling the next one */
      if (empty_queue) {
          qemu_mutex_lock(&tg->lock);
 -        schedule_next_request(tgm, is_write);
 +        schedule_next_request(tgm, direction);
          qemu_mutex_unlock(&tg->lock);
      }
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn throttle_group_restart_queue_entry(void *opaque)
      aio_wait_kick();
  }
 -static void throttle_group_restart_queue(ThrottleGroupMember *tgm, bool is_write)
 +static void throttle_group_restart_queue(ThrottleGroupMember *tgm,
 +                                        ThrottleDirection direction)
  {
      Coroutine *co;
      RestartData *rd = g_new0(RestartData, 1);
      rd->tgm = tgm;
 -    rd->is_write = is_write;
 +    rd->direction = direction;
      /* This function is called when a timer is fired or when
       * throttle_group_restart_tgm() is called. Either way, there can
       * be no timer pending on this tgm at this point */
 -    assert(!timer_pending(tgm->throttle_timers.timers[is_write]));
 +    assert(!timer_pending(tgm->throttle_timers.timers[direction]));
      qatomic_inc(&tgm->restart_pending);
@@ -XXX,XX +XXX,XX @@ static void throttle_group_restart_queue(ThrottleGroupMember *tgm, bool is_write
  void throttle_group_restart_tgm(ThrottleGroupMember *tgm)
  {
 -    int i;
 +    ThrottleDirection dir;
      if (tgm->throttle_state) {
 -        for (i = 0; i < 2; i++) {
 -            QEMUTimer *t = tgm->throttle_timers.timers[i];
 +        for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
 +            QEMUTimer *t = tgm->throttle_timers.timers[dir];
              if (timer_pending(t)) {
                  /* If there's a pending timer on this tgm, fire it now */
                  timer_del(t);
 -                timer_cb(tgm, i);
 +                timer_cb(tgm, dir);
              } else {
                  /* Else run the next request from the queue manually */
 -                throttle_group_restart_queue(tgm, i);
 +                throttle_group_restart_queue(tgm, dir);
              }
          }
      }
@@ -XXX,XX +XXX,XX @@ void throttle_group_get_config(ThrottleGroupMember *tgm, ThrottleConfig *cfg)
   * because it had been throttled.
   *
   * @tgm:       the ThrottleGroupMember whose request had been throttled
 - * @is_write:  the type of operation (read/write)
 + * @direction: the ThrottleDirection
   */
 -static void timer_cb(ThrottleGroupMember *tgm, bool is_write)
 +static void timer_cb(ThrottleGroupMember *tgm, ThrottleDirection direction)
  {
      ThrottleState *ts = tgm->throttle_state;
      ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
      /* The timer has just been fired, so we can update the flag */
      qemu_mutex_lock(&tg->lock);
 -    tg->any_timer_armed[is_write] = false;
 +    tg->any_timer_armed[direction] = false;
      qemu_mutex_unlock(&tg->lock);
      /* Run the request that was waiting for this timer */
 -    throttle_group_restart_queue(tgm, is_write);
 +    throttle_group_restart_queue(tgm, direction);
  }
  static void read_timer_cb(void *opaque)
  {
 -    timer_cb(opaque, false);
 +    timer_cb(opaque, THROTTLE_READ);
  }
  static void write_timer_cb(void *opaque)
  {
 -    timer_cb(opaque, true);
 +    timer_cb(opaque, THROTTLE_WRITE);
  }
  /* Register a ThrottleGroupMember from the throttling group, also initializing
@@ -XXX,XX +XXX,XX @@ void throttle_group_register_tgm(ThrottleGroupMember *tgm,
                                   const char *groupname,
                                   AioContext *ctx)
  {
 -    int i;
 +    ThrottleDirection dir;
      ThrottleState *ts = throttle_group_incref(groupname);
      ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
@@ -XXX,XX +XXX,XX @@ void throttle_group_register_tgm(ThrottleGroupMember *tgm,
      QEMU_LOCK_GUARD(&tg->lock);
      /* If the ThrottleGroup is new set this ThrottleGroupMember as the token */
 -    for (i = 0; i < 2; i++) {
 -        if (!tg->tokens[i]) {
 -            tg->tokens[i] = tgm;
 +    for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
 +        if (!tg->tokens[dir]) {
 +            tg->tokens[dir] = tgm;
          }
 +        qemu_co_queue_init(&tgm->throttled_reqs[dir]);
      }
      QLIST_INSERT_HEAD(&tg->head, tgm, round_robin);
@@ -XXX,XX +XXX,XX @@ void throttle_group_register_tgm(ThrottleGroupMember *tgm,
                           write_timer_cb,
                           tgm);
      qemu_co_mutex_init(&tgm->throttled_reqs_lock);
 -    qemu_co_queue_init(&tgm->throttled_reqs[0]);
 -    qemu_co_queue_init(&tgm->throttled_reqs[1]);
  }
  /* Unregister a ThrottleGroupMember from its group, removing it from the list,
@@ -XXX,XX +XXX,XX @@ void throttle_group_unregister_tgm(ThrottleGroupMember *tgm)
      ThrottleState *ts = tgm->throttle_state;
      ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
      ThrottleGroupMember *token;
 -    int i;
 +    ThrottleDirection dir;
      if (!ts) {
          /* Discard already unregistered tgm */
@@ -XXX,XX +XXX,XX @@ void throttle_group_unregister_tgm(ThrottleGroupMember *tgm)
      AIO_WAIT_WHILE(tgm->aio_context, qatomic_read(&tgm->restart_pending) > 0);
      WITH_QEMU_LOCK_GUARD(&tg->lock) {
 -        for (i = 0; i < 2; i++) {
 -            assert(tgm->pending_reqs[i] == 0);
 -            assert(qemu_co_queue_empty(&tgm->throttled_reqs[i]));
 -            assert(!timer_pending(tgm->throttle_timers.timers[i]));
 -            if (tg->tokens[i] == tgm) {
 +        for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
 +            assert(tgm->pending_reqs[dir] == 0);
 +            assert(qemu_co_queue_empty(&tgm->throttled_reqs[dir]));
 +            assert(!timer_pending(tgm->throttle_timers.timers[dir]));
 +            if (tg->tokens[dir] == tgm) {
                  token = throttle_group_next_tgm(tgm);
                  /* Take care of the case where this is the last tgm in the group */
                  if (token == tgm) {
                      token = NULL;
                  }
 -                tg->tokens[i] = token;
 +                tg->tokens[dir] = token;
              }
          }
@@ -XXX,XX +XXX,XX @@ void throttle_group_detach_aio_context(ThrottleGroupMember *tgm)
  {
      ThrottleGroup *tg = container_of(tgm->throttle_state, ThrottleGroup, ts);
      ThrottleTimers *tt = &tgm->throttle_timers;
 -    int i;
 +    ThrottleDirection dir;
      /* Requests must have been drained */
 -    assert(tgm->pending_reqs[0] == 0 && tgm->pending_reqs[1] == 0);
 -    assert(qemu_co_queue_empty(&tgm->throttled_reqs[0]));
 -    assert(qemu_co_queue_empty(&tgm->throttled_reqs[1]));
 +    for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
 +        assert(tgm->pending_reqs[dir] == 0);
 +        assert(qemu_co_queue_empty(&tgm->throttled_reqs[dir]));
 +    }
      /* Kick off next ThrottleGroupMember, if necessary */
      WITH_QEMU_LOCK_GUARD(&tg->lock) {
 -        for (i = 0; i < 2; i++) {
 -            if (timer_pending(tt->timers[i])) {
 -                tg->any_timer_armed[i] = false;
 -                schedule_next_request(tgm, i);
 +        for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
 +            if (timer_pending(tt->timers[dir])) {
 +                tg->any_timer_armed[dir] = false;
 +                schedule_next_request(tgm, dir);
              }
          }
      }
 diff --git a/block/throttle.c b/block/throttle.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/throttle.c
 +++ b/block/throttle.c
@@ -XXX,XX +XXX,XX @@ throttle_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,
  {
      ThrottleGroupMember *tgm = bs->opaque;
 -    throttle_group_co_io_limits_intercept(tgm, bytes, false);
 +    throttle_group_co_io_limits_intercept(tgm, bytes, THROTTLE_READ);
      return bdrv_co_preadv(bs->file, offset, bytes, qiov, flags);
  }
@@ -XXX,XX +XXX,XX @@ throttle_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,
                      QEMUIOVector *qiov, BdrvRequestFlags flags)
  {
      ThrottleGroupMember *tgm = bs->opaque;
 -    throttle_group_co_io_limits_intercept(tgm, bytes, true);
 +    throttle_group_co_io_limits_intercept(tgm, bytes, THROTTLE_WRITE);
      return bdrv_co_pwritev(bs->file, offset, bytes, qiov, flags);
  }
@@ -XXX,XX +XXX,XX @@ throttle_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int64_t bytes,
                            BdrvRequestFlags flags)
  {
      ThrottleGroupMember *tgm = bs->opaque;
 -    throttle_group_co_io_limits_intercept(tgm, bytes, true);
 +    throttle_group_co_io_limits_intercept(tgm, bytes, THROTTLE_WRITE);
      return bdrv_co_pwrite_zeroes(bs->file, offset, bytes, flags);
  }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn GRAPH_RDLOCK
  throttle_co_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes)
  {
      ThrottleGroupMember *tgm = bs->opaque;
 -    throttle_group_co_io_limits_intercept(tgm, bytes, true);
 +    throttle_group_co_io_limits_intercept(tgm, bytes, THROTTLE_WRITE);
      return bdrv_co_pdiscard(bs->file, offset, bytes);
  }
 --
-.24.1
+.41.0

-[PULL 28/34] iotests: Disable data_file where it cannot be used
+[PULL 10/14] file-posix: Clear bs->bl.zoned on error
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+bs->bl.zoned is what indicates whether the zone information is present
-Message-id: 20191107163708.833192-22-mreitz@redhat.com
+and valid; it is the only thing that raw_refresh_zoned_limits() sets if
-[mreitz: Also disable 273]
+CONFIG_BLKZONED is not defined, and it is also the only thing that it
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+sets if CONFIG_BLKZONED is defined, but there are no zones.
 Make sure that it is always set to BLK_Z_NONE if there is an error
 anywhere in raw_refresh_zoned_limits() so that we do not accidentally
 announce zones while our information is incomplete or invalid.
 This also fixes a memory leak in the last error path in
 raw_refresh_zoned_limits().
 Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
 Message-Id: <20230824155345.109765-2-hreitz@redhat.com>
 Reviewed-by: Sam Li <faithilikerun@gmail.com>
 ---
- tests/qemu-iotests/007 | 5 +++--
+ block/file-posix.c | 21 ++++++++++++---------
- tests/qemu-iotests/014 | 2 ++
+file changed, 12 insertions(+), 9 deletions(-)
  tests/qemu-iotests/015 | 5 +++--
  tests/qemu-iotests/026 | 5 ++++-
  tests/qemu-iotests/029 | 5 +++--
  tests/qemu-iotests/031 | 6 +++---
  tests/qemu-iotests/036 | 5 +++--
  tests/qemu-iotests/039 | 3 +++
  tests/qemu-iotests/046 | 2 ++
  tests/qemu-iotests/048 | 2 ++
  tests/qemu-iotests/051 | 5 +++--
  tests/qemu-iotests/058 | 5 +++--
  tests/qemu-iotests/060 | 6 ++++--
  tests/qemu-iotests/061 | 6 ++++--
  tests/qemu-iotests/062 | 2 +-
  tests/qemu-iotests/066 | 4 +++-
  tests/qemu-iotests/067 | 6 ++++--
  tests/qemu-iotests/068 | 5 +++--
  tests/qemu-iotests/071 | 3 +++
  tests/qemu-iotests/073 | 4 ++++
  tests/qemu-iotests/074 | 2 ++
  tests/qemu-iotests/080 | 5 +++--
  tests/qemu-iotests/090 | 2 ++
  tests/qemu-iotests/098 | 6 ++++--
  tests/qemu-iotests/099 | 3 ++-
  tests/qemu-iotests/103 | 5 +++--
  tests/qemu-iotests/108 | 6 ++++--
  tests/qemu-iotests/112 | 5 +++--
  tests/qemu-iotests/114 | 2 ++
  tests/qemu-iotests/121 | 3 +++
  tests/qemu-iotests/138 | 3 +++
  tests/qemu-iotests/156 | 2 ++
  tests/qemu-iotests/176 | 7 +++++--
  tests/qemu-iotests/191 | 2 ++
  tests/qemu-iotests/201 | 6 +++---
  tests/qemu-iotests/214 | 3 ++-
  tests/qemu-iotests/217 | 3 ++-
  tests/qemu-iotests/220 | 5 +++--
  tests/qemu-iotests/243 | 6 ++++--
  tests/qemu-iotests/244 | 5 +++--
  tests/qemu-iotests/250 | 2 ++
  tests/qemu-iotests/261 | 3 ++-
  tests/qemu-iotests/267 | 5 +++--
  tests/qemu-iotests/273 | 3 +++
 files changed, 127 insertions(+), 53 deletions(-)
-diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
+diff --git a/block/file-posix.c b/block/file-posix.c
-index XXXXXXX..XXXXXXX 100755
+index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/007
+--- a/block/file-posix.c
-+++ b/tests/qemu-iotests/007
++++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
+@@ -XXX,XX +XXX,XX @@ static void raw_refresh_zoned_limits(BlockDriverState *bs, struct stat *st,
- _supported_fmt qcow2
+     BlockZoneModel zoned;
- _supported_proto generic
+     int ret;
- # refcount_bits must be at least 4 so we can create ten internal snapshots
--# (1 bit supports none, 2 bits support two, 4 bits support 14)
+-    bs->bl.zoned = BLK_Z_NONE;
--_unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]'
+-
-+# (1 bit supports none, 2 bits support two, 4 bits support 14);
+     ret = get_sysfs_zoned_model(st, &zoned);
-+# snapshot are generally impossible with external data files
+     if (ret < 0 || zoned == BLK_Z_NONE) {
-+_unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]' data_file
+-        return;
++        goto no_zoned;
- echo
+     }
- echo "creating image"
+     bs->bl.zoned = zoned;
-diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014
-index XXXXXXX..XXXXXXX 100755
+@@ -XXX,XX +XXX,XX @@ static void raw_refresh_zoned_limits(BlockDriverState *bs, struct stat *st,
---- a/tests/qemu-iotests/014
+     if (ret < 0) {
-+++ b/tests/qemu-iotests/014
+         error_setg_errno(errp, -ret, "Unable to read chunk_sectors "
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
+                                      "sysfs attribute");
- _supported_fmt qcow2
+-        return;
- _supported_proto file
++        goto no_zoned;
- _supported_os Linux
+     } else if (!ret) {
-+# Compression and snapshots do not work with external data files
+         error_setg(errp, "Read 0 from chunk_sectors sysfs attribute");
-+_unsupported_imgopts data_file
+-        return;
++        goto no_zoned;
- TEST_OFFSETS="0 4294967296"
+     }
- TEST_OPS="writev read write readv"
+     bs->bl.zone_size = ret << BDRV_SECTOR_BITS;
-diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
-index XXXXXXX..XXXXXXX 100755
+@@ -XXX,XX +XXX,XX @@ static void raw_refresh_zoned_limits(BlockDriverState *bs, struct stat *st,
---- a/tests/qemu-iotests/015
+     if (ret < 0) {
-+++ b/tests/qemu-iotests/015
+         error_setg_errno(errp, -ret, "Unable to read nr_zones "
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
+                                      "sysfs attribute");
- # actually any format that supports snapshots
+-        return;
- _supported_fmt qcow2
++        goto no_zoned;
- _supported_proto generic
+     } else if (!ret) {
--# Internal snapshots are (currently) impossible with refcount_bits=1
+         error_setg(errp, "Read 0 from nr_zones sysfs attribute");
--_unsupported_imgopts 'refcount_bits=1[^0-9]'
+-        return;
-+# Internal snapshots are (currently) impossible with refcount_bits=1,
++        goto no_zoned;
-+# and generally impossible with external data files
+     }
-+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
+     bs->bl.nr_zones = ret;
- echo
+@@ -XXX,XX +XXX,XX @@ static void raw_refresh_zoned_limits(BlockDriverState *bs, struct stat *st,
- echo "creating image"
+     ret = get_zones_wp(bs, s->fd, 0, bs->bl.nr_zones, 0);
-diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
+     if (ret < 0) {
-index XXXXXXX..XXXXXXX 100755
+         error_setg_errno(errp, -ret, "report wps failed");
---- a/tests/qemu-iotests/026
+-        bs->wps = NULL;
-+++ b/tests/qemu-iotests/026
+-        return;
-@@ -XXX,XX +XXX,XX @@ _supported_cache_modes writethrough none
++        goto no_zoned;
- # 32 and 64 bits do not work either, however, due to different leaked cluster
+     }
- # count on error.
+     qemu_co_mutex_init(&bs->wps->colock);
- # Thus, the only remaining option is refcount_bits=16.
++    return;
--_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
++
-+#
++no_zoned:
-+# As for data_file, none of the refcount tests can work for it.
++    bs->bl.zoned = BLK_Z_NONE;
-+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' \
++    g_free(bs->wps);
-+    data_file
++    bs->wps = NULL;
+ }
- echo "Errors while writing 128 kB"
+ #else /* !defined(CONFIG_BLKZONED) */
- echo
+ static void raw_refresh_zoned_limits(BlockDriverState *bs, struct stat *st,
 diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/029
 +++ b/tests/qemu-iotests/029
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto generic
  _unsupported_proto vxhs
 -# Internal snapshots are (currently) impossible with refcount_bits=1
 -_unsupported_imgopts 'refcount_bits=1[^0-9]'
 +# Internal snapshots are (currently) impossible with refcount_bits=1,
 +# and generally impossible with external data files
 +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
  offset_size=24
  offset_l1_size=36
 diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/031
 +++ b/tests/qemu-iotests/031
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  # This tests qcow2-specific low-level functionality
  _supported_fmt qcow2
  _supported_proto file
 -# We want to test compat=0.10, which does not support refcount widths
 -# other than 16
 -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
 +# 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]\|$\)\)'
  CLUSTER_SIZE=65536
 diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/036
 +++ b/tests/qemu-iotests/036
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  # This tests qcow2-specific low-level functionality
  _supported_fmt qcow2
  _supported_proto file
 -# Only qcow2v3 and later supports feature bits
 -_unsupported_imgopts 'compat=0.10'
 +# Only qcow2v3 and later supports feature bits;
 +# qcow2.py does not support external data files
 +_unsupported_imgopts 'compat=0.10' data_file
  echo
  echo === Image with unknown incompatible feature bit ===
 diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/039
 +++ b/tests/qemu-iotests/039
@@ -XXX,XX +XXX,XX @@ _supported_proto file
  _supported_os Linux
  _default_cache_mode writethrough
  _supported_cache_modes writethrough
 +# Some of these test cases expect no external data file so that all
 +# clusters are part of the qcow2 image and refcounted
 +_unsupported_imgopts data_file
  size=128M
 diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/046
 +++ b/tests/qemu-iotests/046
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
 +# data_file does not support compressed clusters
 +_unsupported_imgopts data_file
  CLUSTER_SIZE=64k
  size=128M
 diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/048
 +++ b/tests/qemu-iotests/048
@@ -XXX,XX +XXX,XX @@ _compare()
  _supported_fmt raw qcow2 qed luks
  _supported_proto file
  _supported_os Linux
 +# Using 'cp' is incompatible with external data files
 +_unsupported_imgopts data_file
  # Remove once all tests are fixed to use TEST_IMG_FILE
  # correctly and common.rc sets it unconditionally
 diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/051
 +++ b/tests/qemu-iotests/051
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _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
 -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
 +# other than refcount_bits=16;
 +# it also will not support an external data file
 +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
  _require_drivers nbd
  do_run_qemu()
 diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/058
 +++ b/tests/qemu-iotests/058
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
  _require_command QEMU_NBD
 -# Internal snapshots are (currently) impossible with refcount_bits=1
 -_unsupported_imgopts 'refcount_bits=1[^0-9]'
 +# Internal snapshots are (currently) impossible with refcount_bits=1,
 +# and generally impossible with external data files
 +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
  nbd_snapshot_img="nbd:unix:$nbd_unix_socket"
 diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/060
 +++ b/tests/qemu-iotests/060
@@ -XXX,XX +XXX,XX @@ _filter_io_error()
  _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
 -# These tests only work for compat=1.1 images with refcount_bits=16
 -_unsupported_imgopts 'compat=0.10' 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
 +# These tests only work for compat=1.1 images without an external
 +# data file with refcount_bits=16
 +_unsupported_imgopts 'compat=0.10' data_file \
 +    'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
  # The repair process will create a large file - so check for availability first
  _require_large_file 64G
 diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/061
 +++ b/tests/qemu-iotests/061
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
  # Conversion between different compat versions can only really work
 -# with refcount_bits=16
 -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
 +# with refcount_bits=16;
 +# we have explicit tests for data_file here, but the whole test does
 +# not work with it
 +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
  echo
  echo "=== Testing version downgrade with zero expansion ==="
 diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/062
 +++ b/tests/qemu-iotests/062
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto generic
  # We need zero clusters and snapshots
 -_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
 +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
  IMG_SIZE=64M
 diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/066
 +++ b/tests/qemu-iotests/066
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto generic
  # We need zero clusters and snapshots
 -_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
 +# (TODO: Consider splitting the snapshot part into a separate test
 +#        file, so this one runs with refcount_bits=1 and data_file)
 +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
  # Intentionally create an unaligned image
  IMG_SIZE=$((64 * 1024 * 1024 + 512))
 diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/067
 +++ b/tests/qemu-iotests/067
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _supported_fmt qcow2
  _supported_proto file
 -# Because anything other than 16 would change the output of query-block
 -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
 +# Because anything other than 16 would change the output of query-block,
 +# and external data files would change the output of
 +# query-named-block-nodes
 +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
  do_run_qemu()
  {
 diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/068
 +++ b/tests/qemu-iotests/068
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  # This tests qcow2-specific low-level functionality
  _supported_fmt qcow2
  _supported_proto generic
 -# Internal snapshots are (currently) impossible with refcount_bits=1
 -_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
 +# Internal snapshots are (currently) impossible with refcount_bits=1,
 +# and generally impossible with external data files
 +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
  IMG_SIZE=128K
 diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/071
 +++ b/tests/qemu-iotests/071
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
  _require_drivers blkdebug blkverify
 +# blkdebug can only inject errors on bs->file, not on the data_file,
 +# so thie test does not work with external data files
 +_unsupported_imgopts data_file
  do_run_qemu()
  {
 diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/073
 +++ b/tests/qemu-iotests/073
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto generic
  _unsupported_proto vxhs
 +# External data files do not support compressed clusters
 +# (TODO: Consider writing a version for external data files that does
 +#        not test compressed clusters)
 +_unsupported_imgopts data_file
  CLUSTER_SIZE=64k
  size=128M
 diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/074
 +++ b/tests/qemu-iotests/074
@@ -XXX,XX +XXX,XX @@ _compare()
  _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
 +# blkdebug can only inject errors on bs->file
 +_unsupported_imgopts data_file
  # Setup test basic parameters
  TEST_IMG2=$TEST_IMG.2
 diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/080
 +++ b/tests/qemu-iotests/080
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
 -# - Internal snapshots are (currently) impossible with refcount_bits=1
 +# - Internal snapshots are (currently) impossible with refcount_bits=1,
 +#   and generally impossible with external data files
  # - This is generally a test for compat=1.1 images
 -_unsupported_imgopts 'refcount_bits=1[^0-9]' 'compat=0.10'
 +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file 'compat=0.10'
  header_size=104
 diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/090
 +++ b/tests/qemu-iotests/090
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file nfs
 +# External data files do not support compressed clusters
 +_unsupported_imgopts data_file
  IMG_SIZE=128K
 diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/098
 +++ b/tests/qemu-iotests/098
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
 -# The code path we want to test here only works for compat=1.1 images
 -_unsupported_imgopts 'compat=0.10'
 +# The code path we want to test here only works for compat=1.1 images;
 +# blkdebug can only inject errors on bs->file, so external data files
 +# do not work with this test
 +_unsupported_imgopts 'compat=0.10' data_file
  for event in l1_update empty_image_prepare reftable_update refblock_alloc; do
 diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/099
 +++ b/tests/qemu-iotests/099
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 qed vdi vhdx vmdk vpc
  _supported_proto file
  _supported_os Linux
  _require_drivers blkdebug blkverify
 +# data_file would change the json:{} filenames
  _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
 -    "subformat=twoGbMaxExtentSparse"
 +    "subformat=twoGbMaxExtentSparse" data_file
  do_run_qemu()
  {
 diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/103
 +++ b/tests/qemu-iotests/103
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file nfs
 -# Internal snapshots are (currently) impossible with refcount_bits=1
 -_unsupported_imgopts 'refcount_bits=1[^0-9]'
 +# Internal snapshots are (currently) impossible with refcount_bits=1,
 +# and generally impossible with external data files
 +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
  IMG_SIZE=64K
 diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/108
 +++ b/tests/qemu-iotests/108
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
 -# This test directly modifies a refblock so it relies on refcount_bits being 16
 -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
 +# This test directly modifies a refblock so it relies on refcount_bits being 16;
 +# and the low-level modification it performs are not tuned for external data
 +# files
 +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
  echo
  echo '=== Repairing an image without any refcount table ==='
 diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/112
 +++ b/tests/qemu-iotests/112
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
  # This test will set refcount_bits on its own which would conflict with the
 -# manual setting; compat will be overridden as well
 -_unsupported_imgopts refcount_bits 'compat=0.10'
 +# 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
  print_refcount_bits()
  {
 diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/114
 +++ b/tests/qemu-iotests/114
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto generic
  _unsupported_proto vxhs
 +# qcow2.py does not work too well with external data files
 +_unsupported_imgopts data_file
  TEST_IMG="$TEST_IMG.base" _make_test_img 64M
 diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/121
 +++ b/tests/qemu-iotests/121
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
 +# Refcount structures are used much differently with external data
 +# files
 +_unsupported_imgopts data_file
  echo
  echo '=== New refcount structures may not conflict with existing structures ==='
 diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/138
 +++ b/tests/qemu-iotests/138
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
 +# With an external data file, data clusters are not refcounted
 +# (and so qemu-img check does not check their refcount)
 +_unsupported_imgopts data_file
  echo
  echo '=== Check on an image with a multiple of 2^32 clusters ==='
 diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/156
 +++ b/tests/qemu-iotests/156
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2 qed
  _supported_proto generic
  _unsupported_proto vxhs
 +# Copying files around with cp does not work with external data files
 +_unsupported_imgopts data_file
  # Create source disk
  TEST_IMG="$TEST_IMG.backing" _make_test_img 1M
 diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/176
 +++ b/tests/qemu-iotests/176
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
 -# Persistent dirty bitmaps require compat=1.1
 -_unsupported_imgopts 'compat=0.10'
 +# Persistent dirty bitmaps require compat=1.1;
 +# Internal snapshots forbid using an external data file
 +# (they work with refcount_bits=1 here, though, because there actually
 +# is no data when creating the snapshot)
 +_unsupported_imgopts 'compat=0.10' data_file
  run_qemu()
  {
 diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/191
 +++ b/tests/qemu-iotests/191
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
 +# An external data file would change the query-named-block-nodes output
 +_unsupported_imgopts data_file
  size=64M
 diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/201
 +++ b/tests/qemu-iotests/201
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
  _supported_proto generic
  _supported_os Linux
 -# Internal snapshots are (currently) impossible with refcount_bits=1
 -# This was taken from test 080
 -_unsupported_imgopts 'refcount_bits=1[^0-9]'
 +# Internal snapshots are (currently) impossible with refcount_bits=1,
 +# and generally impossible with external data files
 +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
  size=64M
  _make_test_img $size
 diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/214
 +++ b/tests/qemu-iotests/214
@@ -XXX,XX +XXX,XX @@ _supported_proto file
  # Repairing the corrupted image requires qemu-img check to store a
  # refcount up to 3, which requires at least two refcount bits.
 -_unsupported_imgopts 'refcount_bits=1[^0-9]'
 +# External data files do not support compressed clusters.
 +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
  echo
 diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/217
 +++ b/tests/qemu-iotests/217
@@ -XXX,XX +XXX,XX @@ _supported_proto file
  # This test needs clusters with at least a refcount of 2 so that
  # OFLAG_COPIED is not set.  refcount_bits=1 is therefore unsupported.
 -_unsupported_imgopts 'refcount_bits=1[^0-9]'
 +# (As are external data files.)
 +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
  echo
  echo '=== Simulating an I/O error during snapshot deletion ==='
 diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/220
 +++ b/tests/qemu-iotests/220
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
 -# To use a different refcount width but 16 bits we need compat=1.1
 -_unsupported_imgopts 'compat=0.10'
 +# To use a different refcount width but 16 bits we need compat=1.1,
 +# and external data files do not support compressed clusters.
 +_unsupported_imgopts 'compat=0.10' data_file
  echo "== Creating huge file =="
 diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/243
 +++ b/tests/qemu-iotests/243
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
 -# External data files do not work with compat=0.10
 -_unsupported_imgopts 'compat=0.10'
 +# External data files do not work with compat=0.10, and because there
 +# is an explicit case for external data files here, we cannot allow
 +# the user to specify whether to use one
 +_unsupported_imgopts 'compat=0.10' data_file
  for mode in off metadata falloc full; do
 diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/244
 +++ b/tests/qemu-iotests/244
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
 -# External data files do not work with compat=0.10
 -_unsupported_imgopts 'compat=0.10'
 +# External data files do not work with compat=0.10, and because we use
 +# our own external data file, we cannot let the user specify one
 +_unsupported_imgopts 'compat=0.10' data_file
  echo
  echo "=== Create and open image with external data file ==="
 diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/250
 +++ b/tests/qemu-iotests/250
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
 +# This test does not make much sense with external data files
 +_unsupported_imgopts data_file
  # This test checks that qcow2_process_discards does not truncate a discard
  # request > 2G.
 diff --git a/tests/qemu-iotests/261 b/tests/qemu-iotests/261
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/261
 +++ b/tests/qemu-iotests/261
@@ -XXX,XX +XXX,XX @@ _supported_os Linux
  # (1) We create a v2 image that supports nothing but refcount_bits=16
  # (2) We do some refcount management on our own which expects
  #     refcount_bits=16
 -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
 +# As for data files, they do not support snapshots at all.
 +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
  # Parameters:
  #   $1: image filename
 diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/267
 +++ b/tests/qemu-iotests/267
@@ -XXX,XX +XXX,XX @@ _supported_proto file
  _supported_os Linux
  _require_drivers copy-on-read
 -# Internal snapshots are (currently) impossible with refcount_bits=1
 -_unsupported_imgopts 'refcount_bits=1[^0-9]'
 +# Internal snapshots are (currently) impossible with refcount_bits=1,
 +# and generally impossible with external data files
 +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
  do_run_qemu()
  {
 diff --git a/tests/qemu-iotests/273 b/tests/qemu-iotests/273
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/273
 +++ b/tests/qemu-iotests/273
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto file
  _supported_os Linux
 +# External data files would add nodes to the block graph, so it would
 +# not match the reference output
 +_unsupported_imgopts data_file
  do_run_qemu()
  {
 --
-.24.1
+.41.0

-[PULL 02/34] block: Use bdrv_qapi_perm_to_blk_perm()
+[PULL 11/14] file-posix: Check bs->bl.zoned for zone info
-We can save some LoC in xdbg_graph_add_edge() by using
+Instead of checking bs->wps or bs->bl.zone_size for whether zone
-bdrv_qapi_perm_to_blk_perm().
+information is present, check bs->bl.zoned.  That is the flag that
 raw_refresh_zoned_limits() reliably sets to indicate zone support.  If
 it is set to something other than BLK_Z_NONE, other values and objects
 like bs->wps and bs->bl.zone_size must be non-null/zero and valid; if it
 is not, we cannot rely on their validity.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
-Message-id: 20191108123455.39445-3-mreitz@redhat.com
+Message-Id: <20230824155345.109765-3-hreitz@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Reviewed-by: Sam Li <faithilikerun@gmail.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
- block.c | 29 ++++++++---------------------
+ block/file-posix.c | 12 +++++++-----
-file changed, 8 insertions(+), 21 deletions(-)
+file changed, 7 insertions(+), 5 deletions(-)
-diff --git a/block.c b/block.c
+diff --git a/block/file-posix.c b/block/file-posix.c
 index XXXXXXX..XXXXXXX 100644
---- a/block.c
+--- a/block/file-posix.c
-+++ b/block.c
++++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ static void xdbg_graph_add_node(XDbgBlockGraphConstructor *gr, void *node,
+@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_prw(BlockDriverState *bs, uint64_t offset,
- static void xdbg_graph_add_edge(XDbgBlockGraphConstructor *gr, void *parent,
+     if (fd_open(bs) < 0)
-                                 const BdrvChild *child)
+         return -EIO;
  #if defined(CONFIG_BLKZONED)
 -    if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) && bs->wps) {
 +    if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
 +        bs->bl.zoned != BLK_Z_NONE) {
          qemu_co_mutex_lock(&bs->wps->colock);
 -        if (type & QEMU_AIO_ZONE_APPEND && bs->bl.zone_size) {
 +        if (type & QEMU_AIO_ZONE_APPEND) {
              int index = offset / bs->bl.zone_size;
              offset = bs->wps->wp[index];
          }
@@ -XXX,XX +XXX,XX @@ out:
  {
--    typedef struct {
+     BlockZoneWps *wps = bs->wps;
--        unsigned int flag;
+     if (ret == 0) {
--        BlockPermission num;
+-        if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND))
--    } PermissionMap;
+-            && wps && bs->bl.zone_size) {
--
++        if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
--    static const PermissionMap permissions[] = {
++            bs->bl.zoned != BLK_Z_NONE) {
--        { BLK_PERM_CONSISTENT_READ, BLOCK_PERMISSION_CONSISTENT_READ },
+             uint64_t *wp = &wps->wp[offset / bs->bl.zone_size];
--        { BLK_PERM_WRITE,           BLOCK_PERMISSION_WRITE },
+             if (!BDRV_ZT_IS_CONV(*wp)) {
--        { BLK_PERM_WRITE_UNCHANGED, BLOCK_PERMISSION_WRITE_UNCHANGED },
+                 if (type & QEMU_AIO_ZONE_APPEND) {
--        { BLK_PERM_RESIZE,          BLOCK_PERMISSION_RESIZE },
+@@ -XXX,XX +XXX,XX @@ out:
 -        { BLK_PERM_GRAPH_MOD,       BLOCK_PERMISSION_GRAPH_MOD },
 -        { 0, 0 }
 -    };
 -    const PermissionMap *p;
 +    BlockPermission qapi_perm;
      XDbgBlockGraphEdge *edge;
 -    QEMU_BUILD_BUG_ON(1UL << (ARRAY_SIZE(permissions) - 1) != BLK_PERM_ALL + 1);
 -
      edge = g_new0(XDbgBlockGraphEdge, 1);
      edge->parent = xdbg_graph_node_num(gr, parent);
      edge->child = xdbg_graph_node_num(gr, child->bs);
      edge->name = g_strdup(child->name);
 -    for (p = permissions; p->flag; p++) {
 -        if (p->flag & child->perm) {
 -            QAPI_LIST_ADD(edge->perm, p->num);
 +    for (qapi_perm = 0; qapi_perm < BLOCK_PERMISSION__MAX; qapi_perm++) {
 +        uint64_t flag = bdrv_qapi_perm_to_blk_perm(qapi_perm);
 +
 +        if (flag & child->perm) {
 +            QAPI_LIST_ADD(edge->perm, qapi_perm);
          }
 -        if (p->flag & child->shared_perm) {
 -            QAPI_LIST_ADD(edge->shared_perm, p->num);
 +        if (flag & child->shared_perm) {
 +            QAPI_LIST_ADD(edge->shared_perm, qapi_perm);
          }
      }
+-    if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) && wps) {
++    if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
++        bs->blk.zoned != BLK_Z_NONE) {
+         qemu_co_mutex_unlock(&wps->colock);
+     }
+ }
 --
-.24.1
+.41.0

-[PULL 04/34] iotests: Add @error to wait_until_completed
+Deleted patch
-Callers can use this new parameter to expect failure during the
-completion process.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20191108123455.39445-5-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/iotests.py | 18 ++++++++++++------
-file changed, 12 insertions(+), 6 deletions(-)
-diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/iotests.py
-+++ b/tests/qemu-iotests/iotests.py
-@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):
-         self.assert_no_active_block_jobs()
-         return result
--    def wait_until_completed(self, drive='drive0', check_offset=True, wait=60.0):
-+    def wait_until_completed(self, drive='drive0', check_offset=True, wait=60.0,
-+                             error=None):
-         '''Wait for a block job to finish, returning the event'''
-         while True:
-             for event in self.vm.get_qmp_events(wait=wait):
-                 if event['event'] == 'BLOCK_JOB_COMPLETED':
-                     self.assert_qmp(event, 'data/device', drive)
--                    self.assert_qmp_absent(event, 'data/error')
--                    if check_offset:
--                        self.assert_qmp(event, 'data/offset', event['data']['len'])
-+                    if error is None:
-+                        self.assert_qmp_absent(event, 'data/error')
-+                        if check_offset:
-+                            self.assert_qmp(event, 'data/offset',
-+                                            event['data']['len'])
-+                    else:
-+                        self.assert_qmp(event, 'data/error', error)
-                     self.assert_no_active_block_jobs()
-                     return event
-                 elif event['event'] == 'JOB_STATUS_CHANGE':
-@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):
-         self.assert_qmp(event, 'data/type', 'mirror')
-         self.assert_qmp(event, 'data/offset', event['data']['len'])
--    def complete_and_wait(self, drive='drive0', wait_ready=True):
-+    def complete_and_wait(self, drive='drive0', wait_ready=True,
-+                          completion_error=None):
-         '''Complete a block job and wait for it to finish'''
-         if wait_ready:
-             self.wait_ready(drive=drive)
-@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):
-         result = self.vm.qmp('block-job-complete', device=drive)
-         self.assert_qmp(result, 'return', {})
--        event = self.wait_until_completed(drive=drive)
-+        event = self.wait_until_completed(drive=drive, error=completion_error)
-         self.assert_qmp(event, 'data/type', 'mirror')
-     def pause_wait(self, job_id='job0'):
---
-.24.1

-[PULL 05/34] iotests: Add test for failing mirror complete
+Deleted patch
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Tested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Message-id: 20191108123455.39445-6-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/041     | 44 ++++++++++++++++++++++++++++++++++++++
- tests/qemu-iotests/041.out |  4 ++--
-files changed, 46 insertions(+), 2 deletions(-)
-diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/041
-+++ b/tests/qemu-iotests/041
-@@ -XXX,XX +XXX,XX @@ class TestOrphanedSource(iotests.QMPTestCase):
-                              target='dest-ro')
-         self.assert_qmp(result, 'error/class', 'GenericError')
-+    def test_failing_permission_in_complete(self):
-+        self.assert_no_active_block_jobs()
-+
-+        # Unshare consistent-read on the target
-+        # (The mirror job does not care)
-+        result = self.vm.qmp('blockdev-add',
-+                             driver='blkdebug',
-+                             node_name='dest-perm',
-+                             image='dest',
-+                             unshare_child_perms=['consistent-read'])
-+        self.assert_qmp(result, 'return', {})
-+
-+        result = self.vm.qmp('blockdev-mirror', job_id='job', device='src',
-+                             sync='full', target='dest',
-+                             filter_node_name='mirror-filter')
-+        self.assert_qmp(result, 'return', {})
-+
-+        # Require consistent-read on the source
-+        # (We can only add this node once the job has started, or it
-+        # will complain that it does not want to run on non-root nodes)
-+        result = self.vm.qmp('blockdev-add',
-+                             driver='blkdebug',
-+                             node_name='src-perm',
-+                             image='src',
-+                             take_child_perms=['consistent-read'])
-+        self.assert_qmp(result, 'return', {})
-+
-+        # While completing, mirror will attempt to replace src by
-+        # dest, which must fail because src-perm requires
-+        # consistent-read but dest-perm does not share it; thus
-+        # aborting the job when it is supposed to complete
-+        self.complete_and_wait('job',
-+                               completion_error='Operation not permitted')
-+
-+        # Assert that all of our nodes are still there (except for the
-+        # mirror filter, which should be gone despite the failure)
-+        nodes = self.vm.qmp('query-named-block-nodes')['return']
-+        nodes = [node['node-name'] for node in nodes]
-+
-+        for expect in ('src', 'src-perm', 'dest', 'dest-perm'):
-+            self.assertTrue(expect in nodes, '%s disappeared' % expect)
-+        self.assertFalse('mirror-filter' in nodes,
-+                         'Mirror filter node did not disappear')
-+
- if __name__ == '__main__':
-     iotests.main(supported_fmts=['qcow2', 'qed'],
-                  supported_protocols=['file'])
-diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/041.out
-+++ b/tests/qemu-iotests/041.out
-@@ -XXX,XX +XXX,XX @@
--..........................................................................................
-+...........................................................................................
- ----------------------------------------------------------------------
--Ran 90 tests
-+Ran 91 tests
- OK
---
-.24.1

-[PULL 08/34] iotests: s/qocw2/qcow2/
+Deleted patch
-Probably due to blind copy-pasting, we have several instances of "qocw2"
-in our iotests.  Fix them.
-Reported-by: Maxim Levitsky <mlevitsk@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20191107163708.833192-2-mreitz@redhat.com
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/060 | 2 +-
- tests/qemu-iotests/061 | 2 +-
- tests/qemu-iotests/062 | 2 +-
- tests/qemu-iotests/066 | 2 +-
- tests/qemu-iotests/068 | 2 +-
- tests/qemu-iotests/108 | 2 +-
- tests/qemu-iotests/138 | 2 +-
- tests/qemu-iotests/261 | 2 +-
-files changed, 8 insertions(+), 8 deletions(-)
-diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/060
-+++ b/tests/qemu-iotests/060
-@@ -XXX,XX +XXX,XX @@ _filter_io_error()
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/061
-+++ b/tests/qemu-iotests/061
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/062
-+++ b/tests/qemu-iotests/062
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto generic
-diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/066
-+++ b/tests/qemu-iotests/066
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto generic
-diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/068
-+++ b/tests/qemu-iotests/068
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto generic
-diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/108
-+++ b/tests/qemu-iotests/108
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/138
-+++ b/tests/qemu-iotests/138
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-diff --git a/tests/qemu-iotests/261 b/tests/qemu-iotests/261
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/261
-+++ b/tests/qemu-iotests/261
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- . ./common.rc
- . ./common.filter
--# This tests qocw2-specific low-level functionality
-+# This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
---
-.24.1

-[PULL 09/34] iotests/qcow2.py: Add dump-header-exts
+Deleted patch
-This is useful for tests that want to whitelist fields from dump-header
-(with grep) but still print all header extensions.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-3-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/qcow2.py | 5 +++++
-file changed, 5 insertions(+)
-diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/qcow2.py
-+++ b/tests/qemu-iotests/qcow2.py
-@@ -XXX,XX +XXX,XX @@ def cmd_dump_header(fd):
-     h.dump()
-     h.dump_extensions()
-+def cmd_dump_header_exts(fd):
-+    h = QcowHeader(fd)
-+    h.dump_extensions()
-+
- def cmd_set_header(fd, name, value):
-     try:
-         value = int(value, 0)
-@@ -XXX,XX +XXX,XX @@ def cmd_set_feature_bit(fd, group, bit):
- cmds = [
-     [ 'dump-header',          cmd_dump_header,          0, 'Dump image header and header extensions' ],
-+    [ 'dump-header-exts',     cmd_dump_header_exts,     0, 'Dump image header extensions' ],
-     [ 'set-header',           cmd_set_header,           2, 'Set a field in the header'],
-     [ 'add-header-ext',       cmd_add_header_ext,       2, 'Add a header extension' ],
-     [ 'add-header-ext-stdio', cmd_add_header_ext_stdio, 1, 'Add a header extension, data from stdin' ],
---
-.24.1

-[PULL 10/34] iotests/qcow2.py: Split feature fields into bits
+Deleted patch
-Print the feature fields as a set of bits so that filtering is easier.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-4-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/031.out  | 36 +++++++++----------
- tests/qemu-iotests/036.out  | 18 +++++-----
- tests/qemu-iotests/039.out  | 22 ++++++------
- tests/qemu-iotests/060.out  | 20 +++++------
- tests/qemu-iotests/061.out  | 72 ++++++++++++++++++-------------------
- tests/qemu-iotests/137.out  |  2 +-
- tests/qemu-iotests/qcow2.py | 18 +++++++---
-files changed, 99 insertions(+), 89 deletions(-)
-diff --git a/tests/qemu-iotests/031.out b/tests/qemu-iotests/031.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/031.out
-+++ b/tests/qemu-iotests/031.out
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             104
-diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/036.out
-+++ b/tests/qemu-iotests/036.out
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x8000000000000000
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     [63]
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x8000000000000000
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        [63]
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             104
-diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/039.out
-+++ b/tests/qemu-iotests/039.out
-@@ -XXX,XX +XXX,XX @@ QA output created by 039
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--incompatible_features     0x0
-+incompatible_features     []
- No errors were found on the image.
- == Creating a dirty image file ==
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     0x1
-+incompatible_features     [0]
- ERROR cluster 5 refcount=0 reference=1
- ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
-@@ -XXX,XX +XXX,XX @@ Data may be corrupted, or further writes to the image may corrupt it.
- == Read-only access must still work ==
- read 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--incompatible_features     0x1
-+incompatible_features     [0]
- == Repairing the image file must succeed ==
- ERROR cluster 5 refcount=0 reference=1
-@@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired:
- Double checking the fixed image now...
- No errors were found on the image.
--incompatible_features     0x0
-+incompatible_features     []
- == Data should still be accessible after repair ==
- read 512/512 bytes at offset 0
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     0x1
-+incompatible_features     [0]
- ERROR cluster 5 refcount=0 reference=1
- Rebuilding refcount structure
- Repairing cluster 1 refcount=1 reference=0
- Repairing cluster 2 refcount=1 reference=0
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--incompatible_features     0x0
-+incompatible_features     []
- == Creating an image file with lazy_refcounts=off ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     0x0
-+incompatible_features     []
- No errors were found on the image.
- == Committing to a backing file with lazy_refcounts=on ==
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- Image committed.
--incompatible_features     0x0
--incompatible_features     0x0
-+incompatible_features     []
-+incompatible_features     []
- No errors were found on the image.
- No errors were found on the image.
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     0x1
-+incompatible_features     [0]
- ERROR cluster 5 refcount=0 reference=1
- ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     0x0
-+incompatible_features     []
- No errors were found on the image.
- *** done
-diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/060.out
-+++ b/tests/qemu-iotests/060.out
-@@ -XXX,XX +XXX,XX @@ ERROR cluster 3 refcount=1 reference=3
-errors were found on the image.
- Data may be corrupted, or further writes to the image may corrupt it.
--incompatible_features     0x0
-+incompatible_features     []
- qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with active L1 table); further corruption events will be suppressed
- write failed: Input/output error
--incompatible_features     0x2
-+incompatible_features     [1]
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
- virtual size: 64 MiB (67108864 bytes)
-@@ -XXX,XX +XXX,XX @@ ERROR cluster 2 refcount=1 reference=2
-errors were found on the image.
- Data may be corrupted, or further writes to the image may corrupt it.
--incompatible_features     0x0
-+incompatible_features     []
- qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with refcount block); further corruption events will be suppressed
- write failed: Input/output error
--incompatible_features     0x2
-+incompatible_features     [1]
- ERROR refcount block 0 refcount=2
- ERROR cluster 2 refcount=1 reference=2
- Rebuilding refcount structure
-@@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired:
- Double checking the fixed image now...
- No errors were found on the image.
--incompatible_features     0x0
-+incompatible_features     []
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--incompatible_features     0x0
-+incompatible_features     []
- === Testing cluster data reference into inactive L2 table ===
-@@ -XXX,XX +XXX,XX @@ Data may be corrupted, or further writes to the image may corrupt it.
-leaked clusters were found on the image.
- This means waste of disk space, but no harm to data.
--incompatible_features     0x0
-+incompatible_features     []
- qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with inactive L2 table); further corruption events will be suppressed
- write failed: Input/output error
--incompatible_features     0x2
-+incompatible_features     [1]
- ERROR cluster 4 refcount=1 reference=2
- Leaked cluster 9 refcount=1 reference=0
- Repairing cluster 4 refcount=1 reference=2
-@@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired:
- Double checking the fixed image now...
- No errors were found on the image.
--incompatible_features     0x0
-+incompatible_features     []
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--incompatible_features     0x0
-+incompatible_features     []
- read 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- No errors were found on the image.
-diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/061.out
-+++ b/tests/qemu-iotests/061.out
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x1
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       [0]
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x1
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       [0]
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x1
--compatible_features       0x1
--autoclear_features        0x0
-+incompatible_features     [0]
-+compatible_features       [0]
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x80000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x40000000000
--autoclear_features        0x40000000000
-+incompatible_features     []
-+compatible_features       [42]
-+autoclear_features        [42]
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             72
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x1
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       [0]
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x1
--compatible_features       0x1
--autoclear_features        0x0
-+incompatible_features     [0]
-+compatible_features       [0]
-+autoclear_features        []
- refcount_order            4
- header_length             104
-@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x80000
- refcount_table_clusters   1
- nb_snapshots              0
- snapshot_offset           0x0
--incompatible_features     0x0
--compatible_features       0x0
--autoclear_features        0x0
-+incompatible_features     []
-+compatible_features       []
-+autoclear_features        []
- refcount_order            4
- header_length             104
-diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/137.out
-+++ b/tests/qemu-iotests/137.out
-@@ -XXX,XX +XXX,XX @@ qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     0x0
-+incompatible_features     []
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- wrote 65536/65536 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/qcow2.py
-+++ b/tests/qemu-iotests/qcow2.py
-@@ -XXX,XX +XXX,XX @@ class QcowHeader:
-         [ uint64_t, '%#x',  'snapshot_offset' ],
-         # Version 3 header fields
--        [ uint64_t, '%#x',  'incompatible_features' ],
--        [ uint64_t, '%#x',  'compatible_features' ],
--        [ uint64_t, '%#x',  'autoclear_features' ],
-+        [ uint64_t, 'mask', 'incompatible_features' ],
-+        [ uint64_t, 'mask', 'compatible_features' ],
-+        [ uint64_t, 'mask', 'autoclear_features' ],
-         [ uint32_t, '%d',   'refcount_order' ],
-         [ uint32_t, '%d',   'header_length' ],
-     ];
-@@ -XXX,XX +XXX,XX @@ class QcowHeader:
-     def dump(self):
-         for f in QcowHeader.fields:
--            print("%-25s" % f[2], f[1] % self.__dict__[f[2]])
-+            value = self.__dict__[f[2]]
-+            if f[1] == 'mask':
-+                bits = []
-+                for bit in range(64):
-+                    if value & (1 << bit):
-+                        bits.append(bit)
-+                value_str = str(bits)
-+            else:
-+                value_str = f[1] % value
-+
-+            print("%-25s" % f[2], value_str)
-         print("")
-     def dump_extensions(self):
---
-.24.1

-[PULL 11/34] iotests: Add _filter_json_filename
+Deleted patch
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-5-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/common.filter | 24 ++++++++++++++++++++++++
-file changed, 24 insertions(+)
-diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common.filter
-+++ b/tests/qemu-iotests/common.filter
-@@ -XXX,XX +XXX,XX @@ _filter_qmp_empty_return()
-     grep -v '{"return": {}}'
- }
-+_filter_json_filename()
-+{
-+    $PYTHON -c 'import sys
-+result, *fnames = sys.stdin.read().split("json:{")
-+depth = 0
-+for fname in fnames:
-+    depth += 1 # For the opening brace in the split separator
-+    for chr_i, chr in enumerate(fname):
-+        if chr == "{":
-+            depth += 1
-+        elif chr == "}":
-+            depth -= 1
-+            if depth == 0:
-+                break
-+
-+    # json:{} filenames may be nested; filter out everything from
-+    # inside the outermost one
-+    if depth == 0:
-+        chr_i += 1 # First character past the filename
-+        result += "json:{ /* filtered */ }" + fname[chr_i:]
-+
-+sys.stdout.write(result)'
-+}
-+
- # make sure this script returns success
- true
---
-.24.1

-[PULL 12/34] iotests: Filter refcount_order in 036
+Deleted patch
-This test can run just fine with other values for refcount_bits, so we
-should filter the value from qcow2.py's dump-header.  In fact, we can
-filter everything but the feature bits and header extensions, because
-that is what the test is about.
-(036 currently ignores user-specified image options, but that will be
-fixed in the next patch.)
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-6-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/036     |  9 ++++---
- tests/qemu-iotests/036.out | 48 --------------------------------------
-files changed, 6 insertions(+), 51 deletions(-)
-diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/036
-+++ b/tests/qemu-iotests/036
-@@ -XXX,XX +XXX,XX @@ $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
-+$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
-+$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
- _img_info
- # With feature table containing bit 63
-@@ -XXX,XX +XXX,XX @@ 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
-+$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
-+$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
- echo
- echo === Repair image ===
- echo
- _check_test_img -r all
--$PYTHON qcow2.py "$TEST_IMG" dump-header
-+$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
-+$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
- # success, all done
- echo "*** done"
-diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/036.out
-+++ b/tests/qemu-iotests/036.out
-@@ -XXX,XX +XXX,XX @@ QA output created by 036
- === Image with unknown incompatible feature bit ===
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--magic                     0x514649fb
--version                   3
--backing_file_offset       0x0
--backing_file_size         0x0
--cluster_bits              16
--size                      67108864
--crypt_method              0
--l1_size                   1
--l1_table_offset           0x30000
--refcount_table_offset     0x10000
--refcount_table_clusters   1
--nb_snapshots              0
--snapshot_offset           0x0
- incompatible_features     [63]
- compatible_features       []
- autoclear_features        []
--refcount_order            4
--header_length             104
--
- qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
- qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Test feature
-@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): tes
- === Create image with unknown autoclear feature bit ===
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--magic                     0x514649fb
--version                   3
--backing_file_offset       0x0
--backing_file_size         0x0
--cluster_bits              16
--size                      67108864
--crypt_method              0
--l1_size                   1
--l1_table_offset           0x30000
--refcount_table_offset     0x10000
--refcount_table_clusters   1
--nb_snapshots              0
--snapshot_offset           0x0
- incompatible_features     []
- compatible_features       []
- autoclear_features        [63]
--refcount_order            4
--header_length             104
--
- Header extension:
- magic                     0x6803f857
- length                    192
-@@ -XXX,XX +XXX,XX @@ data                      <binary>
- === Repair image ===
- No errors were found on the image.
--magic                     0x514649fb
--version                   3
--backing_file_offset       0x0
--backing_file_size         0x0
--cluster_bits              16
--size                      67108864
--crypt_method              0
--l1_size                   1
--l1_table_offset           0x30000
--refcount_table_offset     0x10000
--refcount_table_clusters   1
--nb_snapshots              0
--snapshot_offset           0x0
- incompatible_features     []
- compatible_features       []
- autoclear_features        []
--refcount_order            4
--header_length             104
--
- Header extension:
- magic                     0x6803f857
- length                    192
---
-.24.1

-[PULL 13/34] iotests: Replace IMGOPTS by _unsupported_imgopts
+Deleted patch
-Some tests require compat=1.1 and thus set IMGOPTS='compat=1.1'
-globally.  That is not how it should be done; instead, they should
-simply set _unsupported_imgopts to compat=0.10 (compat=1.1 is the
-default anyway).
-This makes the tests heed user-specified $IMGOPTS.  Some do not work
-with all image options, though, so we need to disable them accordingly.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsky@redhat.com>
-Message-id: 20191107163708.833192-7-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/036 | 3 +--
- tests/qemu-iotests/060 | 4 ++--
- tests/qemu-iotests/062 | 3 ++-
- tests/qemu-iotests/066 | 3 ++-
- tests/qemu-iotests/068 | 3 ++-
- tests/qemu-iotests/098 | 4 ++--
-files changed, 11 insertions(+), 9 deletions(-)
-diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/036
-+++ b/tests/qemu-iotests/036
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
--
- # Only qcow2v3 and later supports feature bits
--IMGOPTS="compat=1.1"
-+_unsupported_imgopts 'compat=0.10'
- echo
- echo === Image with unknown incompatible feature bit ===
-diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/060
-+++ b/tests/qemu-iotests/060
-@@ -XXX,XX +XXX,XX @@ _filter_io_error()
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# These tests only work for compat=1.1 images with refcount_bits=16
-+_unsupported_imgopts 'compat=0.10' 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
- # The repair process will create a large file - so check for availability first
- _require_large_file 64G
-@@ -XXX,XX +XXX,XX @@ l1_offset=196608 # 0x30000 (XXX: just an assumption)
- l2_offset=262144 # 0x40000 (XXX: just an assumption)
- l2_offset_after_snapshot=524288 # 0x80000 (XXX: just an assumption)
--IMGOPTS="compat=1.1"
--
- OPEN_RW="open -o overlap-check=all $TEST_IMG"
- # Overlap checks are done before write operations only, therefore opening an
- # image read-only makes the overlap-check option irrelevant
-diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/062
-+++ b/tests/qemu-iotests/062
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto generic
-+# We need zero clusters and snapshots
-+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
--IMGOPTS="compat=1.1"
- IMG_SIZE=64M
- echo
-diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/066
-+++ b/tests/qemu-iotests/066
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto generic
-+# We need zero clusters and snapshots
-+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
- # Intentionally create an unaligned image
--IMGOPTS="compat=1.1"
- IMG_SIZE=$((64 * 1024 * 1024 + 512))
- echo
-diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/068
-+++ b/tests/qemu-iotests/068
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto generic
-+# Internal snapshots are (currently) impossible with refcount_bits=1
-+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
--IMGOPTS="compat=1.1"
- IMG_SIZE=128K
- case "$QEMU_DEFAULT_MACHINE" in
-diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/098
-+++ b/tests/qemu-iotests/098
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
--
--IMGOPTS="compat=1.1"
-+# The code path we want to test here only works for compat=1.1 images
-+_unsupported_imgopts 'compat=0.10'
- for event in l1_update empty_image_prepare reftable_update refblock_alloc; do
---
-.24.1

-[PULL 14/34] iotests: Drop compat=1.1 in 050
+Deleted patch
-IMGOPTS can never be empty for qcow2, because the check scripts adds
-compat=1.1 unless the user specified any compat option themselves.
-Thus, this block does not do anything and can be dropped.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-8-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/050 | 4 ----
-file changed, 4 deletions(-)
-diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/050
-+++ b/tests/qemu-iotests/050
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2 qed
- _supported_proto file
--if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then
--  IMGOPTS=compat=1.1
--fi
--
- echo
- echo "== Creating images =="
---
-.24.1

-[PULL 15/34] iotests: Let _make_test_img parse its parameters
+Deleted patch
-This will allow us to add more options than just -b.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-9-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/common.rc | 28 ++++++++++++++++++++--------
-file changed, 20 insertions(+), 8 deletions(-)
-diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common.rc
-+++ b/tests/qemu-iotests/common.rc
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
-     # extra qemu-img options can be added by tests
-     # at least one argument (the image size) needs to be added
-     local extra_img_options=""
--    local image_size=$*
-     local optstr=""
-     local img_name=""
-     local use_backing=0
-     local backing_file=""
-     local object_options=""
-+    local misc_params=()
-     if [ -n "$TEST_IMG_FILE" ]; then
-         img_name=$TEST_IMG_FILE
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
-         optstr=$(_optstr_add "$optstr" "key-secret=keysec0")
-     fi
--    if [ "$1" = "-b" ]; then
--        use_backing=1
--        backing_file=$2
--        image_size=$3
--    fi
-+    for param; do
-+        if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
-+            backing_file=$param
-+            continue
-+        fi
-+
-+        case "$param" in
-+            -b)
-+                use_backing=1
-+                ;;
-+
-+            *)
-+                misc_params=("${misc_params[@]}" "$param")
-+                ;;
-+        esac
-+    done
-+
-     if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" ]; then
-         optstr=$(_optstr_add "$optstr" "cluster_size=$CLUSTER_SIZE")
-     fi
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
-     # XXX(hch): have global image options?
-     (
-      if [ $use_backing = 1 ]; then
--        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" $image_size 2>&1
-+        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" "${misc_params[@]}" 2>&1
-      else
--        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" $image_size 2>&1
-+        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" "${misc_params[@]}" 2>&1
-      fi
-     ) | _filter_img_create
---
-.24.1

-[PULL 16/34] iotests: Add -o and --no-opts to _make_test_img
+Deleted patch
-Blindly overriding IMGOPTS is suboptimal as this discards user-specified
-options.  Whatever options the test needs should simply be appended.
-Some tests do this (with IMGOPTS=$(_optstr_add "$IMGOPTS" "...")), but
-that is cumbersome.  It’s simpler to just give _make_test_img an -o
-parameter with which tests can add options.
-Some tests actually must override the user-specified options, though,
-for example when creating an image in a different format than the test
-$IMGFMT.  For such cases, --no-opts allows clearing the current option
-list.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-10-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/common.rc | 13 +++++++++++++
-file changed, 13 insertions(+)
-diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common.rc
-+++ b/tests/qemu-iotests/common.rc
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
-     local use_backing=0
-     local backing_file=""
-     local object_options=""
-+    local opts_param=false
-     local misc_params=()
-     if [ -n "$TEST_IMG_FILE" ]; then
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
-         if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
-             backing_file=$param
-             continue
-+        elif $opts_param; then
-+            optstr=$(_optstr_add "$optstr" "$param")
-+            opts_param=false
-+            continue
-         fi
-         case "$param" in
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
-                 use_backing=1
-                 ;;
-+            -o)
-+                opts_param=true
-+                ;;
-+
-+            --no-opts)
-+                optstr=""
-+                ;;
-+
-             *)
-                 misc_params=("${misc_params[@]}" "$param")
-                 ;;
---
-.24.1

-[PULL 17/34] iotests: Inject space into -ocompat=0.10 in 051
+Deleted patch
-It did not matter before, but now that _make_test_img understands -o, we
-should use it properly here.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-11-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/051 | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/051
-+++ b/tests/qemu-iotests/051
-@@ -XXX,XX +XXX,XX @@ echo
- echo === With version 2 images enabling lazy refcounts must fail ===
- echo
--_make_test_img -ocompat=0.10 $size
-+_make_test_img -o compat=0.10 $size
- run_qemu -drive file="$TEST_IMG",format=qcow2,lazy-refcounts=on
- run_qemu -drive file="$TEST_IMG",format=qcow2,lazy-refcounts=off
---
-.24.1

-[PULL 18/34] iotests: Replace IMGOPTS= by -o
+Deleted patch
-Tests should not overwrite all user-supplied image options, but only add
-to it (which will effectively overwrite conflicting values).  Accomplish
-this by passing options to _make_test_img via -o instead of $IMGOPTS.
-For some tests, there is no functional change because they already only
-appended options to IMGOPTS.  For these, this patch is just a
-simplification.
-For others, this is a change, so they now heed user-specified $IMGOPTS.
-Some of those tests do not work with all image options, though, so we
-need to disable them accordingly.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-12-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/031 |  9 ++++---
- tests/qemu-iotests/039 | 24 ++++++------------
- tests/qemu-iotests/059 | 18 ++++++-------
- tests/qemu-iotests/060 |  6 ++---
- tests/qemu-iotests/061 | 57 ++++++++++++++++++++++--------------------
- tests/qemu-iotests/079 |  3 +--
- tests/qemu-iotests/106 |  2 +-
- tests/qemu-iotests/108 |  2 +-
- tests/qemu-iotests/112 | 32 ++++++++++++------------
- tests/qemu-iotests/115 |  3 +--
- tests/qemu-iotests/121 |  6 ++---
- tests/qemu-iotests/125 |  2 +-
- tests/qemu-iotests/137 |  2 +-
- tests/qemu-iotests/138 |  3 +--
- tests/qemu-iotests/175 |  2 +-
- tests/qemu-iotests/190 |  2 +-
- tests/qemu-iotests/191 |  3 +--
- tests/qemu-iotests/220 |  4 ++-
- tests/qemu-iotests/243 |  6 +++--
- tests/qemu-iotests/244 | 10 +++++---
- tests/qemu-iotests/250 |  3 +--
- tests/qemu-iotests/265 |  2 +-
-files changed, 100 insertions(+), 101 deletions(-)
-diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/031
-+++ b/tests/qemu-iotests/031
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This tests qcow2-specific low-level functionality
- _supported_fmt qcow2
- _supported_proto file
-+# We want to test compat=0.10, which does not support refcount widths
-+# other than 16
-+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
- CLUSTER_SIZE=65536
- # qcow2.py output depends on the exact options used, so override the command
- # line here as an exception
--for IMGOPTS in "compat=0.10" "compat=1.1"; do
-+for compat in "compat=0.10" "compat=1.1"; do
-     echo
--    echo ===== Testing with -o $IMGOPTS =====
-+    echo ===== Testing with -o $compat =====
-     echo
-     echo === Create image with unknown header extension ===
-     echo
--    _make_test_img 64M
-+    _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
-     _check_test_img
-diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/039
-+++ b/tests/qemu-iotests/039
-@@ -XXX,XX +XXX,XX @@ size=128M
- echo
- echo "== Checking that image is clean on shutdown =="
--IMGOPTS="compat=1.1,lazy_refcounts=on"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
- $QEMU_IO -c "write -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "== Creating a dirty image file =="
--IMGOPTS="compat=1.1,lazy_refcounts=on"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
- _NO_VALGRIND \
- $QEMU_IO -c "write -P 0x5a 0 512" \
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
- echo
- echo "== Opening a dirty image read/write should repair it =="
--IMGOPTS="compat=1.1,lazy_refcounts=on"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
- _NO_VALGRIND \
- $QEMU_IO -c "write -P 0x5a 0 512" \
-@@ -XXX,XX +XXX,XX @@ $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
- echo
- echo "== Creating an image file with lazy_refcounts=off =="
--IMGOPTS="compat=1.1,lazy_refcounts=off"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=off" $size
- _NO_VALGRIND \
- $QEMU_IO -c "write -P 0x5a 0 512" \
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "== Committing to a backing file with lazy_refcounts=on =="
--IMGOPTS="compat=1.1,lazy_refcounts=on"
--TEST_IMG="$TEST_IMG".base _make_test_img $size
-+TEST_IMG="$TEST_IMG".base _make_test_img -o "compat=1.1,lazy_refcounts=on" $size
--IMGOPTS="compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base" $size
- $QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG commit "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ TEST_IMG="$TEST_IMG".base _check_test_img
- echo
- echo "== Changing lazy_refcounts setting at runtime =="
--IMGOPTS="compat=1.1,lazy_refcounts=off"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=off" $size
- _NO_VALGRIND \
- $QEMU_IO -c "reopen -o lazy-refcounts=on" \
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "reopen -o lazy-refcounts=on" \
- $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
- _check_test_img
--IMGOPTS="compat=1.1,lazy_refcounts=on"
--_make_test_img $size
-+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
- _NO_VALGRIND \
- $QEMU_IO -c "reopen -o lazy-refcounts=off" \
-diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/059
-+++ b/tests/qemu-iotests/059
-@@ -XXX,XX +XXX,XX @@ poke_file "$TEST_IMG" "$grain_table_size_offset" "\x01\x00\x00\x00"
- echo
- echo "=== Testing monolithicFlat creation and opening ==="
--IMGOPTS="subformat=monolithicFlat" _make_test_img 2G
-+_make_test_img -o "subformat=monolithicFlat" 2G
- _img_info
- _cleanup_test_img
- echo
- echo "=== Testing monolithicFlat with zeroed_grain ==="
--IMGOPTS="subformat=monolithicFlat,zeroed_grain=on" _make_test_img 2G
-+_make_test_img -o "subformat=monolithicFlat,zeroed_grain=on" 2G
- _cleanup_test_img
- echo
- echo "=== Testing big twoGbMaxExtentFlat ==="
--IMGOPTS="subformat=twoGbMaxExtentFlat" _make_test_img 1000G
-+_make_test_img -o "subformat=twoGbMaxExtentFlat" 1000G
- $QEMU_IMG info $TEST_IMG | _filter_testdir | sed -e 's/cid: [0-9]*/cid: XXXXXXXX/'
- _cleanup_test_img
-@@ -XXX,XX +XXX,XX @@ _img_info
- echo
- echo "=== Testing truncated sparse ==="
--IMGOPTS="subformat=monolithicSparse" _make_test_img 100G
-+_make_test_img -o "subformat=monolithicSparse" 100G
- truncate -s 10M $TEST_IMG
- _img_info
- echo
- echo "=== Converting to streamOptimized from image with small cluster size==="
--TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 IMGOPTS="cluster_size=4096" _make_test_img 1G
-+TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 _make_test_img -o "cluster_size=4096" 1G
- $QEMU_IO -f qcow2 -c "write -P 0xa 0 512" "$TEST_IMG.qcow2" | _filter_qemu_io
- $QEMU_IO -f qcow2 -c "write -P 0xb 10240 512" "$TEST_IMG.qcow2" | _filter_qemu_io
- $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2" "$TEST_IMG" 2>&1
-@@ -XXX,XX +XXX,XX @@ echo "=== Testing monolithicFlat with internally generated JSON file name ==="
- echo '--- blkdebug ---'
- # Should work, because bdrv_dirname() works fine with blkdebug
--IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
-+_make_test_img -o "subformat=monolithicFlat" 64M
- $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \
-          -c info \
->&1 \
-@@ -XXX,XX +XXX,XX @@ _cleanup_test_img
- echo '--- quorum ---'
- # Should not work, because bdrv_dirname() does not work with quorum
--IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
-+_make_test_img -o "subformat=monolithicFlat" 64M
- cp "$TEST_IMG" "$TEST_IMG.orig"
- filename="json:{
-@@ -XXX,XX +XXX,XX @@ _cleanup_test_img
- echo
- echo "=== Testing 4TB monolithicFlat creation and IO ==="
--IMGOPTS="subformat=monolithicFlat" _make_test_img 4T
-+_make_test_img -o "subformat=monolithicFlat" 4T
- _img_info
- $QEMU_IO -c "write -P 0xa 900G 512" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IO -c "read -v 900G 1024" "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ _cleanup_test_img
- echo
- echo "=== Testing qemu-img map on extents ==="
- for fmt in monolithicSparse twoGbMaxExtentSparse; do
--    IMGOPTS="subformat=$fmt" _make_test_img 31G
-+    _make_test_img -o "subformat=$fmt" 31G
-     $QEMU_IO -c "write 65024 1k" "$TEST_IMG" | _filter_qemu_io
-     $QEMU_IO -c "write 2147483136 1k" "$TEST_IMG" | _filter_qemu_io
-     $QEMU_IO -c "write 5G 1k" "$TEST_IMG" | _filter_qemu_io
-diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/060
-+++ b/tests/qemu-iotests/060
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c 'write 0k 64k' "$BACKING_IMG" | _filter_qemu_io
- # compat=0.10 is required in order to make the following discard actually
- # unallocate the sector rather than make it a zero sector - we want COW, after
- # all.
--IMGOPTS='compat=0.10' _make_test_img -b "$BACKING_IMG" 1G
-+_make_test_img -o 'compat=0.10' -b "$BACKING_IMG" 1G
- # Write two clusters, the second one enforces creation of an L2 table after
- # the first data cluster.
- $QEMU_IO -c 'write 0k 64k' -c 'write 512M 64k' "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== Discarding a non-covered in-bounds refblock ==="
- echo
--IMGOPTS='refcount_bits=1' _make_test_img 64M
-+_make_test_img -o 'refcount_bits=1' 64M
- # Pretend there's a refblock somewhere where there is no refblock to
- # cover it (but the covering refblock has a valid index in the
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== Discarding a refblock covered by an unaligned refblock ==="
- echo
--IMGOPTS='refcount_bits=1' _make_test_img 64M
-+_make_test_img -o 'refcount_bits=1' 64M
- # Same as above
- poke_file "$TEST_IMG" "$(($rt_offset+8))" "\x00\x00\x00\x10\x00\x00\x00\x00"
-diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/061
-+++ b/tests/qemu-iotests/061
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# Conversion between different compat versions can only really work
-+# with refcount_bits=16
-+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
- echo
- echo "=== Testing version downgrade with zero expansion ==="
- echo
--IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-+_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
- $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing version downgrade with zero expansion and 4K cache entries ==="
- echo
--IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-+_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
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing dirty version downgrade ==="
- echo
--IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-+_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
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing version downgrade with unknown compat/autoclear flags ==="
- echo
--IMGOPTS="compat=1.1" _make_test_img 64M
-+_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
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing version upgrade and resize ==="
- echo
--IMGOPTS="compat=0.10" _make_test_img 64M
-+_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
- $QEMU_IMG amend -o "compat=1.1,lazy_refcounts=on,size=128M" "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing dirty lazy_refcounts=off ==="
- echo
--IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-+_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
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing backing file ==="
- echo
--IMGOPTS="compat=1.1" _make_test_img 64M
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
-+_make_test_img -o "compat=1.1" 64M
-+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
- $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG amend -o "backing_file=$TEST_IMG.base,backing_fmt=qcow2" "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing invalid configurations ==="
- echo
--IMGOPTS="compat=0.10" _make_test_img 64M
-+_make_test_img -o "compat=0.10" 64M
- $QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG"
- $QEMU_IMG amend -o "compat=1.1" "$TEST_IMG" # actually valid
- $QEMU_IMG amend -o "compat=0.10,lazy_refcounts=on" "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ $QEMU_IMG amend -o "preallocation=on" "$TEST_IMG"
- echo
- echo "=== Testing correct handling of unset value ==="
- echo
--IMGOPTS="compat=1.1,cluster_size=1k" _make_test_img 64M
-+_make_test_img -o "compat=1.1,cluster_size=1k" 64M
- echo "Should work:"
- $QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG"
- echo "Should not work:" # Just to know which of these tests actually fails
-@@ -XXX,XX +XXX,XX @@ $QEMU_IMG amend -o "cluster_size=64k" "$TEST_IMG"
- echo
- echo "=== Testing zero expansion on inactive clusters ==="
- echo
--IMGOPTS="compat=1.1" _make_test_img 64M
-+_make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG snapshot -c foo "$TEST_IMG"
- $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
- echo
- echo "=== Testing zero expansion on shared L2 table ==="
- echo
--IMGOPTS="compat=1.1" _make_test_img 64M
-+_make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG snapshot -c foo "$TEST_IMG"
- $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
- echo
- echo "=== Testing zero expansion on backed image ==="
- echo
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
-+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
--IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
-+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
- $QEMU_IO -c "read -P 0x2a 0 128k" -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
- _check_test_img
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe
- echo
- echo "=== Testing zero expansion on backed inactive clusters ==="
- echo
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
-+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
--IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
-+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
- $QEMU_IO -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG snapshot -c foo "$TEST_IMG"
- $QEMU_IO -c "write -P 0x42 0 128k" "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe
- echo
- echo "=== Testing zero expansion on backed image with shared L2 table ==="
- echo
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
-+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
--IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
-+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
- $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
- $QEMU_IMG snapshot -c foo "$TEST_IMG"
- $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
- echo
- echo "=== Testing preallocated zero expansion on full image ==="
- echo
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG" _make_test_img 64M
-+TEST_IMG="$TEST_IMG" _make_test_img -o "compat=1.1" 64M
- $QEMU_IO -c "write -P 0x2a 0 64M" "$TEST_IMG" -c "write -z 0 64M" | _filter_qemu_io
- $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
- _check_test_img
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64M" "$TEST_IMG" | _filter_qemu_io
- echo
- echo "=== Testing progress report without snapshot ==="
- echo
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G
--IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G
-+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G
-+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G
- $QEMU_IO -c "write -z 0  64k" \
-          -c "write -z 1G 64k" \
-          -c "write -z 2G 64k" \
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing progress report with snapshot ==="
- echo
--IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G
--IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G
-+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G
-+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G
- $QEMU_IO -c "write -z 0  64k" \
-          -c "write -z 1G 64k" \
-          -c "write -z 2G 64k" \
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Testing version downgrade with external data file ==="
- echo
--IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M
-+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M
- $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
- _img_info --format-specific
- _check_test_img
-@@ -XXX,XX +XXX,XX @@ _check_test_img
- echo
- echo "=== Try changing the external data file ==="
- echo
--IMGOPTS="compat=1.1" _make_test_img 64M
-+_make_test_img -o "compat=1.1" 64M
- $QEMU_IMG amend -o "data_file=foo" "$TEST_IMG"
- echo
--IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M
-+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M
- $QEMU_IMG amend -o "data_file=foo" "$TEST_IMG"
- _img_info --format-specific
- TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info --format-specific --image-opts
-@@ -XXX,XX +XXX,XX @@ TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info -
- echo
- echo "=== Clearing and setting data-file-raw ==="
- echo
--IMGOPTS="compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M
-+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" 64M
- $QEMU_IMG amend -o "data_file_raw=on" "$TEST_IMG"
- _img_info --format-specific
- _check_test_img
-diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/079
-+++ b/tests/qemu-iotests/079
-@@ -XXX,XX +XXX,XX @@ echo
- cluster_sizes="16384 32768 65536 131072 262144 524288 1048576 2097152 4194304"
- for s in $cluster_sizes; do
--    IMGOPTS=$(_optstr_add "$IMGOPTS" "preallocation=metadata,cluster_size=$s") \
--        _make_test_img 4G
-+    _make_test_img -o "preallocation=metadata,cluster_size=$s" 4G
- done
- # success, all done
-diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/106
-+++ b/tests/qemu-iotests/106
-@@ -XXX,XX +XXX,XX @@ for create_mode in off falloc full; do
-         echo
-         echo "--- create_mode=$create_mode growth_mode=$growth_mode ---"
--        IMGOPTS="preallocation=$create_mode" _make_test_img ${CREATION_SIZE}K
-+        _make_test_img -o "preallocation=$create_mode" ${CREATION_SIZE}K
-         $QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K
-         expected_size=0
-diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/108
-+++ b/tests/qemu-iotests/108
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Repairing unreferenced data cluster in new refblock area ==='
- echo
--IMGOPTS='cluster_size=512' _make_test_img 64M
-+_make_test_img -o 'cluster_size=512' 64M
- # Allocate the first 128 kB in the image (first refblock)
- $QEMU_IO -c 'write 0 0x1b200' "$TEST_IMG" | _filter_qemu_io
- # should be 131072 == 0x20000
-diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/112
-+++ b/tests/qemu-iotests/112
-@@ -XXX,XX +XXX,XX @@ echo '=== refcount_bits limits ==='
- echo
- # Must be positive (non-zero)
--IMGOPTS="$IMGOPTS,refcount_bits=0" _make_test_img 64M
-+_make_test_img -o "refcount_bits=0" 64M
- # Must be positive (non-negative)
--IMGOPTS="$IMGOPTS,refcount_bits=-1" _make_test_img 64M
-+_make_test_img -o "refcount_bits=-1" 64M
- # May not exceed 64
--IMGOPTS="$IMGOPTS,refcount_bits=128" _make_test_img 64M
-+_make_test_img -o "refcount_bits=128" 64M
- # Must be a power of two
--IMGOPTS="$IMGOPTS,refcount_bits=42" _make_test_img 64M
-+_make_test_img -o "refcount_bits=42" 64M
- # 1 is the minimum
--IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
-+_make_test_img -o "refcount_bits=1" 64M
- print_refcount_bits
- # 64 is the maximum
--IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
-+_make_test_img -o "refcount_bits=64" 64M
- print_refcount_bits
- # 16 is the default
-@@ -XXX,XX +XXX,XX @@ echo '=== refcount_bits and compat=0.10 ==='
- echo
- # Should work
--IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=16" _make_test_img 64M
-+_make_test_img -o "compat=0.10,refcount_bits=16" 64M
- print_refcount_bits
- # Should not work
--IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=1" _make_test_img 64M
--IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=64" _make_test_img 64M
-+_make_test_img -o "compat=0.10,refcount_bits=1" 64M
-+_make_test_img -o "compat=0.10,refcount_bits=64" 64M
- echo
- echo '=== Snapshot limit on refcount_bits=1 ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
-+_make_test_img -o "refcount_bits=1" 64M
- print_refcount_bits
- $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Snapshot limit on refcount_bits=2 ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=2" _make_test_img 64M
-+_make_test_img -o "refcount_bits=2" 64M
- print_refcount_bits
- $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Compressed clusters with refcount_bits=1 ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
-+_make_test_img -o "refcount_bits=1" 64M
- print_refcount_bits
- # Both should fit into a single host cluster; instead of failing to increase the
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== MSb set in 64 bit refcount ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
-+_make_test_img -o "refcount_bits=64" 64M
- print_refcount_bits
- $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Snapshot on maximum 64 bit refcount value ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
-+_make_test_img -o "refcount_bits=64" 64M
- print_refcount_bits
- $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Testing too many references for check ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
-+_make_test_img -o "refcount_bits=1" 64M
- print_refcount_bits
- # This cluster should be created at 0x50000
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Multiple walks necessary during amend ==='
- echo
--IMGOPTS="$IMGOPTS,refcount_bits=1,cluster_size=512" _make_test_img 64k
-+_make_test_img -o "refcount_bits=1,cluster_size=512" 64k
- # Cluster 0 is the image header, clusters 1 to 4 are used by the L1 table, a
- # single L2 table, the reftable and a single refblock. This creates 58 data
-diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/115
-+++ b/tests/qemu-iotests/115
-@@ -XXX,XX +XXX,XX @@ echo
- # least 256 MB. We can achieve that by using preallocation=metadata for an image
- # which has a guest disk size of 256 MB.
--IMGOPTS="$IMGOPTS,refcount_bits=64,cluster_size=512,preallocation=metadata" \
--    _make_test_img 256M
-+_make_test_img -o "refcount_bits=64,cluster_size=512,preallocation=metadata" 256M
- # We know for sure that the L1 and refcount tables do not overlap with any other
- # structure because the metadata overlap checks would have caught that case.
-diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/121
-+++ b/tests/qemu-iotests/121
-@@ -XXX,XX +XXX,XX @@ echo
- # Preallocation speeds up the write operation, but preallocating everything will
- # destroy the purpose of the write; so preallocate one KB less than what would
- # cause a reftable growth...
--IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64512K
-+_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64512K
- # ...and make the image the desired size afterwards.
- $QEMU_IMG resize "$TEST_IMG" 65M
-@@ -XXX,XX +XXX,XX @@ echo
- echo '--- Test 2 ---'
- echo
--IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64513K
-+_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64513K
- # This results in an L1 table growth which in turn results in some clusters at
- # the start of the image becoming free
- $QEMU_IMG resize "$TEST_IMG" 65M
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Allocating a new refcount block must not leave holes in the image ==='
- echo
--IMGOPTS='cluster_size=512,refcount_bits=16' _make_test_img 1M
-+_make_test_img -o 'cluster_size=512,refcount_bits=16' 1M
- # This results in an image with 256 used clusters: the qcow2 header,
- # the refcount table, one refcount block, the L1 table, four L2 tables
-diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/125
-+++ b/tests/qemu-iotests/125
-@@ -XXX,XX +XXX,XX @@ for GROWTH_SIZE in 16 48 80; do
-         for growth_mode in off metadata falloc full; do
-             echo "--- cluster_size=$cluster_size growth_size=$GROWTH_SIZE create_mode=$create_mode growth_mode=$growth_mode ---"
--            IMGOPTS="preallocation=$create_mode,cluster_size=$cluster_size" _make_test_img ${CREATION_SIZE}
-+            _make_test_img -o "preallocation=$create_mode,cluster_size=$cluster_size" ${CREATION_SIZE}
-             $QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K
-             host_size_0=$(get_image_size_on_host)
-diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/137
-+++ b/tests/qemu-iotests/137
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO \
-     -c "reopen -o cache-clean-interval=-1" \
-     "$TEST_IMG" | _filter_qemu_io
--IMGOPTS="cluster_size=256k" _make_test_img 32P
-+_make_test_img -o "cluster_size=256k" 32P
- $QEMU_IO \
-     -c "reopen -o l2-cache-entry-size=512,l2-cache-size=1T" \
-     "$TEST_IMG" | _filter_qemu_io
-diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/138
-+++ b/tests/qemu-iotests/138
-@@ -XXX,XX +XXX,XX @@ echo
- echo '=== Check on an image with a multiple of 2^32 clusters ==='
- echo
--IMGOPTS=$(_optstr_add "$IMGOPTS" "cluster_size=512") \
--    _make_test_img 512
-+_make_test_img -o "cluster_size=512" 512
- # Allocate L2 table
- $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
-diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/175
-+++ b/tests/qemu-iotests/175
-@@ -XXX,XX +XXX,XX @@ stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_block
- for mode in off full falloc; do
-     echo
-     echo "== creating image with preallocation $mode =="
--    IMGOPTS=preallocation=$mode _make_test_img $size | _filter_imgfmt
-+    _make_test_img -o preallocation=$mode $size | _filter_imgfmt
-     stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size
- done
-diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/190
-+++ b/tests/qemu-iotests/190
-@@ -XXX,XX +XXX,XX @@ _supported_proto file
- echo "== Huge file =="
- echo
--IMGOPTS='cluster_size=2M' _make_test_img 2T
-+_make_test_img -o 'cluster_size=2M' 2T
- $QEMU_IMG measure -O raw -f qcow2 "$TEST_IMG"
- $QEMU_IMG measure -O qcow2 -o cluster_size=64k -f qcow2 "$TEST_IMG"
-diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/191
-+++ b/tests/qemu-iotests/191
-@@ -XXX,XX +XXX,XX @@ echo === Preparing and starting VM ===
- echo
- TEST_IMG="${TEST_IMG}.base" _make_test_img $size
--IMGOPTS=$(_optstr_add "$IMGOPTS" "backing_fmt=$IMGFMT") \
--    TEST_IMG="${TEST_IMG}.mid" _make_test_img -b "${TEST_IMG}.base"
-+TEST_IMG="${TEST_IMG}.mid" _make_test_img -o "backing_fmt=$IMGFMT" -b "${TEST_IMG}.base"
- _make_test_img -b "${TEST_IMG}.mid"
- TEST_IMG="${TEST_IMG}.ovl2" _make_test_img -b "${TEST_IMG}.mid"
-diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/220
-+++ b/tests/qemu-iotests/220
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# To use a different refcount width but 16 bits we need compat=1.1
-+_unsupported_imgopts 'compat=0.10'
- echo "== Creating huge file =="
-@@ -XXX,XX +XXX,XX @@ echo "== Creating huge file =="
- # of a HUGE (but very sparse) file.  tmpfs works, ext4 does not.
- _require_large_file 513T
--IMGOPTS='cluster_size=2M,refcount_bits=1' _make_test_img 513T
-+_make_test_img -o 'cluster_size=2M,refcount_bits=1' 513T
- echo "== Populating refcounts =="
- # We want an image with 256M refcounts * 2M clusters = 512T referenced.
-diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/243
-+++ b/tests/qemu-iotests/243
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# External data files do not work with compat=0.10
-+_unsupported_imgopts 'compat=0.10'
- for mode in off metadata falloc full; do
-@@ -XXX,XX +XXX,XX @@ for mode in off metadata falloc full; do
-     echo "=== preallocation=$mode ==="
-     echo
--    IMGOPTS="preallocation=$mode" _make_test_img 64M
-+    _make_test_img -o "preallocation=$mode" 64M
-     printf "File size: "
-     du -b $TEST_IMG | cut -f1
-@@ -XXX,XX +XXX,XX @@ for mode in off metadata falloc full; do
-     echo "=== External data file: preallocation=$mode ==="
-     echo
--    IMGOPTS="data_file=$TEST_IMG.data,preallocation=$mode" _make_test_img 64M
-+    _make_test_img -o "data_file=$TEST_IMG.data,preallocation=$mode" 64M
-     echo -n "qcow2 file size: "
-     du -b $TEST_IMG | cut -f1
-diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/244
-+++ b/tests/qemu-iotests/244
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2
- _supported_proto file
- _supported_os Linux
-+# External data files do not work with compat=0.10
-+_unsupported_imgopts 'compat=0.10'
- echo
- echo "=== Create and open image with external data file ==="
- echo
- echo "With data file name in the image:"
--IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
-+_make_test_img -o "data_file=$TEST_IMG.data" 64M
- _check_test_img
- $QEMU_IO -c "open $TEST_IMG" -c "read -P 0 0 64k" 2>&1 | _filter_qemu_io | _filter_testdir
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== Standalone image with external data file (efficient) ==="
- echo
--IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
-+_make_test_img -o "data_file=$TEST_IMG.data" 64M
- echo -n "qcow2 file size before I/O: "
- du -b $TEST_IMG | cut -f1
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== Standalone image with external data file (valid raw) ==="
- echo
--IMGOPTS="data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M
-+_make_test_img -o "data_file=$TEST_IMG.data,data_file_raw=on" 64M
- echo -n "qcow2 file size before I/O: "
- du -b $TEST_IMG | cut -f1
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== bdrv_co_block_status test for file and offset=0 ==="
- echo
--IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
-+_make_test_img -o "data_file=$TEST_IMG.data" 64M
- $QEMU_IO -c 'write -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
- $QEMU_IO -c 'read -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
-diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/250
-+++ b/tests/qemu-iotests/250
-@@ -XXX,XX +XXX,XX @@ disk_usage()
- }
- size=2100M
--IMGOPTS="cluster_size=1M,preallocation=metadata"
--_make_test_img $size
-+_make_test_img -o "cluster_size=1M,preallocation=metadata" $size
- $QEMU_IO -c 'discard 0 10M' -c 'discard 2090M 10M' \
-          -c 'write 2090M 10M' -c 'write 0 10M' "$TEST_IMG" | _filter_qemu_io
-diff --git a/tests/qemu-iotests/265 b/tests/qemu-iotests/265
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/265
-+++ b/tests/qemu-iotests/265
-@@ -XXX,XX +XXX,XX @@ _supported_os Linux
- echo '--- Writing to the image ---'
- # Reduce cluster size so we get more and quicker I/O
--IMGOPTS='cluster_size=4096' _make_test_img 1M
-+_make_test_img -o 'cluster_size=4096' 1M
- (for ((kb = 1024 - 4; kb >= 0; kb -= 4)); do \
-      echo "aio_write -P 42 $((kb + 1))k 2k"; \
-  done) \
---
-.24.1

-[PULL 19/34] iotests: Replace IMGOPTS='' by --no-opts
+Deleted patch
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-13-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/071 | 4 ++--
- tests/qemu-iotests/174 | 2 +-
- tests/qemu-iotests/178 | 4 ++--
- tests/qemu-iotests/197 | 4 ++--
- tests/qemu-iotests/215 | 4 ++--
-files changed, 9 insertions(+), 9 deletions(-)
-diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/071
-+++ b/tests/qemu-iotests/071
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== Testing blkverify through filename ==="
- echo
--TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
-+TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
-     _filter_imgfmt
- _make_test_img $IMG_SIZE
- $QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base $TEST_IMG" \
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== Testing blkverify through file blockref ==="
- echo
--TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
-+TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
-     _filter_imgfmt
- _make_test_img $IMG_SIZE
- $QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base,file.test.driver=$IMGFMT,file.test.file.filename=$TEST_IMG" \
-diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/174
-+++ b/tests/qemu-iotests/174
-@@ -XXX,XX +XXX,XX @@ _unsupported_fmt raw
- size=256K
--IMGFMT=raw IMGKEYSECRET= IMGOPTS= _make_test_img $size | _filter_imgfmt
-+IMGFMT=raw IMGKEYSECRET= _make_test_img --no-opts $size | _filter_imgfmt
- echo
- echo "== reading wrong format should fail =="
-diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/178
-+++ b/tests/qemu-iotests/178
-@@ -XXX,XX +XXX,XX @@ $QEMU_IMG measure -O foo "$TEST_IMG" # unknown image file format
- make_test_img_with_fmt() {
-     # Shadow global variables within this function
--    local IMGFMT="$1" IMGOPTS=""
--    _make_test_img "$2"
-+    local IMGFMT="$1"
-+    _make_test_img --no-opts "$2"
- }
- qemu_io_with_fmt() {
-diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/197
-+++ b/tests/qemu-iotests/197
-@@ -XXX,XX +XXX,XX @@ if [ "$IMGFMT" = "vpc" ]; then
- fi
- _make_test_img 4G
- $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
--IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
--    _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
-+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
-+    _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
- $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
- # Ensure that a read of two clusters, but where one is already allocated,
-diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/215
-+++ b/tests/qemu-iotests/215
-@@ -XXX,XX +XXX,XX @@ if [ "$IMGFMT" = "vpc" ]; then
- fi
- _make_test_img 4G
- $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
--IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
--    _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
-+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
-+    _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
- $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
- # Ensure that a read of two clusters, but where one is already allocated,
---
-.24.1

-[PULL 20/34] iotests: Drop IMGOPTS use in 267
+Deleted patch
-Overwriting IMGOPTS means ignoring all user-supplied options, which is
-not what we want.  Replace the current IMGOPTS use by a new BACKING_FILE
-variable.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-14-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/267 | 12 ++++++++----
-file changed, 8 insertions(+), 4 deletions(-)
-diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/267
-+++ b/tests/qemu-iotests/267
-@@ -XXX,XX +XXX,XX @@ size=128M
- run_test()
- {
--    _make_test_img $size
-+    if [ -n "$BACKING_FILE" ]; then
-+        _make_test_img -b "$BACKING_FILE" $size
-+    else
-+        _make_test_img $size
-+    fi
-     printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date
- }
-@@ -XXX,XX +XXX,XX @@ echo
- TEST_IMG="$TEST_IMG.base" _make_test_img $size
--IMGOPTS="backing_file=$TEST_IMG.base" \
-+BACKING_FILE="$TEST_IMG.base" \
- run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
-          -blockdev driver=file,filename="$TEST_IMG",node-name=file \
-          -blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt
--IMGOPTS="backing_file=$TEST_IMG.base" \
-+BACKING_FILE="$TEST_IMG.base" \
- run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
-          -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
-          -blockdev driver=file,filename="$TEST_IMG",node-name=file \
-@@ -XXX,XX +XXX,XX @@ echo
- echo "=== -blockdev with NBD server on the backing file ==="
- echo
--IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
-+_make_test_img -b "$TEST_IMG.base" $size
- cat <<EOF |
- nbd_server_start unix:$SOCK_DIR/nbd
- nbd_server_add -w backing-fmt
---
-.24.1

-[PULL 21/34] iotests: Avoid qemu-img create
+Deleted patch
-Use _make_test_img whenever possible.  This way, we will not ignore
-user-specified image options.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-15-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/094 | 2 +-
- tests/qemu-iotests/111 | 3 +--
- tests/qemu-iotests/123 | 2 +-
- tests/qemu-iotests/153 | 2 +-
- tests/qemu-iotests/200 | 4 ++--
-files changed, 6 insertions(+), 7 deletions(-)
-diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/094
-+++ b/tests/qemu-iotests/094
-@@ -XXX,XX +XXX,XX @@ _supported_proto nbd
- _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
- _make_test_img 64M
--$QEMU_IMG create -f $IMGFMT "$TEST_DIR/source.$IMGFMT" 64M | _filter_img_create
-+TEST_IMG_FILE="$TEST_DIR/source.$IMGFMT" IMGPROTO=file _make_test_img 64M
- _launch_qemu -drive if=none,id=src,file="$TEST_DIR/source.$IMGFMT",format=raw \
-              -nodefaults
-diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/111
-+++ b/tests/qemu-iotests/111
-@@ -XXX,XX +XXX,XX @@ _supported_fmt qed qcow qcow2 vmdk
- _supported_proto file
- _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
--$QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
--    | _filter_testdir | _filter_imgfmt
-+_make_test_img -b "$TEST_IMG.inexistent"
- # success, all done
- echo '*** done'
-diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/123
-+++ b/tests/qemu-iotests/123
-@@ -XXX,XX +XXX,XX @@ _supported_os Linux
- SRC_IMG="$TEST_DIR/source.$IMGFMT"
- _make_test_img 1M
--$QEMU_IMG create -f $IMGFMT "$SRC_IMG" 1M | _filter_img_create
-+TEST_IMG_FILE=$SRC_IMG IMGPROTO=file _make_test_img 1M
- $QEMU_IO -c 'write -P 42 0 1M' "$SRC_IMG" | _filter_qemu_io
-diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/153
-+++ b/tests/qemu-iotests/153
-@@ -XXX,XX +XXX,XX @@ for opts1 in "" "read-only=on" "read-only=on,force-share=on"; do
-     echo
-     echo "== Creating test image =="
--    $QEMU_IMG create -f $IMGFMT "${TEST_IMG}" -b ${TEST_IMG}.base | _filter_img_create
-+    _make_test_img -b "${TEST_IMG}.base"
-     echo
-     echo "== Launching QEMU, opts: '$opts1' =="
-diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/200
-+++ b/tests/qemu-iotests/200
-@@ -XXX,XX +XXX,XX @@ _supported_proto file
- BACKING_IMG="${TEST_DIR}/backing.img"
- TEST_IMG="${TEST_DIR}/test.img"
--${QEMU_IMG} create -f $IMGFMT "${BACKING_IMG}" 512M | _filter_img_create
--${QEMU_IMG} create -f $IMGFMT -F $IMGFMT "${TEST_IMG}" -b "${BACKING_IMG}" 512M | _filter_img_create
-+TEST_IMG="$BACKING_IMG" _make_test_img 512M
-+_make_test_img -F $IMGFMT -b "$BACKING_IMG" 512M
- ${QEMU_IO} -c "write -P 0xa5 512 300M" "${BACKING_IMG}" | _filter_qemu_io
---
-.24.1

-[PULL 24/34] iotests: Make 091 work with data_file
+Deleted patch
-The image end offset as reported by qemu-img check is different when
-using an external data file; we do not care about its value here, so we
-can just filter it.  Incidentally, common.rc already has _check_test_img
-for us which does exactly that.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-18-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/091     | 2 +-
- tests/qemu-iotests/091.out | 2 --
-files changed, 1 insertion(+), 3 deletions(-)
-diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/091
-+++ b/tests/qemu-iotests/091
-@@ -XXX,XX +XXX,XX @@ echo "Check image pattern"
- ${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir | _filter_qemu_io
- echo "Running 'qemu-img check -r all \$TEST_IMG'"
--"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_qemu
-+_check_test_img -r all
- echo "*** done"
- rm -f $seq.full
-diff --git a/tests/qemu-iotests/091.out b/tests/qemu-iotests/091.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/091.out
-+++ b/tests/qemu-iotests/091.out
-@@ -XXX,XX +XXX,XX @@ read 4194304/4194304 bytes at offset 0
-MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- Running 'qemu-img check -r all $TEST_IMG'
- No errors were found on the image.
--80/16384 = 0.49% allocated, 0.00% fragmented, 0.00% compressed clusters
--Image end offset: 5570560
- *** done
---
-.24.1

-[PULL 25/34] iotests: Make 110 work with data_file
+Deleted patch
-The only difference is that the json:{} filename of the image looks
-different.  We actually do not care about that filename in this test, we
-are only interested in (1) that there is a json:{} filename, and (2)
-whether the backing filename can be constructed.
-So just filter out the json:{} data, thus making this test pass both
-with and without data_file.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-19-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/110     | 7 +++++--
- tests/qemu-iotests/110.out | 4 ++--
-files changed, 7 insertions(+), 4 deletions(-)
-diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/110
-+++ b/tests/qemu-iotests/110
-@@ -XXX,XX +XXX,XX @@ echo
- # Across blkdebug without a config file, you cannot reconstruct filenames, so
- # qemu is incapable of knowing the directory of the top image from the filename
- # alone. However, using bdrv_dirname(), it should still work.
-+# (Filter out the json:{} filename so this test works with external data files)
- TEST_IMG="json:{
-     'driver': '$IMGFMT',
-     'file': {
-@@ -XXX,XX +XXX,XX @@ TEST_IMG="json:{
-             }
-         ]
-     }
--}" _img_info | _filter_img_info | grep -v 'backing file format'
-+}" _img_info | _filter_img_info | grep -v 'backing file format' \
-+    | _filter_json_filename
- echo
- echo '=== Backing name is always relative to the backed image ==='
-@@ -XXX,XX +XXX,XX @@ TEST_IMG="json:{
-             }
-         ]
-     }
--}" _img_info | _filter_img_info | grep -v 'backing file format'
-+}" _img_info | _filter_img_info | grep -v 'backing file format' \
-+    | _filter_json_filename
- # success, all done
-diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/110.out
-+++ b/tests/qemu-iotests/110.out
-@@ -XXX,XX +XXX,XX @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
- === Non-reconstructable filename ===
--image: json:{"driver": "IMGFMT", "file": {"set-state.0.event": "read_aio", "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "set-state.0.new_state": 42}}
-+image: json:{ /* filtered */ }
- file format: IMGFMT
- virtual size: 64 MiB (67108864 bytes)
- backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b
- === Nodes without a common directory ===
--image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "vote-threshold": 1}}
-+image: json:{ /* filtered */ }
- file format: IMGFMT
- virtual size: 64 MiB (67108864 bytes)
- backing file: t.IMGFMT.base (cannot determine actual path)
---
-.24.1

-[PULL 26/34] iotests: Make 137 work with data_file
+Deleted patch
-When using an external data file, there are no refcounts for data
-clusters.  We thus have to adjust the corruption test in this patch to
-not be based around a data cluster allocation, but the L2 table
-allocation (L2 tables are still refcounted with external data files).
-Furthermore, we should not print qcow2.py's list of incompatible
-features because it differs depending on whether there is an external
-data file or not.
-With those two changes, the test will work both with and without
-external data files (once that options works with the iotests at all).
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20191107163708.833192-20-mreitz@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/137     | 15 +++++++++++----
- tests/qemu-iotests/137.out |  6 ++----
-files changed, 13 insertions(+), 8 deletions(-)
-diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/137
-+++ b/tests/qemu-iotests/137
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO \
-     "$TEST_IMG" 2>&1 | _filter_qemu_io
- # The dirty bit must not be set
--$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
-+# (Filter the external data file bit)
-+if $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features \
-+    | grep -q '\<0\>'
-+then
-+    echo 'ERROR: Dirty bit set'
-+else
-+    echo 'OK: Dirty bit not set'
-+fi
- # Similarly we can test whether corruption detection has been enabled:
--# Create L1/L2, overwrite first entry in refcount block, allocate something.
-+# Create L1, overwrite refcounts, force allocation of L2 by writing
-+# data.
- # Disabling the checks should fail, so the corruption must be detected.
- _make_test_img 64M
--$QEMU_IO -c "write 0 64k" "$TEST_IMG" | _filter_qemu_io
--poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00"
-+poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00\x00\x00\x00\x00\x00\x00"
- $QEMU_IO \
-     -c "reopen -o overlap-check=none,lazy-refcounts=42" \
-     -c "write 64k 64k" \
-diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/137.out
-+++ b/tests/qemu-iotests/137.out
-@@ -XXX,XX +XXX,XX @@ qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
--incompatible_features     []
-+OK: Dirty bit not set
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--wrote 65536/65536 bytes at offset 0
--64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
--qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with qcow2_header); further corruption events will be suppressed
-+qcow2: Marking image as corrupt: Preventing invalid allocation of L2 table at offset 0; further corruption events will be suppressed
- write failed: Input/output error
- *** done
---
-.24.1

-[PULL 27/34] iotests: Make 198 work with data_file
+[PULL 12/14] file-posix: Fix zone update in I/O error path
-We do not care about the json:{} filenames here, so we can just filter
+We must check that zone information is present before running
-them out and thus make the test work both with and without external data
+update_zones_wp().
 files.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2234374
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
+Fixes: Coverity CID 1512459
-Message-id: 20191107163708.833192-21-mreitz@redhat.com
+Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Message-Id: <20230824155345.109765-4-hreitz@redhat.com>
 Reviewed-by: Sam Li <faithilikerun@gmail.com>
 ---
- tests/qemu-iotests/198     | 6 ++++--
+ block/file-posix.c | 3 ++-
- tests/qemu-iotests/198.out | 4 ++--
+file changed, 2 insertions(+), 1 deletion(-)
 files changed, 6 insertions(+), 4 deletions(-)
-diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
+diff --git a/block/file-posix.c b/block/file-posix.c
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/198
 +++ b/tests/qemu-iotests/198
@@ -XXX,XX +XXX,XX @@ echo
  echo "== checking image base =="
  $QEMU_IMG info --image-opts $IMGSPECBASE | _filter_img_info --format-specific \
      | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
 -          -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
 +          -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
 +    | _filter_json_filename
  echo
  echo "== checking image layer =="
  $QEMU_IMG info --image-opts $IMGSPECLAYER | _filter_img_info --format-specific \
      | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
 -          -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
 +          -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
 +    | _filter_json_filename
  # success, all done
 diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/198.out
+--- a/block/file-posix.c
-+++ b/tests/qemu-iotests/198.out
++++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ read 16777216/16777216 bytes at offset 0
+@@ -XXX,XX +XXX,XX @@ out:
-MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+             }
+         }
- == checking image base ==
+     } else {
--image: json:{"encrypt.key-secret": "sec0", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.base"}}
+-        if (type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) {
-+image: json:{ /* filtered */ }
++        if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
- file format: IMGFMT
++            bs->bl.zoned != BLK_Z_NONE) {
- virtual size: 16 MiB (16777216 bytes)
+             update_zones_wp(bs, s->fd, 0, 1);
- Format specific information:
+         }
-@@ -XXX,XX +XXX,XX @@ Format specific information:
+     }
          master key iters: 1024
  == checking image layer ==
 -image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}}
 +image: json:{ /* filtered */ }
  file format: IMGFMT
  virtual size: 16 MiB (16777216 bytes)
  backing file: TEST_DIR/t.IMGFMT.base
 --
-.24.1
+.41.0

-[PULL 29/34] iotests: Allow check -o data_file
+[PULL 13/14] file-posix: Simplify raw_co_prw's 'out' zone code
-The problem with allowing the data_file option is that you want to use a
+We duplicate the same condition three times here, pull it out to the top
-different data file per image used in the test.  Therefore, we need to
+level.
 allow patterns like -o data_file='$TEST_IMG.data_file'.
-Then, we need to filter it out from qemu-img map, qemu-img create, and
+Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
-remove the data file in _rm_test_img.
+Message-Id: <20230824155345.109765-5-hreitz@redhat.com>
 Reviewed-by: Sam Li <faithilikerun@gmail.com>
 ---
  block/file-posix.c | 18 +++++-------------
 file changed, 5 insertions(+), 13 deletions(-)
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+diff --git a/block/file-posix.c b/block/file-posix.c
 Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
 Message-id: 20191107163708.833192-23-mreitz@redhat.com
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
  tests/qemu-iotests/common.filter | 23 +++++++++++++++++++++--
  tests/qemu-iotests/common.rc     | 22 +++++++++++++++++++++-
 files changed, 42 insertions(+), 3 deletions(-)
 diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common.filter
+--- a/block/file-posix.c
-+++ b/tests/qemu-iotests/common.filter
++++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ _filter_actual_image_size()
+@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_prw(BlockDriverState *bs, uint64_t offset,
- # replace driver-specific options in the "Formatting..." line
- _filter_img_create()
+ out:
- {
+ #if defined(CONFIG_BLKZONED)
--    $SED -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
+-{
-+    data_file_filter=()
+-    BlockZoneWps *wps = bs->wps;
-+    if data_file=$(_get_data_file "$TEST_IMG"); then
+-    if (ret == 0) {
-+        data_file_filter=(-e "s# data_file=$data_file##")
+-        if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
-+    fi
+-            bs->bl.zoned != BLK_Z_NONE) {
-+
++    if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
-+    $SED "${data_file_filter[@]}" \
++        bs->bl.zoned != BLK_Z_NONE) {
-+        -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
++        BlockZoneWps *wps = bs->wps;
-         -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
++        if (ret == 0) {
-         -e "s#$TEST_DIR#TEST_DIR#g" \
+             uint64_t *wp = &wps->wp[offset / bs->bl.zone_size];
-         -e "s#$SOCK_DIR#SOCK_DIR#g" \
+             if (!BDRV_ZT_IS_CONV(*wp)) {
-@@ -XXX,XX +XXX,XX @@ _filter_img_info()
+                 if (type & QEMU_AIO_ZONE_APPEND) {
- # human and json output
+@@ -XXX,XX +XXX,XX @@ out:
- _filter_qemu_img_map()
+                     *wp = offset + bytes;
- {
+                 }
-+    # Assuming the data_file value in $IMGOPTS contains a '$TEST_IMG',
+             }
-+    # create a filter that replaces the data file name by $TEST_IMG.
+-        }
-+    # Example:
+-    } else {
-+    #   In $IMGOPTS: 'data_file=$TEST_IMG.data_file'
+-        if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
-+    #   Then data_file_pattern == '\(.*\).data_file'
+-            bs->bl.zoned != BLK_Z_NONE) {
-+    #   And  data_file_filter  == -e 's#\(.*\).data_file#\1#
++        } else {
-+    data_file_filter=()
+             update_zones_wp(bs, s->fd, 0, 1);
-+    if data_file_pattern=$(_get_data_file '\\(.*\\)'); then
+         }
-+        data_file_filter=(-e "s#$data_file_pattern#\\1#")
+-    }
-+    fi
-+
+-    if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
-     $SED -e 's/\([0-9a-fx]* *[0-9a-fx]* *\)[0-9a-fx]* */\1/g' \
+-        bs->blk.zoned != BLK_Z_NONE) {
-         -e 's/"offset": [0-9]\+/"offset": OFFSET/g' \
+         qemu_co_mutex_unlock(&wps->colock);
--        -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt
+     }
-+        -e 's/Mapped to *//' \
+-}
-+        "${data_file_filter[@]}" \
+ #endif
-+        | _filter_testdir | _filter_imgfmt
+     return ret;
  }
  _filter_nbd()
 diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/common.rc
 +++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ _stop_nbd_server()
      fi
  }
 +# Gets the data_file value from IMGOPTS and replaces the '$TEST_IMG'
 +# pattern by '$1'
 +# Caution: The replacement is done with sed, so $1 must be escaped
 +#          properly.  (The delimiter is '#'.)
 +_get_data_file()
 +{
 +    if ! echo "$IMGOPTS" | grep -q 'data_file='; then
 +        return 1
 +    fi
 +
 +    echo "$IMGOPTS" | sed -e 's/.*data_file=\([^,]*\).*/\1/' \
 +                    | sed -e "s#\\\$TEST_IMG#$1#"
 +}
 +
  _make_test_img()
  {
      # extra qemu-img options can be added by tests
@@ -XXX,XX +XXX,XX @@ _make_test_img()
      fi
      if [ -n "$IMGOPTS" ]; then
 -        optstr=$(_optstr_add "$optstr" "$IMGOPTS")
 +        imgopts_expanded=$(echo "$IMGOPTS" | sed -e "s#\\\$TEST_IMG#$img_name#")
 +        optstr=$(_optstr_add "$optstr" "$imgopts_expanded")
      fi
      if [ -n "$IMGKEYSECRET" ]; then
          object_options="--object secret,id=keysec0,data=$IMGKEYSECRET"
@@ -XXX,XX +XXX,XX @@ _rm_test_img()
          # Remove all the extents for vmdk
          "$QEMU_IMG" info "$img" 2>/dev/null | grep 'filename:' | cut -f 2 -d: \
              | xargs -I {} rm -f "{}"
 +    elif [ "$IMGFMT" = "qcow2" ]; then
 +        # Remove external data file
 +        if data_file=$(_get_data_file "$img"); then
 +            rm -f "$data_file"
 +        fi
      fi
      rm -f "$img"
  }
 --
-.24.1
+.41.0

-[PULL 30/34] block: introduce compress filter driver
+[PULL 14/14] tests/file-io-error: New test
-From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
+This is a regression test for
 https://bugzilla.redhat.com/show_bug.cgi?id=2234374.
-Allow writing all the data compressed through the filter driver.
+All this test needs to do is trigger an I/O error inside of file-posix
-The written data will be aligned by the cluster size.
+(specifically raw_co_prw()).  One reliable way to do this without
-Based on the QEMU current implementation, that data can be written to
+requiring special privileges is to use a FUSE export, which allows us to
-unallocated clusters only. May be used for a backup job.
+inject any error that we want, e.g. via blkdebug.
-Suggested-by: Max Reitz <mreitz@redhat.com>
+Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
-Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
+Message-Id: <20230824155345.109765-6-hreitz@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+[hreitz: Fixed test to be skipped when there is no FUSE support, to
-Message-id: 1575288906-551879-2-git-send-email-andrey.shinkevich@virtuozzo.com
+         suppress fusermount's allow_other warning, and to be skipped
-[mreitz: Replace NULL bdrv_get_format_name() by "(no format)"]
+         with $IMGOPTSSYNTAX enabled]
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
 ---
- block/Makefile.objs     |   1 +
+ tests/qemu-iotests/tests/file-io-error     | 119 +++++++++++++++++++++
- block/filter-compress.c | 168 ++++++++++++++++++++++++++++++++++++++++
+ tests/qemu-iotests/tests/file-io-error.out |  33 ++++++
- qapi/block-core.json    |  10 ++-
+files changed, 152 insertions(+)
-files changed, 175 insertions(+), 4 deletions(-)
+ create mode 100755 tests/qemu-iotests/tests/file-io-error
- create mode 100644 block/filter-compress.c
+ create mode 100644 tests/qemu-iotests/tests/file-io-error.out
-diff --git a/block/Makefile.objs b/block/Makefile.objs
+diff --git a/tests/qemu-iotests/tests/file-io-error b/tests/qemu-iotests/tests/file-io-error
-index XXXXXXX..XXXXXXX 100644
+new file mode 100755
---- a/block/Makefile.objs
+index XXXXXXX..XXXXXXX
-+++ b/block/Makefile.objs
+--- /dev/null
-@@ -XXX,XX +XXX,XX @@ block-obj-y += crypto.o
++++ b/tests/qemu-iotests/tests/file-io-error
+@@ -XXX,XX +XXX,XX @@
- block-obj-y += aio_task.o
++#!/usr/bin/env bash
- block-obj-y += backup-top.o
++# group: rw
-+block-obj-y += filter-compress.o
++#
++# Produce an I/O error in file-posix, and hope that it is not catastrophic.
- common-obj-y += stream.o
++# Regression test for: https://bugzilla.redhat.com/show_bug.cgi?id=2234374
++#
-diff --git a/block/filter-compress.c b/block/filter-compress.c
++# Copyright (C) 2023 Red Hat, Inc.
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +#
 +
 +seq=$(basename "$0")
 +echo "QA output created by $seq"
 +
 +status=1    # failure is the default!
 +
 +_cleanup()
 +{
 +    _cleanup_qemu
 +    rm -f "$TEST_DIR/fuse-export"
 +}
 +trap "_cleanup; exit \$status" 0 1 2 3 15
 +
 +# get standard environment, filters and checks
 +. ../common.rc
 +. ../common.filter
 +. ../common.qemu
 +
 +# Format-agnostic (we do not use any), but we do test the file protocol
 +_supported_proto file
 +_require_drivers blkdebug null-co
 +
 +if [ "$IMGOPTSSYNTAX" = "true" ]; then
 +    # We need `$QEMU_IO -f file` to work; IMGOPTSSYNTAX uses --image-opts,
 +    # breaking -f.
 +    _unsupported_fmt $IMGFMT
 +fi
 +
 +# This is a regression test of a bug in which flie-posix would access zone
 +# information in case of an I/O error even when there is no zone information,
 +# resulting in a division by zero.
 +# To reproduce the problem, we need to trigger an I/O error inside of
 +# file-posix, which can be done (rootless) by providing a FUSE export that
 +# presents only errors when accessed.
 +
 +_launch_qemu
 +_send_qemu_cmd $QEMU_HANDLE \
 +    "{'execute': 'qmp_capabilities'}" \
 +    'return'
 +
 +_send_qemu_cmd $QEMU_HANDLE \
 +    "{'execute': 'blockdev-add',
 +      'arguments': {
 +          'driver': 'blkdebug',
 +          'node-name': 'node0',
 +          'inject-error': [{'event': 'none'}],
 +          'image': {
 +              'driver': 'null-co'
 +          }
 +      }}" \
 +    'return'
 +
 +# FUSE mountpoint must exist and be a regular file
 +touch "$TEST_DIR/fuse-export"
 +
 +# The grep -v to filter fusermount's (benign) error when /etc/fuse.conf does
 +# not contain user_allow_other and the subsequent check for missing FUSE support
 +# have both been taken from iotest 308.
 +output=$(_send_qemu_cmd $QEMU_HANDLE \
 +    "{'execute': 'block-export-add',
 +      'arguments': {
 +          'id': 'exp0',
 +          'type': 'fuse',
 +          'node-name': 'node0',
 +          'mountpoint': '$TEST_DIR/fuse-export',
 +          'writable': true
 +      }}" \
 +    'return' \
 +    | grep -v 'option allow_other only allowed if')
 +
 +if echo "$output" | grep -q "Parameter 'type' does not accept value 'fuse'"; then
 +    _notrun 'No FUSE support'
 +fi
 +echo "$output"
 +
 +echo
 +# This should fail, but gracefully, i.e. just print an I/O error, not crash.
 +$QEMU_IO -f file -c 'write 0 64M' "$TEST_DIR/fuse-export" | _filter_qemu_io
 +echo
 +
 +_send_qemu_cmd $QEMU_HANDLE \
 +    "{'execute': 'block-export-del',
 +      'arguments': {'id': 'exp0'}}" \
 +    'return'
 +
 +_send_qemu_cmd $QEMU_HANDLE \
 +    '' \
 +    'BLOCK_EXPORT_DELETED'
 +
 +_send_qemu_cmd $QEMU_HANDLE \
 +    "{'execute': 'blockdev-del',
 +      'arguments': {'node-name': 'node0'}}" \
 +    'return'
 +
 +# success, all done
 +echo "*** done"
 +rm -f $seq.full
 +status=0
 diff --git a/tests/qemu-iotests/tests/file-io-error.out b/tests/qemu-iotests/tests/file-io-error.out
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
-+++ b/block/filter-compress.c
++++ b/tests/qemu-iotests/tests/file-io-error.out
 @@ -XXX,XX +XXX,XX @@
-+/*
++QA output created by file-io-error
-+ * Compress filter block driver
++{'execute': 'qmp_capabilities'}
-+ *
++{"return": {}}
-+ * Copyright (c) 2019 Virtuozzo International GmbH
++{'execute': 'blockdev-add',
-+ *
++      'arguments': {
-+ * Author:
++          'driver': 'blkdebug',
-+ *   Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
++          'node-name': 'node0',
-+ *   (based on block/copy-on-read.c by Max Reitz)
++          'inject-error': [{'event': 'none'}],
-+ *
++          'image': {
-+ * This program is free software; you can redistribute it and/or
++              'driver': 'null-co'
-+ * modify it under the terms of the GNU General Public License as
++          }
-+ * published by the Free Software Foundation; either version 2 or
++      }}
-+ * (at your option) any later version of the License.
++{"return": {}}
-+ *
++{'execute': 'block-export-add',
-+ * This program is distributed in the hope that it will be useful,
++      'arguments': {
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++          'id': 'exp0',
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++          'type': 'fuse',
-+ * GNU General Public License for more details.
++          'node-name': 'node0',
-+ *
++          'mountpoint': 'TEST_DIR/fuse-export',
-+ * You should have received a copy of the GNU General Public License
++          'writable': true
-+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
++      }}
-+ */
++{"return": {}}
 +
-+#include "qemu/osdep.h"
++write failed: Input/output error
 +#include "block/block_int.h"
 +#include "qemu/module.h"
 +#include "qapi/error.h"
 +
-+
++{'execute': 'block-export-del',
-+static int compress_open(BlockDriverState *bs, QDict *options, int flags,
++      'arguments': {'id': 'exp0'}}
-+                         Error **errp)
++{"return": {}}
-+{
++{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "exp0"}}
-+    bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file, false,
++{'execute': 'blockdev-del',
-+                               errp);
++      'arguments': {'node-name': 'node0'}}
-+    if (!bs->file) {
++{"return": {}}
-+        return -EINVAL;
++*** done
 +    }
 +
 +    if (!bs->file->bs->drv || !block_driver_can_compress(bs->file->bs->drv)) {
 +        error_setg(errp,
 +                   "Compression is not supported for underlying format: %s",
 +                   bdrv_get_format_name(bs->file->bs) ?: "(no format)");
 +
 +        return -ENOTSUP;
 +    }
 +
 +    bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |
 +        (BDRV_REQ_FUA & bs->file->bs->supported_write_flags);
 +
 +    bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |
 +        ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
 +            bs->file->bs->supported_zero_flags);
 +
 +    return 0;
 +}
 +
 +
 +static int64_t compress_getlength(BlockDriverState *bs)
 +{
 +    return bdrv_getlength(bs->file->bs);
 +}
 +
 +
 +static int coroutine_fn compress_co_preadv_part(BlockDriverState *bs,
 +                                                uint64_t offset, uint64_t bytes,
 +                                                QEMUIOVector *qiov,
 +                                                size_t qiov_offset,
 +                                                int flags)
 +{
 +    return bdrv_co_preadv_part(bs->file, offset, bytes, qiov, qiov_offset,
 +                               flags);
 +}
 +
 +
 +static int coroutine_fn compress_co_pwritev_part(BlockDriverState *bs,
 +                                                 uint64_t offset,
 +                                                 uint64_t bytes,
 +                                                 QEMUIOVector *qiov,
 +                                                 size_t qiov_offset, int flags)
 +{
 +    return bdrv_co_pwritev_part(bs->file, offset, bytes, qiov, qiov_offset,
 +                                flags | BDRV_REQ_WRITE_COMPRESSED);
 +}
 +
 +
 +static int coroutine_fn compress_co_pwrite_zeroes(BlockDriverState *bs,
 +                                                  int64_t offset, int bytes,
 +                                                  BdrvRequestFlags flags)
 +{
 +    return bdrv_co_pwrite_zeroes(bs->file, offset, bytes, flags);
 +}
 +
 +
 +static int coroutine_fn compress_co_pdiscard(BlockDriverState *bs,
 +                                             int64_t offset, int bytes)
 +{
 +    return bdrv_co_pdiscard(bs->file, offset, bytes);
 +}
 +
 +
 +static void compress_refresh_limits(BlockDriverState *bs, Error **errp)
 +{
 +    BlockDriverInfo bdi;
 +    int ret;
 +
 +    if (!bs->file) {
 +        return;
 +    }
 +
 +    ret = bdrv_get_info(bs->file->bs, &bdi);
 +    if (ret < 0 || bdi.cluster_size == 0) {
 +        return;
 +    }
 +
 +    bs->bl.request_alignment = bdi.cluster_size;
 +}
 +
 +
 +static void compress_eject(BlockDriverState *bs, bool eject_flag)
 +{
 +    bdrv_eject(bs->file->bs, eject_flag);
 +}
 +
 +
 +static void compress_lock_medium(BlockDriverState *bs, bool locked)
 +{
 +    bdrv_lock_medium(bs->file->bs, locked);
 +}
 +
 +
 +static bool compress_recurse_is_first_non_filter(BlockDriverState *bs,
 +                                                 BlockDriverState *candidate)
 +{
 +    return bdrv_recurse_is_first_non_filter(bs->file->bs, candidate);
 +}
 +
 +
 +static BlockDriver bdrv_compress = {
 +    .format_name                        = "compress",
 +
 +    .bdrv_open                          = compress_open,
 +    .bdrv_child_perm                    = bdrv_filter_default_perms,
 +
 +    .bdrv_getlength                     = compress_getlength,
 +
 +    .bdrv_co_preadv_part                = compress_co_preadv_part,
 +    .bdrv_co_pwritev_part               = compress_co_pwritev_part,
 +    .bdrv_co_pwrite_zeroes              = compress_co_pwrite_zeroes,
 +    .bdrv_co_pdiscard                   = compress_co_pdiscard,
 +    .bdrv_refresh_limits                = compress_refresh_limits,
 +
 +    .bdrv_eject                         = compress_eject,
 +    .bdrv_lock_medium                   = compress_lock_medium,
 +
 +    .bdrv_co_block_status               = bdrv_co_block_status_from_file,
 +
 +    .bdrv_recurse_is_first_non_filter   = compress_recurse_is_first_non_filter,
 +
 +    .has_variable_length                = true,
 +    .is_filter                          = true,
 +};
 +
 +static void bdrv_compress_init(void)
 +{
 +    bdrv_register(&bdrv_compress);
 +}
 +
 +block_init(bdrv_compress_init);
 diff --git a/qapi/block-core.json b/qapi/block-core.json
 index XXXXXXX..XXXXXXX 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
  # @copy-on-read: Since 3.0
  # @blklogwrites: Since 3.0
  # @blkreplay: Since 4.2
 +# @compress: Since 5.0
  #
  # Since: 2.9
  ##
  { 'enum': 'BlockdevDriver',
    'data': [ 'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs',
 -            'cloop', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps', 'gluster',
 -            'host_cdrom', 'host_device', 'http', 'https', 'iscsi', 'luks',
 -            'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow',
 -            'qcow2', 'qed', 'quorum', 'raw', 'rbd',
 +            'cloop', 'compress', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps',
 +            'gluster', 'host_cdrom', 'host_device', 'http', 'https', 'iscsi',
 +            'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels',
 +            'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
              { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' },
              'sheepdog',
              'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
@@ -XXX,XX +XXX,XX @@
        'blkreplay':  'BlockdevOptionsBlkreplay',
        'bochs':      'BlockdevOptionsGenericFormat',
        'cloop':      'BlockdevOptionsGenericFormat',
 +      'compress':   'BlockdevOptionsGenericFormat',
        'copy-on-read':'BlockdevOptionsGenericFormat',
        'dmg':        'BlockdevOptionsGenericFormat',
        'file':       'BlockdevOptionsFile',
 --
-.24.1
+.41.0

The following changes since commit f17783e706ab9c7b3a2b69cf48e4f0ba40664f54:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20191220' into staging (2020-01-03 18:50:33 +0000)

are available in the Git repository at:

https://github.com/XanClic/qemu.git tags/pull-block-2020-01-06

for you to fetch changes up to 503ca1262bab2c11c533a4816d1ff4297d4f58a6:

backup-top: Begin drain earlier (2020-01-06 14:26:23 +0100)

----------------------------------------------------------------
Block patches:
- Minor fixes and tests from the freeze period (too minor to be included
  in 4.2)
- Allow many bash iotests to test qcow2's external data file feature
- Add compress filter driver
- Fix Python iotests after 6f6e1698a6
- Fix for the backup job

----------------------------------------------------------------
Andrey Shinkevich (3):
  block: introduce compress filter driver
  qcow2: Allow writing compressed data of multiple clusters
  tests/qemu-iotests: add case to write compressed data of multiple
    clusters

Max Reitz (28):
  block: Add bdrv_qapi_perm_to_blk_perm()
  block: Use bdrv_qapi_perm_to_blk_perm()
  blkdebug: Allow taking/unsharing permissions
  iotests: Add @error to wait_until_completed
  iotests: Add test for failing mirror complete
  iotests: s/qocw2/qcow2/
  iotests/qcow2.py: Add dump-header-exts
  iotests/qcow2.py: Split feature fields into bits
  iotests: Add _filter_json_filename
  iotests: Filter refcount_order in 036
  iotests: Replace IMGOPTS by _unsupported_imgopts
  iotests: Drop compat=1.1 in 050
  iotests: Let _make_test_img parse its parameters
  iotests: Add -o and --no-opts to _make_test_img
  iotests: Inject space into -ocompat=0.10 in 051
  iotests: Replace IMGOPTS= by -o
  iotests: Replace IMGOPTS='' by --no-opts
  iotests: Drop IMGOPTS use in 267
  iotests: Avoid qemu-img create
  iotests: Use _rm_test_img for deleting test images
  iotests: Avoid cp/mv of test images
  iotests: Make 091 work with data_file
  iotests: Make 110 work with data_file
  iotests: Make 137 work with data_file
  iotests: Make 198 work with data_file
  iotests: Disable data_file where it cannot be used
  iotests: Allow check -o data_file
  backup-top: Begin drain earlier

PanNengyuan (1):
  throttle-groups: fix memory leak in throttle_group_set_limit:

Philippe Mathieu-Daudé (1):
  tests/qemu-iotests: Update tests to recent desugarized -accel option

Vladimir Sementsov-Ogievskiy (1):
  qcow2-bitmaps: fix qcow2_can_store_new_dirty_bitmap

-- 
2.24.1

We need some way to correlate QAPI BlockPermission values with
BLK_PERM_* flags.  We could:

(1) have the same order in the QAPI definition as the the BLK_PERM_*
    flags are in LSb-first order.  However, then there is no guarantee
    that they actually match (e.g. when someone modifies the QAPI schema
    without thinking of the BLK_PERM_* definitions).
    We could add static assertions, but these would break what’s good
    about this solution, namely its simplicity.

(2) define the BLK_PERM_* flags based on the BlockPermission values.
    But this way whenever someone were to modify the QAPI order
    (perfectly sensible in theory), the BLK_PERM_* values would change.
    Because these values are used for file locking, this might break
    file locking between different qemu versions.

Therefore, go the slightly more cumbersome way: Add a function to
translate from the QAPI constants to the BLK_PERM_* flags.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20191108123455.39445-2-mreitz@redhat.com
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block.c               | 18 ++++++++++++++++++
 include/block/block.h |  1 +
 2 files changed, 19 insertions(+)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c,
     *nshared = shared;
 }
 
+uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm)
+{
+    static const uint64_t permissions[] = {
+        [BLOCK_PERMISSION_CONSISTENT_READ]  = BLK_PERM_CONSISTENT_READ,
+        [BLOCK_PERMISSION_WRITE]            = BLK_PERM_WRITE,
+        [BLOCK_PERMISSION_WRITE_UNCHANGED]  = BLK_PERM_WRITE_UNCHANGED,
+        [BLOCK_PERMISSION_RESIZE]           = BLK_PERM_RESIZE,
+        [BLOCK_PERMISSION_GRAPH_MOD]        = BLK_PERM_GRAPH_MOD,
+    };
+
+    QEMU_BUILD_BUG_ON(ARRAY_SIZE(permissions) != BLOCK_PERMISSION__MAX);
+    QEMU_BUILD_BUG_ON(1UL << ARRAY_SIZE(permissions) != BLK_PERM_ALL + 1);
+
+    assert(qapi_perm < BLOCK_PERMISSION__MAX);
+
+    return permissions[qapi_perm];
+}
+
 static void bdrv_replace_child_noperm(BdrvChild *child,
                                       BlockDriverState *new_bs)
 {
diff --git a/include/block/block.h b/include/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ enum {
 };
 
 char *bdrv_perm_names(uint64_t perm);
+uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm);
 
 /* disk I/O throttling */
 void bdrv_init(void);
-- 
2.24.1

We can save some LoC in xdbg_graph_add_edge() by using
bdrv_qapi_perm_to_blk_perm().

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20191108123455.39445-3-mreitz@redhat.com
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block.c | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ static void xdbg_graph_add_node(XDbgBlockGraphConstructor *gr, void *node,
 static void xdbg_graph_add_edge(XDbgBlockGraphConstructor *gr, void *parent,
                                 const BdrvChild *child)
 {
-    typedef struct {
-        unsigned int flag;
-        BlockPermission num;
-    } PermissionMap;
-
-    static const PermissionMap permissions[] = {
-        { BLK_PERM_CONSISTENT_READ, BLOCK_PERMISSION_CONSISTENT_READ },
-        { BLK_PERM_WRITE,           BLOCK_PERMISSION_WRITE },
-        { BLK_PERM_WRITE_UNCHANGED, BLOCK_PERMISSION_WRITE_UNCHANGED },
-        { BLK_PERM_RESIZE,          BLOCK_PERMISSION_RESIZE },
-        { BLK_PERM_GRAPH_MOD,       BLOCK_PERMISSION_GRAPH_MOD },
-        { 0, 0 }
-    };
-    const PermissionMap *p;
+    BlockPermission qapi_perm;
     XDbgBlockGraphEdge *edge;
 
-    QEMU_BUILD_BUG_ON(1UL << (ARRAY_SIZE(permissions) - 1) != BLK_PERM_ALL + 1);
-
     edge = g_new0(XDbgBlockGraphEdge, 1);
 
     edge->parent = xdbg_graph_node_num(gr, parent);
     edge->child = xdbg_graph_node_num(gr, child->bs);
     edge->name = g_strdup(child->name);
 
-    for (p = permissions; p->flag; p++) {
-        if (p->flag & child->perm) {
-            QAPI_LIST_ADD(edge->perm, p->num);
+    for (qapi_perm = 0; qapi_perm < BLOCK_PERMISSION__MAX; qapi_perm++) {
+        uint64_t flag = bdrv_qapi_perm_to_blk_perm(qapi_perm);
+
+        if (flag & child->perm) {
+            QAPI_LIST_ADD(edge->perm, qapi_perm);
         }
-        if (p->flag & child->shared_perm) {
-            QAPI_LIST_ADD(edge->shared_perm, p->num);
+        if (flag & child->shared_perm) {
+            QAPI_LIST_ADD(edge->shared_perm, qapi_perm);
         }
     }
 
-- 
2.24.1

Sometimes it is useful to be able to add a node to the block graph that
takes or unshare a certain set of permissions for debugging purposes.
This patch adds this capability to blkdebug.

(Note that you cannot make blkdebug release or share permissions that it
needs to take or cannot share, because this might result in assertion
failures in the block layer.  But if the blkdebug node has no parents,
it will not take any permissions and share everything by default, so you
can then freely choose what permissions to take and share.)

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20191108123455.39445-4-mreitz@redhat.com
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/blkdebug.c     | 93 +++++++++++++++++++++++++++++++++++++++++++-
 qapi/block-core.json | 14 ++++++-
 2 files changed, 105 insertions(+), 2 deletions(-)

diff --git a/block/blkdebug.c b/block/blkdebug.c
index XXXXXXX..XXXXXXX 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/cutils.h"
 #include "qemu/config-file.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "qemu/module.h"
 #include "qemu/option.h"
+#include "qapi/qapi-visit-block-core.h"
 #include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qstring.h"
+#include "qapi/qobject-input-visitor.h"
 #include "sysemu/qtest.h"
 
 typedef struct BDRVBlkdebugState {
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVBlkdebugState {
     uint64_t opt_discard;
     uint64_t max_discard;
 
+    uint64_t take_child_perms;
+    uint64_t unshare_child_perms;
+
     /* For blkdebug_refresh_filename() */
     char *config_file;
 
@@ -XXX,XX +XXX,XX @@ static void blkdebug_parse_filename(const char *filename, QDict *options,
     qdict_put_str(options, "x-image", filename);
 }
 
+static int blkdebug_parse_perm_list(uint64_t *dest, QDict *options,
+                                    const char *prefix, Error **errp)
+{
+    int ret = 0;
+    QDict *subqdict = NULL;
+    QObject *crumpled_subqdict = NULL;
+    Visitor *v = NULL;
+    BlockPermissionList *perm_list = NULL, *element;
+    Error *local_err = NULL;
+
+    *dest = 0;
+
+    qdict_extract_subqdict(options, &subqdict, prefix);
+    if (!qdict_size(subqdict)) {
+        goto out;
+    }
+
+    crumpled_subqdict = qdict_crumple(subqdict, errp);
+    if (!crumpled_subqdict) {
+        ret = -EINVAL;
+        goto out;
+    }
+
+    v = qobject_input_visitor_new(crumpled_subqdict);
+    visit_type_BlockPermissionList(v, NULL, &perm_list, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        ret = -EINVAL;
+        goto out;
+    }
+
+    for (element = perm_list; element; element = element->next) {
+        *dest |= bdrv_qapi_perm_to_blk_perm(element->value);
+    }
+
+out:
+    qapi_free_BlockPermissionList(perm_list);
+    visit_free(v);
+    qobject_unref(subqdict);
+    qobject_unref(crumpled_subqdict);
+    return ret;
+}
+
+static int blkdebug_parse_perms(BDRVBlkdebugState *s, QDict *options,
+                                Error **errp)
+{
+    int ret;
+
+    ret = blkdebug_parse_perm_list(&s->take_child_perms, options,
+                                   "take-child-perms.", errp);
+    if (ret < 0) {
+        return ret;
+    }
+
+    ret = blkdebug_parse_perm_list(&s->unshare_child_perms, options,
+                                   "unshare-child-perms.", errp);
+    if (ret < 0) {
+        return ret;
+    }
+
+    return 0;
+}
+
 static QemuOptsList runtime_opts = {
     .name = "blkdebug",
     .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
@@ -XXX,XX +XXX,XX @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags,
     /* Set initial state */
     s->state = 1;
 
+    /* Parse permissions modifiers before opening the image file */
+    ret = blkdebug_parse_perms(s, options, errp);
+    if (ret < 0) {
+        goto out;
+    }
+
     /* Open the image file */
     bs->file = bdrv_open_child(qemu_opt_get(opts, "x-image"), options, "image",
                                bs, &child_file, false, &local_err);
@@ -XXX,XX +XXX,XX @@ static int blkdebug_reopen_prepare(BDRVReopenState *reopen_state,
     return 0;
 }
 
+static void blkdebug_child_perm(BlockDriverState *bs, BdrvChild *c,
+                                const BdrvChildRole *role,
+                                BlockReopenQueue *reopen_queue,
+                                uint64_t perm, uint64_t shared,
+                                uint64_t *nperm, uint64_t *nshared)
+{
+    BDRVBlkdebugState *s = bs->opaque;
+
+    bdrv_filter_default_perms(bs, c, role, reopen_queue, perm, shared,
+                              nperm, nshared);
+
+    *nperm |= s->take_child_perms;
+    *nshared &= ~s->unshare_child_perms;
+}
+
 static const char *const blkdebug_strong_runtime_opts[] = {
     "config",
     "inject-error.",
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_blkdebug = {
     .bdrv_file_open         = blkdebug_open,
     .bdrv_close             = blkdebug_close,
     .bdrv_reopen_prepare    = blkdebug_reopen_prepare,
-    .bdrv_child_perm        = bdrv_filter_default_perms,
+    .bdrv_child_perm        = blkdebug_child_perm,
 
     .bdrv_getlength         = blkdebug_getlength,
     .bdrv_refresh_filename  = blkdebug_refresh_filename,
diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 #
 # @set-state:       array of state-change descriptions
 #
+# @take-child-perms: Permissions to take on @image in addition to what
+#                    is necessary anyway (which depends on how the
+#                    blkdebug node is used).  Defaults to none.
+#                    (since 5.0)
+#
+# @unshare-child-perms: Permissions not to share on @image in addition
+#                       to what cannot be shared anyway (which depends
+#                       on how the blkdebug node is used).  Defaults
+#                       to none.  (since 5.0)
+#
 # Since: 2.9
 ##
 { 'struct': 'BlockdevOptionsBlkdebug',
@@ -XXX,XX +XXX,XX @@
             '*opt-write-zero': 'int32', '*max-write-zero': 'int32',
             '*opt-discard': 'int32', '*max-discard': 'int32',
             '*inject-error': ['BlkdebugInjectErrorOptions'],
-            '*set-state': ['BlkdebugSetStateOptions'] } }
+            '*set-state': ['BlkdebugSetStateOptions'],
+            '*take-child-perms': ['BlockPermission'],
+            '*unshare-child-perms': ['BlockPermission'] } }
 
 ##
 # @BlockdevOptionsBlklogwrites:
-- 
2.24.1

Callers can use this new parameter to expect failure during the
completion process.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20191108123455.39445-5-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/iotests.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):
         self.assert_no_active_block_jobs()
         return result
 
-    def wait_until_completed(self, drive='drive0', check_offset=True, wait=60.0):
+    def wait_until_completed(self, drive='drive0', check_offset=True, wait=60.0,
+                             error=None):
         '''Wait for a block job to finish, returning the event'''
         while True:
             for event in self.vm.get_qmp_events(wait=wait):
                 if event['event'] == 'BLOCK_JOB_COMPLETED':
                     self.assert_qmp(event, 'data/device', drive)
-                    self.assert_qmp_absent(event, 'data/error')
-                    if check_offset:
-                        self.assert_qmp(event, 'data/offset', event['data']['len'])
+                    if error is None:
+                        self.assert_qmp_absent(event, 'data/error')
+                        if check_offset:
+                            self.assert_qmp(event, 'data/offset',
+                                            event['data']['len'])
+                    else:
+                        self.assert_qmp(event, 'data/error', error)
                     self.assert_no_active_block_jobs()
                     return event
                 elif event['event'] == 'JOB_STATUS_CHANGE':
@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):
         self.assert_qmp(event, 'data/type', 'mirror')
         self.assert_qmp(event, 'data/offset', event['data']['len'])
 
-    def complete_and_wait(self, drive='drive0', wait_ready=True):
+    def complete_and_wait(self, drive='drive0', wait_ready=True,
+                          completion_error=None):
         '''Complete a block job and wait for it to finish'''
         if wait_ready:
             self.wait_ready(drive=drive)
@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):
         result = self.vm.qmp('block-job-complete', device=drive)
         self.assert_qmp(result, 'return', {})
 
-        event = self.wait_until_completed(drive=drive)
+        event = self.wait_until_completed(drive=drive, error=completion_error)
         self.assert_qmp(event, 'data/type', 'mirror')
 
     def pause_wait(self, job_id='job0'):
-- 
2.24.1

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Tested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20191108123455.39445-6-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/041     | 44 ++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/041.out |  4 ++--
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -XXX,XX +XXX,XX @@ class TestOrphanedSource(iotests.QMPTestCase):
                              target='dest-ro')
         self.assert_qmp(result, 'error/class', 'GenericError')
 
+    def test_failing_permission_in_complete(self):
+        self.assert_no_active_block_jobs()
+
+        # Unshare consistent-read on the target
+        # (The mirror job does not care)
+        result = self.vm.qmp('blockdev-add',
+                             driver='blkdebug',
+                             node_name='dest-perm',
+                             image='dest',
+                             unshare_child_perms=['consistent-read'])
+        self.assert_qmp(result, 'return', {})
+
+        result = self.vm.qmp('blockdev-mirror', job_id='job', device='src',
+                             sync='full', target='dest',
+                             filter_node_name='mirror-filter')
+        self.assert_qmp(result, 'return', {})
+
+        # Require consistent-read on the source
+        # (We can only add this node once the job has started, or it
+        # will complain that it does not want to run on non-root nodes)
+        result = self.vm.qmp('blockdev-add',
+                             driver='blkdebug',
+                             node_name='src-perm',
+                             image='src',
+                             take_child_perms=['consistent-read'])
+        self.assert_qmp(result, 'return', {})
+
+        # While completing, mirror will attempt to replace src by
+        # dest, which must fail because src-perm requires
+        # consistent-read but dest-perm does not share it; thus
+        # aborting the job when it is supposed to complete
+        self.complete_and_wait('job',
+                               completion_error='Operation not permitted')
+
+        # Assert that all of our nodes are still there (except for the
+        # mirror filter, which should be gone despite the failure)
+        nodes = self.vm.qmp('query-named-block-nodes')['return']
+        nodes = [node['node-name'] for node in nodes]
+
+        for expect in ('src', 'src-perm', 'dest', 'dest-perm'):
+            self.assertTrue(expect in nodes, '%s disappeared' % expect)
+        self.assertFalse('mirror-filter' in nodes,
+                         'Mirror filter node did not disappear')
+
 if __name__ == '__main__':
     iotests.main(supported_fmts=['qcow2', 'qed'],
                  supported_protocols=['file'])
diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/041.out
+++ b/tests/qemu-iotests/041.out
@@ -XXX,XX +XXX,XX @@
-..........................................................................................
+...........................................................................................
 ----------------------------------------------------------------------
-Ran 90 tests
+Ran 91 tests
 
 OK
-- 
2.24.1

From: PanNengyuan <pannengyuan@huawei.com>

This avoid a memory leak when qom-set is called to set throttle_group
limits, here is an easy way to reproduce:

1. run qemu-iotests as follow and check the result with asan:
       ./check -qcow2 184

Following is the asan output backtrack:
Direct leak of 912 byte(s) in 3 object(s) allocated from:
    #0 0xffff8d7ab3c3 in __interceptor_calloc   (/lib64/libasan.so.4+0xd33c3)
    #1 0xffff8d4c31cb in g_malloc0   (/lib64/libglib-2.0.so.0+0x571cb)
    #2 0x190c857 in qobject_input_start_struct  /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qapi/qobject-input-visitor.c:295
    #3 0x19070df in visit_start_struct   /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qapi/qapi-visit-core.c:49
    #4 0x1948b87 in visit_type_ThrottleLimits   qapi/qapi-visit-block-core.c:3759
    #5 0x17e4aa3 in throttle_group_set_limits   /mnt/sdc/qemu-master/qemu-4.2.0-rc0/block/throttle-groups.c:900
    #6 0x1650eff in object_property_set     /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/object.c:1272
    #7 0x1658517 in object_property_set_qobject   /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/qom-qobject.c:26
    #8 0x15880bb in qmp_qom_set  /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/qom-qmp-cmds.c:74
    #9 0x157e3e3 in qmp_marshal_qom_set  qapi/qapi-commands-qom.c:154

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: PanNengyuan <pannengyuan@huawei.com>
Message-id: 1574835614-42028-1-git-send-email-pannengyuan@huawei.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/throttle-groups.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index XXXXXXX..XXXXXXX 100644
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -XXX,XX +XXX,XX @@ static void throttle_group_set_limits(Object *obj, Visitor *v,
 {
     ThrottleGroup *tg = THROTTLE_GROUP(obj);
     ThrottleConfig cfg;
-    ThrottleLimits arg = { 0 };
-    ThrottleLimits *argp = &arg;
+    ThrottleLimits *argp;
     Error *local_err = NULL;
 
     visit_type_ThrottleLimits(v, name, &argp, &local_err);
@@ -XXX,XX +XXX,XX @@ static void throttle_group_set_limits(Object *obj, Visitor *v,
 unlock:
     qemu_mutex_unlock(&tg->lock);
 ret:
+    qapi_free_ThrottleLimits(argp);
     error_propagate(errp, local_err);
     return;
 }
-- 
2.24.1

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

qcow2_can_store_new_dirty_bitmap works wrong, as it considers only
bitmaps already stored in the qcow2 image and ignores persistent
BdrvDirtyBitmap objects.

So, let's instead count persistent BdrvDirtyBitmaps. We load all qcow2
bitmaps on open, so there should not be any bitmap in the image for
which we don't have BdrvDirtyBitmaps version. If it is - it's a kind of
corruption, and no reason to check for corruptions here (open() and
close() are better places for it).

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20191014115126.15360-2-vsementsov@virtuozzo.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2-bitmap.c | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -XXX,XX +XXX,XX @@ bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs,
                                                       Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
-    bool found;
-    Qcow2BitmapList *bm_list;
+    BdrvDirtyBitmap *bitmap;
+    uint64_t bitmap_directory_size = 0;
+    uint32_t nb_bitmaps = 0;
+
+    if (bdrv_find_dirty_bitmap(bs, name)) {
+        error_setg(errp, "Bitmap already exists: %s", name);
+        return false;
+    }
 
     if (s->qcow_version < 3) {
         /* Without autoclear_features, we would always have to assume
@@ -XXX,XX +XXX,XX @@ bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs,
         goto fail;
     }
 
-    if (s->nb_bitmaps == 0) {
-        return true;
+    FOR_EACH_DIRTY_BITMAP(bs, bitmap) {
+        if (bdrv_dirty_bitmap_get_persistence(bitmap)) {
+            nb_bitmaps++;
+            bitmap_directory_size +=
+                calc_dir_entry_size(strlen(bdrv_dirty_bitmap_name(bitmap)), 0);
+        }
     }
+    nb_bitmaps++;
+    bitmap_directory_size += calc_dir_entry_size(strlen(name), 0);
 
-    if (s->nb_bitmaps >= QCOW2_MAX_BITMAPS) {
+    if (nb_bitmaps > QCOW2_MAX_BITMAPS) {
         error_setg(errp,
                    "Maximum number of persistent bitmaps is already reached");
         goto fail;
     }
 
-    if (s->bitmap_directory_size + calc_dir_entry_size(strlen(name), 0) >
-        QCOW2_MAX_BITMAP_DIRECTORY_SIZE)
-    {
+    if (bitmap_directory_size > QCOW2_MAX_BITMAP_DIRECTORY_SIZE) {
         error_setg(errp, "Not enough space in the bitmap directory");
         goto fail;
     }
 
-    qemu_co_mutex_lock(&s->lock);
-    bm_list = bitmap_list_load(bs, s->bitmap_directory_offset,
-                               s->bitmap_directory_size, errp);
-    qemu_co_mutex_unlock(&s->lock);
-    if (bm_list == NULL) {
-        goto fail;
-    }
-
-    found = find_bitmap_by_name(bm_list, name);
-    bitmap_list_free(bm_list);
-    if (found) {
-        error_setg(errp, "Bitmap with the same name is already stored");
-        goto fail;
-    }
-
     return true;
 
 fail:
-- 
2.24.1

Probably due to blind copy-pasting, we have several instances of "qocw2"
in our iotests.  Fix them.

Reported-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20191107163708.833192-2-mreitz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/060 | 2 +-
 tests/qemu-iotests/061 | 2 +-
 tests/qemu-iotests/062 | 2 +-
 tests/qemu-iotests/066 | 2 +-
 tests/qemu-iotests/068 | 2 +-
 tests/qemu-iotests/108 | 2 +-
 tests/qemu-iotests/138 | 2 +-
 tests/qemu-iotests/261 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -XXX,XX +XXX,XX @@ _filter_io_error()
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/062
+++ b/tests/qemu-iotests/062
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
 
diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/066
+++ b/tests/qemu-iotests/066
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
 
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
 
diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/108
+++ b/tests/qemu-iotests/108
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/138
+++ b/tests/qemu-iotests/138
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
diff --git a/tests/qemu-iotests/261 b/tests/qemu-iotests/261
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/261
+++ b/tests/qemu-iotests/261
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# This tests qocw2-specific low-level functionality
+# This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-- 
2.24.1

This is useful for tests that want to whitelist fields from dump-header
(with grep) but still print all header extensions.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-3-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/qcow2.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/qcow2.py
+++ b/tests/qemu-iotests/qcow2.py
@@ -XXX,XX +XXX,XX @@ def cmd_dump_header(fd):
     h.dump()
     h.dump_extensions()
 
+def cmd_dump_header_exts(fd):
+    h = QcowHeader(fd)
+    h.dump_extensions()
+
 def cmd_set_header(fd, name, value):
     try:
         value = int(value, 0)
@@ -XXX,XX +XXX,XX @@ def cmd_set_feature_bit(fd, group, bit):
 
 cmds = [
     [ 'dump-header',          cmd_dump_header,          0, 'Dump image header and header extensions' ],
+    [ 'dump-header-exts',     cmd_dump_header_exts,     0, 'Dump image header extensions' ],
     [ 'set-header',           cmd_set_header,           2, 'Set a field in the header'],
     [ 'add-header-ext',       cmd_add_header_ext,       2, 'Add a header extension' ],
     [ 'add-header-ext-stdio', cmd_add_header_ext_stdio, 1, 'Add a header extension, data from stdin' ],
-- 
2.24.1

Print the feature fields as a set of bits so that filtering is easier.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-4-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/031.out  | 36 +++++++++----------
 tests/qemu-iotests/036.out  | 18 +++++-----
 tests/qemu-iotests/039.out  | 22 ++++++------
 tests/qemu-iotests/060.out  | 20 +++++------
 tests/qemu-iotests/061.out  | 72 ++++++++++++++++++-------------------
 tests/qemu-iotests/137.out  |  2 +-
 tests/qemu-iotests/qcow2.py | 18 +++++++---
 7 files changed, 99 insertions(+), 89 deletions(-)

diff --git a/tests/qemu-iotests/031.out b/tests/qemu-iotests/031.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/031.out
+++ b/tests/qemu-iotests/031.out
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             104
 
diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/036.out
+++ b/tests/qemu-iotests/036.out
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x8000000000000000
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     [63]
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x8000000000000000
+incompatible_features     []
+compatible_features       []
+autoclear_features        [63]
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             104
 
diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/039.out
+++ b/tests/qemu-iotests/039.out
@@ -XXX,XX +XXX,XX @@ QA output created by 039
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-incompatible_features     0x0
+incompatible_features     []
 No errors were found on the image.
 
 == Creating a dirty image file ==
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     0x1
+incompatible_features     [0]
 ERROR cluster 5 refcount=0 reference=1
 ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
 
@@ -XXX,XX +XXX,XX @@ Data may be corrupted, or further writes to the image may corrupt it.
 == Read-only access must still work ==
 read 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-incompatible_features     0x1
+incompatible_features     [0]
 
 == Repairing the image file must succeed ==
 ERROR cluster 5 refcount=0 reference=1
@@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired:
 
 Double checking the fixed image now...
 No errors were found on the image.
-incompatible_features     0x0
+incompatible_features     []
 
 == Data should still be accessible after repair ==
 read 512/512 bytes at offset 0
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     0x1
+incompatible_features     [0]
 ERROR cluster 5 refcount=0 reference=1
 Rebuilding refcount structure
 Repairing cluster 1 refcount=1 reference=0
 Repairing cluster 2 refcount=1 reference=0
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-incompatible_features     0x0
+incompatible_features     []
 
 == Creating an image file with lazy_refcounts=off ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     0x0
+incompatible_features     []
 No errors were found on the image.
 
 == Committing to a backing file with lazy_refcounts=on ==
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 Image committed.
-incompatible_features     0x0
-incompatible_features     0x0
+incompatible_features     []
+incompatible_features     []
 No errors were found on the image.
 No errors were found on the image.
 
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     0x1
+incompatible_features     [0]
 ERROR cluster 5 refcount=0 reference=1
 ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
 
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     0x0
+incompatible_features     []
 No errors were found on the image.
 *** done
diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/060.out
+++ b/tests/qemu-iotests/060.out
@@ -XXX,XX +XXX,XX @@ ERROR cluster 3 refcount=1 reference=3
 
 1 errors were found on the image.
 Data may be corrupted, or further writes to the image may corrupt it.
-incompatible_features     0x0
+incompatible_features     []
 qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with active L1 table); further corruption events will be suppressed
 write failed: Input/output error
-incompatible_features     0x2
+incompatible_features     [1]
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
 virtual size: 64 MiB (67108864 bytes)
@@ -XXX,XX +XXX,XX @@ ERROR cluster 2 refcount=1 reference=2
 
 2 errors were found on the image.
 Data may be corrupted, or further writes to the image may corrupt it.
-incompatible_features     0x0
+incompatible_features     []
 qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with refcount block); further corruption events will be suppressed
 write failed: Input/output error
-incompatible_features     0x2
+incompatible_features     [1]
 ERROR refcount block 0 refcount=2
 ERROR cluster 2 refcount=1 reference=2
 Rebuilding refcount structure
@@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired:
 
 Double checking the fixed image now...
 No errors were found on the image.
-incompatible_features     0x0
+incompatible_features     []
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-incompatible_features     0x0
+incompatible_features     []
 
 === Testing cluster data reference into inactive L2 table ===
 
@@ -XXX,XX +XXX,XX @@ Data may be corrupted, or further writes to the image may corrupt it.
 
 1 leaked clusters were found on the image.
 This means waste of disk space, but no harm to data.
-incompatible_features     0x0
+incompatible_features     []
 qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with inactive L2 table); further corruption events will be suppressed
 write failed: Input/output error
-incompatible_features     0x2
+incompatible_features     [1]
 ERROR cluster 4 refcount=1 reference=2
 Leaked cluster 9 refcount=1 reference=0
 Repairing cluster 4 refcount=1 reference=2
@@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired:
 
 Double checking the fixed image now...
 No errors were found on the image.
-incompatible_features     0x0
+incompatible_features     []
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-incompatible_features     0x0
+incompatible_features     []
 read 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 No errors were found on the image.
diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/061.out
+++ b/tests/qemu-iotests/061.out
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x1
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       [0]
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x1
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       [0]
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x1
-compatible_features       0x1
-autoclear_features        0x0
+incompatible_features     [0]
+compatible_features       [0]
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x80000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x40000000000
-autoclear_features        0x40000000000
+incompatible_features     []
+compatible_features       [42]
+autoclear_features        [42]
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             72
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x1
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       [0]
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x10000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x1
-compatible_features       0x1
-autoclear_features        0x0
+incompatible_features     [0]
+compatible_features       [0]
+autoclear_features        []
 refcount_order            4
 header_length             104
 
@@ -XXX,XX +XXX,XX @@ refcount_table_offset     0x80000
 refcount_table_clusters   1
 nb_snapshots              0
 snapshot_offset           0x0
-incompatible_features     0x0
-compatible_features       0x0
-autoclear_features        0x0
+incompatible_features     []
+compatible_features       []
+autoclear_features        []
 refcount_order            4
 header_length             104
 
diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/137.out
+++ b/tests/qemu-iotests/137.out
@@ -XXX,XX +XXX,XX @@ qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     0x0
+incompatible_features     []
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 wrote 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/qcow2.py
+++ b/tests/qemu-iotests/qcow2.py
@@ -XXX,XX +XXX,XX @@ class QcowHeader:
         [ uint64_t, '%#x',  'snapshot_offset' ],
 
         # Version 3 header fields
-        [ uint64_t, '%#x',  'incompatible_features' ],
-        [ uint64_t, '%#x',  'compatible_features' ],
-        [ uint64_t, '%#x',  'autoclear_features' ],
+        [ uint64_t, 'mask', 'incompatible_features' ],
+        [ uint64_t, 'mask', 'compatible_features' ],
+        [ uint64_t, 'mask', 'autoclear_features' ],
         [ uint32_t, '%d',   'refcount_order' ],
         [ uint32_t, '%d',   'header_length' ],
     ];
@@ -XXX,XX +XXX,XX @@ class QcowHeader:
 
     def dump(self):
         for f in QcowHeader.fields:
-            print("%-25s" % f[2], f[1] % self.__dict__[f[2]])
+            value = self.__dict__[f[2]]
+            if f[1] == 'mask':
+                bits = []
+                for bit in range(64):
+                    if value & (1 << bit):
+                        bits.append(bit)
+                value_str = str(bits)
+            else:
+                value_str = f[1] % value
+
+            print("%-25s" % f[2], value_str)
         print("")
 
     def dump_extensions(self):
-- 
2.24.1

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-5-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/common.filter | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -XXX,XX +XXX,XX @@ _filter_qmp_empty_return()
     grep -v '{"return": {}}'
 }
 
+_filter_json_filename()
+{
+    $PYTHON -c 'import sys
+result, *fnames = sys.stdin.read().split("json:{")
+depth = 0
+for fname in fnames:
+    depth += 1 # For the opening brace in the split separator
+    for chr_i, chr in enumerate(fname):
+        if chr == "{":
+            depth += 1
+        elif chr == "}":
+            depth -= 1
+            if depth == 0:
+                break
+
+    # json:{} filenames may be nested; filter out everything from
+    # inside the outermost one
+    if depth == 0:
+        chr_i += 1 # First character past the filename
+        result += "json:{ /* filtered */ }" + fname[chr_i:]
+
+sys.stdout.write(result)'
+}
+
 # make sure this script returns success
 true
-- 
2.24.1

This test can run just fine with other values for refcount_bits, so we
should filter the value from qcow2.py's dump-header.  In fact, we can
filter everything but the feature bits and header extensions, because
that is what the test is about.

(036 currently ignores user-specified image options, but that will be
fixed in the next patch.)

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-6-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/036     |  9 ++++---
 tests/qemu-iotests/036.out | 48 --------------------------------------
 2 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -XXX,XX +XXX,XX @@ $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
+$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
+$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
 _img_info
 
 # With feature table containing bit 63
@@ -XXX,XX +XXX,XX @@ 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
+$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
+$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
 
 echo
 echo === Repair image ===
 echo
 _check_test_img -r all
 
-$PYTHON qcow2.py "$TEST_IMG" dump-header
+$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
+$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
 
 # success, all done
 echo "*** done"
diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/036.out
+++ b/tests/qemu-iotests/036.out
@@ -XXX,XX +XXX,XX @@ QA output created by 036
 === Image with unknown incompatible feature bit ===
 
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-magic                     0x514649fb
-version                   3
-backing_file_offset       0x0
-backing_file_size         0x0
-cluster_bits              16
-size                      67108864
-crypt_method              0
-l1_size                   1
-l1_table_offset           0x30000
-refcount_table_offset     0x10000
-refcount_table_clusters   1
-nb_snapshots              0
-snapshot_offset           0x0
 incompatible_features     [63]
 compatible_features       []
 autoclear_features        []
-refcount_order            4
-header_length             104
-
 qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
 qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Test feature
 
@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): tes
 === Create image with unknown autoclear feature bit ===
 
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-magic                     0x514649fb
-version                   3
-backing_file_offset       0x0
-backing_file_size         0x0
-cluster_bits              16
-size                      67108864
-crypt_method              0
-l1_size                   1
-l1_table_offset           0x30000
-refcount_table_offset     0x10000
-refcount_table_clusters   1
-nb_snapshots              0
-snapshot_offset           0x0
 incompatible_features     []
 compatible_features       []
 autoclear_features        [63]
-refcount_order            4
-header_length             104
-
 Header extension:
 magic                     0x6803f857
 length                    192
@@ -XXX,XX +XXX,XX @@ data                      <binary>
 === Repair image ===
 
 No errors were found on the image.
-magic                     0x514649fb
-version                   3
-backing_file_offset       0x0
-backing_file_size         0x0
-cluster_bits              16
-size                      67108864
-crypt_method              0
-l1_size                   1
-l1_table_offset           0x30000
-refcount_table_offset     0x10000
-refcount_table_clusters   1
-nb_snapshots              0
-snapshot_offset           0x0
 incompatible_features     []
 compatible_features       []
 autoclear_features        []
-refcount_order            4
-header_length             104
-
 Header extension:
 magic                     0x6803f857
 length                    192
-- 
2.24.1

Some tests require compat=1.1 and thus set IMGOPTS='compat=1.1'
globally.  That is not how it should be done; instead, they should
simply set _unsupported_imgopts to compat=0.10 (compat=1.1 is the
default anyway).

This makes the tests heed user-specified $IMGOPTS.  Some do not work
with all image options, though, so we need to disable them accordingly.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsky@redhat.com>
Message-id: 20191107163708.833192-7-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/036 | 3 +--
 tests/qemu-iotests/060 | 4 ++--
 tests/qemu-iotests/062 | 3 ++-
 tests/qemu-iotests/066 | 3 ++-
 tests/qemu-iotests/068 | 3 ++-
 tests/qemu-iotests/098 | 4 ++--
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-
 # Only qcow2v3 and later supports feature bits
-IMGOPTS="compat=1.1"
+_unsupported_imgopts 'compat=0.10'
 
 echo
 echo === Image with unknown incompatible feature bit ===
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -XXX,XX +XXX,XX @@ _filter_io_error()
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# These tests only work for compat=1.1 images with refcount_bits=16
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
 
 # The repair process will create a large file - so check for availability first
 _require_large_file 64G
@@ -XXX,XX +XXX,XX @@ l1_offset=196608 # 0x30000 (XXX: just an assumption)
 l2_offset=262144 # 0x40000 (XXX: just an assumption)
 l2_offset_after_snapshot=524288 # 0x80000 (XXX: just an assumption)
 
-IMGOPTS="compat=1.1"
-
 OPEN_RW="open -o overlap-check=all $TEST_IMG"
 # Overlap checks are done before write operations only, therefore opening an
 # image read-only makes the overlap-check option irrelevant
diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/062
+++ b/tests/qemu-iotests/062
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
+# We need zero clusters and snapshots
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
 
-IMGOPTS="compat=1.1"
 IMG_SIZE=64M
 
 echo
diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/066
+++ b/tests/qemu-iotests/066
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
+# We need zero clusters and snapshots
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
 
 # Intentionally create an unaligned image
-IMGOPTS="compat=1.1"
 IMG_SIZE=$((64 * 1024 * 1024 + 512))
 
 echo
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
+# Internal snapshots are (currently) impossible with refcount_bits=1
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
 
-IMGOPTS="compat=1.1"
 IMG_SIZE=128K
 
 case "$QEMU_DEFAULT_MACHINE" in
diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/098
+++ b/tests/qemu-iotests/098
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-
-IMGOPTS="compat=1.1"
+# The code path we want to test here only works for compat=1.1 images
+_unsupported_imgopts 'compat=0.10'
 
 for event in l1_update empty_image_prepare reftable_update refblock_alloc; do
 
-- 
2.24.1

This will allow us to add more options than just -b.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-9-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/common.rc | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ _make_test_img()
     # extra qemu-img options can be added by tests
     # at least one argument (the image size) needs to be added
     local extra_img_options=""
-    local image_size=$*
     local optstr=""
     local img_name=""
     local use_backing=0
     local backing_file=""
     local object_options=""
+    local misc_params=()
 
     if [ -n "$TEST_IMG_FILE" ]; then
         img_name=$TEST_IMG_FILE
@@ -XXX,XX +XXX,XX @@ _make_test_img()
         optstr=$(_optstr_add "$optstr" "key-secret=keysec0")
     fi
 
-    if [ "$1" = "-b" ]; then
-        use_backing=1
-        backing_file=$2
-        image_size=$3
-    fi
+    for param; do
+        if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
+            backing_file=$param
+            continue
+        fi
+
+        case "$param" in
+            -b)
+                use_backing=1
+                ;;
+
+            *)
+                misc_params=("${misc_params[@]}" "$param")
+                ;;
+        esac
+    done
+
     if [ $ "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" $ -a -n "$CLUSTER_SIZE" ]; then
         optstr=$(_optstr_add "$optstr" "cluster_size=$CLUSTER_SIZE")
     fi
@@ -XXX,XX +XXX,XX @@ _make_test_img()
     # XXX(hch): have global image options?
     (
      if [ $use_backing = 1 ]; then
-        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" $image_size 2>&1
+        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" "${misc_params[@]}" 2>&1
      else
-        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" $image_size 2>&1
+        $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" "${misc_params[@]}" 2>&1
      fi
     ) | _filter_img_create
 
-- 
2.24.1

Blindly overriding IMGOPTS is suboptimal as this discards user-specified
options.  Whatever options the test needs should simply be appended.

Some tests do this (with IMGOPTS=$(_optstr_add "$IMGOPTS" "...")), but
that is cumbersome.  It’s simpler to just give _make_test_img an -o
parameter with which tests can add options.

Some tests actually must override the user-specified options, though,
for example when creating an image in a different format than the test
$IMGFMT.  For such cases, --no-opts allows clearing the current option
list.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-10-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/common.rc | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ _make_test_img()
     local use_backing=0
     local backing_file=""
     local object_options=""
+    local opts_param=false
     local misc_params=()
 
     if [ -n "$TEST_IMG_FILE" ]; then
@@ -XXX,XX +XXX,XX @@ _make_test_img()
         if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
             backing_file=$param
             continue
+        elif $opts_param; then
+            optstr=$(_optstr_add "$optstr" "$param")
+            opts_param=false
+            continue
         fi
 
         case "$param" in
@@ -XXX,XX +XXX,XX @@ _make_test_img()
                 use_backing=1
                 ;;
 
+            -o)
+                opts_param=true
+                ;;
+
+            --no-opts)
+                optstr=""
+                ;;
+
             *)
                 misc_params=("${misc_params[@]}" "$param")
                 ;;
-- 
2.24.1

Tests should not overwrite all user-supplied image options, but only add
to it (which will effectively overwrite conflicting values).  Accomplish
this by passing options to _make_test_img via -o instead of $IMGOPTS.

For some tests, there is no functional change because they already only
appended options to IMGOPTS.  For these, this patch is just a
simplification.

For others, this is a change, so they now heed user-specified $IMGOPTS.
Some of those tests do not work with all image options, though, so we
need to disable them accordingly.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-12-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/031 |  9 ++++---
 tests/qemu-iotests/039 | 24 ++++++------------
 tests/qemu-iotests/059 | 18 ++++++-------
 tests/qemu-iotests/060 |  6 ++---
 tests/qemu-iotests/061 | 57 ++++++++++++++++++++++--------------------
 tests/qemu-iotests/079 |  3 +--
 tests/qemu-iotests/106 |  2 +-
 tests/qemu-iotests/108 |  2 +-
 tests/qemu-iotests/112 | 32 ++++++++++++------------
 tests/qemu-iotests/115 |  3 +--
 tests/qemu-iotests/121 |  6 ++---
 tests/qemu-iotests/125 |  2 +-
 tests/qemu-iotests/137 |  2 +-
 tests/qemu-iotests/138 |  3 +--
 tests/qemu-iotests/175 |  2 +-
 tests/qemu-iotests/190 |  2 +-
 tests/qemu-iotests/191 |  3 +--
 tests/qemu-iotests/220 |  4 ++-
 tests/qemu-iotests/243 |  6 +++--
 tests/qemu-iotests/244 | 10 +++++---
 tests/qemu-iotests/250 |  3 +--
 tests/qemu-iotests/265 |  2 +-
 22 files changed, 100 insertions(+), 101 deletions(-)

diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
+# We want to test compat=0.10, which does not support refcount widths
+# other than 16
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
 
 CLUSTER_SIZE=65536
 
 # qcow2.py output depends on the exact options used, so override the command
 # line here as an exception
-for IMGOPTS in "compat=0.10" "compat=1.1"; do
+for compat in "compat=0.10" "compat=1.1"; do
 
     echo
-    echo ===== Testing with -o $IMGOPTS =====
+    echo ===== Testing with -o $compat =====
     echo
     echo === Create image with unknown header extension ===
     echo
-    _make_test_img 64M
+    _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
     _check_test_img
diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/039
+++ b/tests/qemu-iotests/039
@@ -XXX,XX +XXX,XX @@ size=128M
 echo
 echo "== Checking that image is clean on shutdown =="
 
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
 
 $QEMU_IO -c "write -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
 
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "== Creating a dirty image file =="
 
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
 
 _NO_VALGRIND \
 $QEMU_IO -c "write -P 0x5a 0 512" \
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
 echo
 echo "== Opening a dirty image read/write should repair it =="
 
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
 
 _NO_VALGRIND \
 $QEMU_IO -c "write -P 0x5a 0 512" \
@@ -XXX,XX +XXX,XX @@ $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
 echo
 echo "== Creating an image file with lazy_refcounts=off =="
 
-IMGOPTS="compat=1.1,lazy_refcounts=off"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=off" $size
 
 _NO_VALGRIND \
 $QEMU_IO -c "write -P 0x5a 0 512" \
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "== Committing to a backing file with lazy_refcounts=on =="
 
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-TEST_IMG="$TEST_IMG".base _make_test_img $size
+TEST_IMG="$TEST_IMG".base _make_test_img -o "compat=1.1,lazy_refcounts=on" $size
 
-IMGOPTS="compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base" $size
 
 $QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG commit "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ TEST_IMG="$TEST_IMG".base _check_test_img
 echo
 echo "== Changing lazy_refcounts setting at runtime =="
 
-IMGOPTS="compat=1.1,lazy_refcounts=off"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=off" $size
 
 _NO_VALGRIND \
 $QEMU_IO -c "reopen -o lazy-refcounts=on" \
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "reopen -o lazy-refcounts=on" \
 $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
 _check_test_img
 
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
 
 _NO_VALGRIND \
 $QEMU_IO -c "reopen -o lazy-refcounts=off" \
diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@@ -XXX,XX +XXX,XX @@ poke_file "$TEST_IMG" "$grain_table_size_offset" "\x01\x00\x00\x00"
 
 echo
 echo "=== Testing monolithicFlat creation and opening ==="
-IMGOPTS="subformat=monolithicFlat" _make_test_img 2G
+_make_test_img -o "subformat=monolithicFlat" 2G
 _img_info
 _cleanup_test_img
 
 echo
 echo "=== Testing monolithicFlat with zeroed_grain ==="
-IMGOPTS="subformat=monolithicFlat,zeroed_grain=on" _make_test_img 2G
+_make_test_img -o "subformat=monolithicFlat,zeroed_grain=on" 2G
 _cleanup_test_img
 
 echo
 echo "=== Testing big twoGbMaxExtentFlat ==="
-IMGOPTS="subformat=twoGbMaxExtentFlat" _make_test_img 1000G
+_make_test_img -o "subformat=twoGbMaxExtentFlat" 1000G
 $QEMU_IMG info $TEST_IMG | _filter_testdir | sed -e 's/cid: [0-9]*/cid: XXXXXXXX/'
 _cleanup_test_img
 
@@ -XXX,XX +XXX,XX @@ _img_info
 
 echo
 echo "=== Testing truncated sparse ==="
-IMGOPTS="subformat=monolithicSparse" _make_test_img 100G
+_make_test_img -o "subformat=monolithicSparse" 100G
 truncate -s 10M $TEST_IMG
 _img_info
 
 echo
 echo "=== Converting to streamOptimized from image with small cluster size==="
-TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 IMGOPTS="cluster_size=4096" _make_test_img 1G
+TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 _make_test_img -o "cluster_size=4096" 1G
 $QEMU_IO -f qcow2 -c "write -P 0xa 0 512" "$TEST_IMG.qcow2" | _filter_qemu_io
 $QEMU_IO -f qcow2 -c "write -P 0xb 10240 512" "$TEST_IMG.qcow2" | _filter_qemu_io
 $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2" "$TEST_IMG" 2>&1
@@ -XXX,XX +XXX,XX @@ echo "=== Testing monolithicFlat with internally generated JSON file name ==="
 
 echo '--- blkdebug ---'
 # Should work, because bdrv_dirname() works fine with blkdebug
-IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
+_make_test_img -o "subformat=monolithicFlat" 64M
 $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \
          -c info \
     2>&1 \
@@ -XXX,XX +XXX,XX @@ _cleanup_test_img
 
 echo '--- quorum ---'
 # Should not work, because bdrv_dirname() does not work with quorum
-IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
+_make_test_img -o "subformat=monolithicFlat" 64M
 cp "$TEST_IMG" "$TEST_IMG.orig"
 
 filename="json:{
@@ -XXX,XX +XXX,XX @@ _cleanup_test_img
 
 echo
 echo "=== Testing 4TB monolithicFlat creation and IO ==="
-IMGOPTS="subformat=monolithicFlat" _make_test_img 4T
+_make_test_img -o "subformat=monolithicFlat" 4T
 _img_info
 $QEMU_IO -c "write -P 0xa 900G 512" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IO -c "read -v 900G 1024" "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ _cleanup_test_img
 echo
 echo "=== Testing qemu-img map on extents ==="
 for fmt in monolithicSparse twoGbMaxExtentSparse; do
-    IMGOPTS="subformat=$fmt" _make_test_img 31G
+    _make_test_img -o "subformat=$fmt" 31G
     $QEMU_IO -c "write 65024 1k" "$TEST_IMG" | _filter_qemu_io
     $QEMU_IO -c "write 2147483136 1k" "$TEST_IMG" | _filter_qemu_io
     $QEMU_IO -c "write 5G 1k" "$TEST_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c 'write 0k 64k' "$BACKING_IMG" | _filter_qemu_io
 # compat=0.10 is required in order to make the following discard actually
 # unallocate the sector rather than make it a zero sector - we want COW, after
 # all.
-IMGOPTS='compat=0.10' _make_test_img -b "$BACKING_IMG" 1G
+_make_test_img -o 'compat=0.10' -b "$BACKING_IMG" 1G
 # Write two clusters, the second one enforces creation of an L2 table after
 # the first data cluster.
 $QEMU_IO -c 'write 0k 64k' -c 'write 512M 64k' "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== Discarding a non-covered in-bounds refblock ==="
 echo
 
-IMGOPTS='refcount_bits=1' _make_test_img 64M
+_make_test_img -o 'refcount_bits=1' 64M
 
 # Pretend there's a refblock somewhere where there is no refblock to
 # cover it (but the covering refblock has a valid index in the
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== Discarding a refblock covered by an unaligned refblock ==="
 echo
 
-IMGOPTS='refcount_bits=1' _make_test_img 64M
+_make_test_img -o 'refcount_bits=1' 64M
 
 # Same as above
 poke_file "$TEST_IMG" "$(($rt_offset+8))" "\x00\x00\x00\x10\x00\x00\x00\x00"
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# Conversion between different compat versions can only really work
+# with refcount_bits=16
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
 
 echo
 echo "=== Testing version downgrade with zero expansion ==="
 echo
-IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
+_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
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing version downgrade with zero expansion and 4K cache entries ==="
 echo
-IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
+_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
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing dirty version downgrade ==="
 echo
-IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
+_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
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing version downgrade with unknown compat/autoclear flags ==="
 echo
-IMGOPTS="compat=1.1" _make_test_img 64M
+_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
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing version upgrade and resize ==="
 echo
-IMGOPTS="compat=0.10" _make_test_img 64M
+_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
 $QEMU_IMG amend -o "compat=1.1,lazy_refcounts=on,size=128M" "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing dirty lazy_refcounts=off ==="
 echo
-IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
+_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
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing backing file ==="
 echo
-IMGOPTS="compat=1.1" _make_test_img 64M
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
 $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG amend -o "backing_file=$TEST_IMG.base,backing_fmt=qcow2" "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing invalid configurations ==="
 echo
-IMGOPTS="compat=0.10" _make_test_img 64M
+_make_test_img -o "compat=0.10" 64M
 $QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG"
 $QEMU_IMG amend -o "compat=1.1" "$TEST_IMG" # actually valid
 $QEMU_IMG amend -o "compat=0.10,lazy_refcounts=on" "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ $QEMU_IMG amend -o "preallocation=on" "$TEST_IMG"
 echo
 echo "=== Testing correct handling of unset value ==="
 echo
-IMGOPTS="compat=1.1,cluster_size=1k" _make_test_img 64M
+_make_test_img -o "compat=1.1,cluster_size=1k" 64M
 echo "Should work:"
 $QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG"
 echo "Should not work:" # Just to know which of these tests actually fails
@@ -XXX,XX +XXX,XX @@ $QEMU_IMG amend -o "cluster_size=64k" "$TEST_IMG"
 echo
 echo "=== Testing zero expansion on inactive clusters ==="
 echo
-IMGOPTS="compat=1.1" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG snapshot -c foo "$TEST_IMG"
 $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
 echo
 echo "=== Testing zero expansion on shared L2 table ==="
 echo
-IMGOPTS="compat=1.1" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG snapshot -c foo "$TEST_IMG"
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
 echo
 echo "=== Testing zero expansion on backed image ==="
 echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
 $QEMU_IO -c "read -P 0x2a 0 128k" -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
 _check_test_img
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe
 echo
 echo "=== Testing zero expansion on backed inactive clusters ==="
 echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
 $QEMU_IO -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG snapshot -c foo "$TEST_IMG"
 $QEMU_IO -c "write -P 0x42 0 128k" "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe
 echo
 echo "=== Testing zero expansion on backed image with shared L2 table ==="
 echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
 $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG snapshot -c foo "$TEST_IMG"
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
 echo
 echo "=== Testing preallocated zero expansion on full image ==="
 echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG" _make_test_img 64M
+TEST_IMG="$TEST_IMG" _make_test_img -o "compat=1.1" 64M
 $QEMU_IO -c "write -P 0x2a 0 64M" "$TEST_IMG" -c "write -z 0 64M" | _filter_qemu_io
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
 _check_test_img
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64M" "$TEST_IMG" | _filter_qemu_io
 echo
 echo "=== Testing progress report without snapshot ==="
 echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G
 $QEMU_IO -c "write -z 0  64k" \
          -c "write -z 1G 64k" \
          -c "write -z 2G 64k" \
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing progress report with snapshot ==="
 echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G
 $QEMU_IO -c "write -z 0  64k" \
          -c "write -z 1G 64k" \
          -c "write -z 2G 64k" \
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Testing version downgrade with external data file ==="
 echo
-IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
 _img_info --format-specific
 _check_test_img
@@ -XXX,XX +XXX,XX @@ _check_test_img
 echo
 echo "=== Try changing the external data file ==="
 echo
-IMGOPTS="compat=1.1" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
 $QEMU_IMG amend -o "data_file=foo" "$TEST_IMG"
 
 echo
-IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M
 $QEMU_IMG amend -o "data_file=foo" "$TEST_IMG"
 _img_info --format-specific
 TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info --format-specific --image-opts
@@ -XXX,XX +XXX,XX @@ TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info -
 echo
 echo "=== Clearing and setting data-file-raw ==="
 echo
-IMGOPTS="compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M
+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" 64M
 $QEMU_IMG amend -o "data_file_raw=on" "$TEST_IMG"
 _img_info --format-specific
 _check_test_img
diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/079
+++ b/tests/qemu-iotests/079
@@ -XXX,XX +XXX,XX @@ echo
 cluster_sizes="16384 32768 65536 131072 262144 524288 1048576 2097152 4194304"
 
 for s in $cluster_sizes; do
-    IMGOPTS=$(_optstr_add "$IMGOPTS" "preallocation=metadata,cluster_size=$s") \
-        _make_test_img 4G
+    _make_test_img -o "preallocation=metadata,cluster_size=$s" 4G
 done
 
 # success, all done
diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/106
+++ b/tests/qemu-iotests/106
@@ -XXX,XX +XXX,XX @@ for create_mode in off falloc full; do
         echo
         echo "--- create_mode=$create_mode growth_mode=$growth_mode ---"
 
-        IMGOPTS="preallocation=$create_mode" _make_test_img ${CREATION_SIZE}K
+        _make_test_img -o "preallocation=$create_mode" ${CREATION_SIZE}K
         $QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K
 
         expected_size=0
diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/108
+++ b/tests/qemu-iotests/108
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Repairing unreferenced data cluster in new refblock area ==='
 echo
 
-IMGOPTS='cluster_size=512' _make_test_img 64M
+_make_test_img -o 'cluster_size=512' 64M
 # Allocate the first 128 kB in the image (first refblock)
 $QEMU_IO -c 'write 0 0x1b200' "$TEST_IMG" | _filter_qemu_io
 # should be 131072 == 0x20000
diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/112
+++ b/tests/qemu-iotests/112
@@ -XXX,XX +XXX,XX @@ echo '=== refcount_bits limits ==='
 echo
 
 # Must be positive (non-zero)
-IMGOPTS="$IMGOPTS,refcount_bits=0" _make_test_img 64M
+_make_test_img -o "refcount_bits=0" 64M
 # Must be positive (non-negative)
-IMGOPTS="$IMGOPTS,refcount_bits=-1" _make_test_img 64M
+_make_test_img -o "refcount_bits=-1" 64M
 # May not exceed 64
-IMGOPTS="$IMGOPTS,refcount_bits=128" _make_test_img 64M
+_make_test_img -o "refcount_bits=128" 64M
 # Must be a power of two
-IMGOPTS="$IMGOPTS,refcount_bits=42" _make_test_img 64M
+_make_test_img -o "refcount_bits=42" 64M
 
 # 1 is the minimum
-IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
+_make_test_img -o "refcount_bits=1" 64M
 print_refcount_bits
 
 # 64 is the maximum
-IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
+_make_test_img -o "refcount_bits=64" 64M
 print_refcount_bits
 
 # 16 is the default
@@ -XXX,XX +XXX,XX @@ echo '=== refcount_bits and compat=0.10 ==='
 echo
 
 # Should work
-IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=16" _make_test_img 64M
+_make_test_img -o "compat=0.10,refcount_bits=16" 64M
 print_refcount_bits
 
 # Should not work
-IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=1" _make_test_img 64M
-IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=64" _make_test_img 64M
+_make_test_img -o "compat=0.10,refcount_bits=1" 64M
+_make_test_img -o "compat=0.10,refcount_bits=64" 64M
 
 
 echo
 echo '=== Snapshot limit on refcount_bits=1 ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
+_make_test_img -o "refcount_bits=1" 64M
 print_refcount_bits
 
 $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Snapshot limit on refcount_bits=2 ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=2" _make_test_img 64M
+_make_test_img -o "refcount_bits=2" 64M
 print_refcount_bits
 
 $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Compressed clusters with refcount_bits=1 ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
+_make_test_img -o "refcount_bits=1" 64M
 print_refcount_bits
 
 # Both should fit into a single host cluster; instead of failing to increase the
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== MSb set in 64 bit refcount ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
+_make_test_img -o "refcount_bits=64" 64M
 print_refcount_bits
 
 $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Snapshot on maximum 64 bit refcount value ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
+_make_test_img -o "refcount_bits=64" 64M
 print_refcount_bits
 
 $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Testing too many references for check ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
+_make_test_img -o "refcount_bits=1" 64M
 print_refcount_bits
 
 # This cluster should be created at 0x50000
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Multiple walks necessary during amend ==='
 echo
 
-IMGOPTS="$IMGOPTS,refcount_bits=1,cluster_size=512" _make_test_img 64k
+_make_test_img -o "refcount_bits=1,cluster_size=512" 64k
 
 # Cluster 0 is the image header, clusters 1 to 4 are used by the L1 table, a
 # single L2 table, the reftable and a single refblock. This creates 58 data
diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/115
+++ b/tests/qemu-iotests/115
@@ -XXX,XX +XXX,XX @@ echo
 # least 256 MB. We can achieve that by using preallocation=metadata for an image
 # which has a guest disk size of 256 MB.
 
-IMGOPTS="$IMGOPTS,refcount_bits=64,cluster_size=512,preallocation=metadata" \
-    _make_test_img 256M
+_make_test_img -o "refcount_bits=64,cluster_size=512,preallocation=metadata" 256M
 
 # We know for sure that the L1 and refcount tables do not overlap with any other
 # structure because the metadata overlap checks would have caught that case.
diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/121
+++ b/tests/qemu-iotests/121
@@ -XXX,XX +XXX,XX @@ echo
 # Preallocation speeds up the write operation, but preallocating everything will
 # destroy the purpose of the write; so preallocate one KB less than what would
 # cause a reftable growth...
-IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64512K
+_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64512K
 # ...and make the image the desired size afterwards.
 $QEMU_IMG resize "$TEST_IMG" 65M
 
@@ -XXX,XX +XXX,XX @@ echo
 echo '--- Test 2 ---'
 echo
 
-IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64513K
+_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64513K
 # This results in an L1 table growth which in turn results in some clusters at
 # the start of the image becoming free
 $QEMU_IMG resize "$TEST_IMG" 65M
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Allocating a new refcount block must not leave holes in the image ==='
 echo
 
-IMGOPTS='cluster_size=512,refcount_bits=16' _make_test_img 1M
+_make_test_img -o 'cluster_size=512,refcount_bits=16' 1M
 
 # This results in an image with 256 used clusters: the qcow2 header,
 # the refcount table, one refcount block, the L1 table, four L2 tables
diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/125
+++ b/tests/qemu-iotests/125
@@ -XXX,XX +XXX,XX @@ for GROWTH_SIZE in 16 48 80; do
         for growth_mode in off metadata falloc full; do
             echo "--- cluster_size=$cluster_size growth_size=$GROWTH_SIZE create_mode=$create_mode growth_mode=$growth_mode ---"
 
-            IMGOPTS="preallocation=$create_mode,cluster_size=$cluster_size" _make_test_img ${CREATION_SIZE}
+            _make_test_img -o "preallocation=$create_mode,cluster_size=$cluster_size" ${CREATION_SIZE}
             $QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K
 
             host_size_0=$(get_image_size_on_host)
diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/137
+++ b/tests/qemu-iotests/137
@@ -XXX,XX +XXX,XX @@ $QEMU_IO \
     -c "reopen -o cache-clean-interval=-1" \
     "$TEST_IMG" | _filter_qemu_io
 
-IMGOPTS="cluster_size=256k" _make_test_img 32P
+_make_test_img -o "cluster_size=256k" 32P
 $QEMU_IO \
     -c "reopen -o l2-cache-entry-size=512,l2-cache-size=1T" \
     "$TEST_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/138
+++ b/tests/qemu-iotests/138
@@ -XXX,XX +XXX,XX @@ echo
 echo '=== Check on an image with a multiple of 2^32 clusters ==='
 echo
 
-IMGOPTS=$(_optstr_add "$IMGOPTS" "cluster_size=512") \
-    _make_test_img 512
+_make_test_img -o "cluster_size=512" 512
 
 # Allocate L2 table
 $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/175
+++ b/tests/qemu-iotests/175
@@ -XXX,XX +XXX,XX @@ stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_block
 for mode in off full falloc; do
     echo
     echo "== creating image with preallocation $mode =="
-    IMGOPTS=preallocation=$mode _make_test_img $size | _filter_imgfmt
+    _make_test_img -o preallocation=$mode $size | _filter_imgfmt
     stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size
 done
 
diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/190
+++ b/tests/qemu-iotests/190
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 echo "== Huge file =="
 echo
 
-IMGOPTS='cluster_size=2M' _make_test_img 2T
+_make_test_img -o 'cluster_size=2M' 2T
 
 $QEMU_IMG measure -O raw -f qcow2 "$TEST_IMG"
 $QEMU_IMG measure -O qcow2 -o cluster_size=64k -f qcow2 "$TEST_IMG"
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -XXX,XX +XXX,XX @@ echo === Preparing and starting VM ===
 echo
 
 TEST_IMG="${TEST_IMG}.base" _make_test_img $size
-IMGOPTS=$(_optstr_add "$IMGOPTS" "backing_fmt=$IMGFMT") \
-    TEST_IMG="${TEST_IMG}.mid" _make_test_img -b "${TEST_IMG}.base"
+TEST_IMG="${TEST_IMG}.mid" _make_test_img -o "backing_fmt=$IMGFMT" -b "${TEST_IMG}.base"
 _make_test_img -b "${TEST_IMG}.mid"
 TEST_IMG="${TEST_IMG}.ovl2" _make_test_img -b "${TEST_IMG}.mid"
 
diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/220
+++ b/tests/qemu-iotests/220
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# To use a different refcount width but 16 bits we need compat=1.1
+_unsupported_imgopts 'compat=0.10'
 
 echo "== Creating huge file =="
 
@@ -XXX,XX +XXX,XX @@ echo "== Creating huge file =="
 # of a HUGE (but very sparse) file.  tmpfs works, ext4 does not.
 _require_large_file 513T
 
-IMGOPTS='cluster_size=2M,refcount_bits=1' _make_test_img 513T
+_make_test_img -o 'cluster_size=2M,refcount_bits=1' 513T
 
 echo "== Populating refcounts =="
 # We want an image with 256M refcounts * 2M clusters = 512T referenced.
diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# External data files do not work with compat=0.10
+_unsupported_imgopts 'compat=0.10'
 
 for mode in off metadata falloc full; do
 
@@ -XXX,XX +XXX,XX @@ for mode in off metadata falloc full; do
     echo "=== preallocation=$mode ==="
     echo
 
-    IMGOPTS="preallocation=$mode" _make_test_img 64M
+    _make_test_img -o "preallocation=$mode" 64M
 
     printf "File size: "
     du -b $TEST_IMG | cut -f1
@@ -XXX,XX +XXX,XX @@ for mode in off metadata falloc full; do
     echo "=== External data file: preallocation=$mode ==="
     echo
 
-    IMGOPTS="data_file=$TEST_IMG.data,preallocation=$mode" _make_test_img 64M
+    _make_test_img -o "data_file=$TEST_IMG.data,preallocation=$mode" 64M
 
     echo -n "qcow2 file size: "
     du -b $TEST_IMG | cut -f1
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# External data files do not work with compat=0.10
+_unsupported_imgopts 'compat=0.10'
 
 echo
 echo "=== Create and open image with external data file ==="
 echo
 
 echo "With data file name in the image:"
-IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "data_file=$TEST_IMG.data" 64M
 _check_test_img
 
 $QEMU_IO -c "open $TEST_IMG" -c "read -P 0 0 64k" 2>&1 | _filter_qemu_io | _filter_testdir
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== Standalone image with external data file (efficient) ==="
 echo
 
-IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "data_file=$TEST_IMG.data" 64M
 
 echo -n "qcow2 file size before I/O: "
 du -b $TEST_IMG | cut -f1
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== Standalone image with external data file (valid raw) ==="
 echo
 
-IMGOPTS="data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M
+_make_test_img -o "data_file=$TEST_IMG.data,data_file_raw=on" 64M
 
 echo -n "qcow2 file size before I/O: "
 du -b $TEST_IMG | cut -f1
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== bdrv_co_block_status test for file and offset=0 ==="
 echo
 
-IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "data_file=$TEST_IMG.data" 64M
 
 $QEMU_IO -c 'write -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
 $QEMU_IO -c 'read -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/250
+++ b/tests/qemu-iotests/250
@@ -XXX,XX +XXX,XX @@ disk_usage()
 }
 
 size=2100M
-IMGOPTS="cluster_size=1M,preallocation=metadata"
 
-_make_test_img $size
+_make_test_img -o "cluster_size=1M,preallocation=metadata" $size
 $QEMU_IO -c 'discard 0 10M' -c 'discard 2090M 10M' \
          -c 'write 2090M 10M' -c 'write 0 10M' "$TEST_IMG" | _filter_qemu_io
 
diff --git a/tests/qemu-iotests/265 b/tests/qemu-iotests/265
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/265
+++ b/tests/qemu-iotests/265
@@ -XXX,XX +XXX,XX @@ _supported_os Linux
 echo '--- Writing to the image ---'
 
 # Reduce cluster size so we get more and quicker I/O
-IMGOPTS='cluster_size=4096' _make_test_img 1M
+_make_test_img -o 'cluster_size=4096' 1M
 (for ((kb = 1024 - 4; kb >= 0; kb -= 4)); do \
      echo "aio_write -P 42 $((kb + 1))k 2k"; \
  done) \
-- 
2.24.1

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-13-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/071 | 4 ++--
 tests/qemu-iotests/174 | 2 +-
 tests/qemu-iotests/178 | 4 ++--
 tests/qemu-iotests/197 | 4 ++--
 tests/qemu-iotests/215 | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== Testing blkverify through filename ==="
 echo
 
-TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
+TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
     _filter_imgfmt
 _make_test_img $IMG_SIZE
 $QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base $TEST_IMG" \
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== Testing blkverify through file blockref ==="
 echo
 
-TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
+TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
     _filter_imgfmt
 _make_test_img $IMG_SIZE
 $QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base,file.test.driver=$IMGFMT,file.test.file.filename=$TEST_IMG" \
diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/174
+++ b/tests/qemu-iotests/174
@@ -XXX,XX +XXX,XX @@ _unsupported_fmt raw
 
 
 size=256K
-IMGFMT=raw IMGKEYSECRET= IMGOPTS= _make_test_img $size | _filter_imgfmt
+IMGFMT=raw IMGKEYSECRET= _make_test_img --no-opts $size | _filter_imgfmt
 
 echo
 echo "== reading wrong format should fail =="
diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/178
+++ b/tests/qemu-iotests/178
@@ -XXX,XX +XXX,XX @@ $QEMU_IMG measure -O foo "$TEST_IMG" # unknown image file format
 
 make_test_img_with_fmt() {
     # Shadow global variables within this function
-    local IMGFMT="$1" IMGOPTS=""
-    _make_test_img "$2"
+    local IMGFMT="$1"
+    _make_test_img --no-opts "$2"
 }
 
 qemu_io_with_fmt() {
diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -XXX,XX +XXX,XX @@ if [ "$IMGFMT" = "vpc" ]; then
 fi
 _make_test_img 4G
 $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
-IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
-    _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
+    _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
 $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
 
 # Ensure that a read of two clusters, but where one is already allocated,
diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215
@@ -XXX,XX +XXX,XX @@ if [ "$IMGFMT" = "vpc" ]; then
 fi
 _make_test_img 4G
 $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
-IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
-    _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
+    _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
 $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
 
 # Ensure that a read of two clusters, but where one is already allocated,
-- 
2.24.1

Overwriting IMGOPTS means ignoring all user-supplied options, which is
not what we want.  Replace the current IMGOPTS use by a new BACKING_FILE
variable.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-14-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/267 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/267
+++ b/tests/qemu-iotests/267
@@ -XXX,XX +XXX,XX @@ size=128M
 
 run_test()
 {
-    _make_test_img $size
+    if [ -n "$BACKING_FILE" ]; then
+        _make_test_img -b "$BACKING_FILE" $size
+    else
+        _make_test_img $size
+    fi
     printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date
 }
 
@@ -XXX,XX +XXX,XX @@ echo
 
 TEST_IMG="$TEST_IMG.base" _make_test_img $size
 
-IMGOPTS="backing_file=$TEST_IMG.base" \
+BACKING_FILE="$TEST_IMG.base" \
 run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
          -blockdev driver=file,filename="$TEST_IMG",node-name=file \
          -blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt
 
-IMGOPTS="backing_file=$TEST_IMG.base" \
+BACKING_FILE="$TEST_IMG.base" \
 run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
          -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
          -blockdev driver=file,filename="$TEST_IMG",node-name=file \
@@ -XXX,XX +XXX,XX @@ echo
 echo "=== -blockdev with NBD server on the backing file ==="
 echo
 
-IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
+_make_test_img -b "$TEST_IMG.base" $size
 cat <<EOF |
 nbd_server_start unix:$SOCK_DIR/nbd
 nbd_server_add -w backing-fmt
-- 
2.24.1

Use _make_test_img whenever possible.  This way, we will not ignore
user-specified image options.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-15-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/094 | 2 +-
 tests/qemu-iotests/111 | 3 +--
 tests/qemu-iotests/123 | 2 +-
 tests/qemu-iotests/153 | 2 +-
 tests/qemu-iotests/200 | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -XXX,XX +XXX,XX @@ _supported_proto nbd
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 _make_test_img 64M
-$QEMU_IMG create -f $IMGFMT "$TEST_DIR/source.$IMGFMT" 64M | _filter_img_create
+TEST_IMG_FILE="$TEST_DIR/source.$IMGFMT" IMGPROTO=file _make_test_img 64M
 
 _launch_qemu -drive if=none,id=src,file="$TEST_DIR/source.$IMGFMT",format=raw \
              -nodefaults
diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/111
+++ b/tests/qemu-iotests/111
@@ -XXX,XX +XXX,XX @@ _supported_fmt qed qcow qcow2 vmdk
 _supported_proto file
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
-$QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
-    | _filter_testdir | _filter_imgfmt
+_make_test_img -b "$TEST_IMG.inexistent"
 
 # success, all done
 echo '*** done'
diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/123
+++ b/tests/qemu-iotests/123
@@ -XXX,XX +XXX,XX @@ _supported_os Linux
 SRC_IMG="$TEST_DIR/source.$IMGFMT"
 
 _make_test_img 1M
-$QEMU_IMG create -f $IMGFMT "$SRC_IMG" 1M | _filter_img_create
+TEST_IMG_FILE=$SRC_IMG IMGPROTO=file _make_test_img 1M
 
 $QEMU_IO -c 'write -P 42 0 1M' "$SRC_IMG" | _filter_qemu_io
 
diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/153
+++ b/tests/qemu-iotests/153
@@ -XXX,XX +XXX,XX @@ for opts1 in "" "read-only=on" "read-only=on,force-share=on"; do
 
     echo
     echo "== Creating test image =="
-    $QEMU_IMG create -f $IMGFMT "${TEST_IMG}" -b ${TEST_IMG}.base | _filter_img_create
+    _make_test_img -b "${TEST_IMG}.base"
 
     echo
     echo "== Launching QEMU, opts: '$opts1' =="
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 BACKING_IMG="${TEST_DIR}/backing.img"
 TEST_IMG="${TEST_DIR}/test.img"
 
-${QEMU_IMG} create -f $IMGFMT "${BACKING_IMG}" 512M | _filter_img_create
-${QEMU_IMG} create -f $IMGFMT -F $IMGFMT "${TEST_IMG}" -b "${BACKING_IMG}" 512M | _filter_img_create
+TEST_IMG="$BACKING_IMG" _make_test_img 512M
+_make_test_img -F $IMGFMT -b "$BACKING_IMG" 512M
 
 ${QEMU_IO} -c "write -P 0xa5 512 300M" "${BACKING_IMG}" | _filter_qemu_io
 
-- 
2.24.1

Just rm will not delete external data files.  Use _rm_test_img every
time we delete a test image.

(In the process, clean up the indentation of every _cleanup() this patch
touches.)

((Also, use quotes consistently.  I am happy to see unquoted instances
like "rm -rf $TEST_DIR/..." go.))

diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/019
+++ b/tests/qemu-iotests/019
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
-    rm -f "$TEST_IMG.base"
-    rm -f "$TEST_IMG.orig"
+    _cleanup_test_img
+    _rm_test_img "$TEST_IMG.base"
+    _rm_test_img "$TEST_IMG.orig"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
-    rm -f "$TEST_IMG.base"
-    rm -f "$TEST_IMG.orig"
+    _cleanup_test_img
+    _rm_test_img "$TEST_IMG.base"
+    _rm_test_img "$TEST_IMG.orig"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/024
+++ b/tests/qemu-iotests/024
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_DIR/t.$IMGFMT.base_old"
-    rm -f "$TEST_DIR/t.$IMGFMT.base_new"
+    _rm_test_img "$TEST_DIR/t.$IMGFMT.base_old"
+    _rm_test_img "$TEST_DIR/t.$IMGFMT.base_new"
 
-    rm -f "$TEST_DIR/subdir/t.$IMGFMT"
-    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_old"
-    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_new"
+    _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT"
+    _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_old"
+    _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_new"
     rmdir "$TEST_DIR/subdir" 2> /dev/null
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_qemu
-    rm -f "${TEST_IMG}.copy"
+    _rm_test_img "${TEST_IMG}.copy"
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/029
+++ b/tests/qemu-iotests/029
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-    rm -f $TEST_IMG.snap
+    _rm_test_img "$TEST_IMG.snap"
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/043
+++ b/tests/qemu-iotests/043
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG".[123].base
+    for img in "$TEST_IMG".[123].base; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/048
+++ b/tests/qemu-iotests/048
@@ -XXX,XX +XXX,XX @@ _cleanup()
 {
     echo "Cleanup"
     _cleanup_test_img
-    rm "${TEST_IMG_FILE2}"
+    _rm_test_img "${TEST_IMG_FILE2}"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/050
+++ b/tests/qemu-iotests/050
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.old"
-    rm -f "$TEST_IMG.new"
+    _rm_test_img "$TEST_IMG.old"
+    _rm_test_img "$TEST_IMG.new"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/053
+++ b/tests/qemu-iotests/053
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	rm -f "$TEST_IMG.orig"
-	_cleanup_test_img
+    _rm_test_img "$TEST_IMG.orig"
+    _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/058
+++ b/tests/qemu-iotests/058
@@ -XXX,XX +XXX,XX @@ _cleanup()
 {
     nbd_server_stop
     _cleanup_test_img
-    rm -f "$converted_image"
+    _rm_test_img "$converted_image"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.qcow2"
+    IMGFMT=qcow2 _rm_test_img "$TEST_IMG.qcow2"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f $TEST_IMG.data
+    _rm_test_img "$TEST_IMG.data"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
-	rm -f "$TEST_IMG.orig" "$TEST_IMG.raw1" "$TEST_IMG.raw2"
+    _cleanup_test_img
+    for img in "$TEST_IMG".{orig,raw1,raw2,target}; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/069
+++ b/tests/qemu-iotests/069
@@ -XXX,XX +XXX,XX @@ echo "=== Creating an image with a backing file and deleting that file ==="
 echo
 TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE
 _make_test_img -b "$TEST_IMG.base" $IMG_SIZE
-rm -f "$TEST_IMG.base"
+_rm_test_img "$TEST_IMG.base"
 # Just open the image and close it right again (this should print an error message)
 $QEMU_IO -c quit "$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt
 
diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/074
+++ b/tests/qemu-iotests/074
@@ -XXX,XX +XXX,XX @@ _cleanup()
 {
     echo "Cleanup"
     _cleanup_test_img
-    rm "${TEST_IMG2}"
+    _rm_test_img "${TEST_IMG2}"
     rm -f "$TEST_DIR/blkdebug.conf"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/080
+++ b/tests/qemu-iotests/080
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-    rm -f $TEST_IMG.snap
+    _rm_test_img "$TEST_IMG.snap"
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/081
+++ b/tests/qemu-iotests/081
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-    rm -rf $TEST_DIR/1.raw
-    rm -rf $TEST_DIR/2.raw
-    rm -rf $TEST_DIR/3.raw
+    _rm_test_img "$TEST_DIR/1.raw"
+    _rm_test_img "$TEST_DIR/2.raw"
+    _rm_test_img "$TEST_DIR/3.raw"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/085
+++ b/tests/qemu-iotests/085
@@ -XXX,XX +XXX,XX @@ _cleanup()
     _cleanup_qemu
     for i in $(seq 1 ${SNAPSHOTS})
     do
-        rm -f "${TEST_DIR}/${i}-${snapshot_virt0}"
-        rm -f "${TEST_DIR}/${i}-${snapshot_virt1}"
+        _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt0}"
+        _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt1}"
+    done
+    for img in "${TEST_IMG}".{1,2,base}
+    do
+        _rm_test_img "$img"
     done
-    rm -f "${TEST_IMG}" "${TEST_IMG}.1" "${TEST_IMG}.2" "${TEST_IMG}.base"
 
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/088
+++ b/tests/qemu-iotests/088
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-    rm -f $TEST_IMG.snap
+    _rm_test_img "$TEST_IMG.snap"
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/092
+++ b/tests/qemu-iotests/092
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-    rm -f $TEST_IMG.snap
+    _rm_test_img "$TEST_IMG.snap"
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -XXX,XX +XXX,XX @@ _cleanup()
 {
     _cleanup_qemu
     _cleanup_test_img
-    rm -f "$TEST_DIR/source.$IMGFMT"
+    _rm_test_img "$TEST_DIR/source.$IMGFMT"
 }
 
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/095
+++ b/tests/qemu-iotests/095
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_qemu
-    rm  -f "${TEST_IMG}.base" "${TEST_IMG}.snp1"
-	_cleanup_test_img
+    _rm_test_img "${TEST_IMG}.base"
+    _rm_test_img "${TEST_IMG}.snp1"
+    _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/099
+++ b/tests/qemu-iotests/099
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
+    _cleanup_test_img
+    _rm_test_img "$TEST_IMG.compare"
+    rm -f "$TEST_DIR/blkdebug.conf"
+
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
@@ -XXX,XX +XXX,XX @@ echo
 test_qemu "file.driver=blkdebug,file.image.filename=$TEST_IMG"
 
 
-rm -f "$TEST_IMG.compare" "$TEST_DIR/blkdebug.conf"
-
 # success, all done
 echo "*** done"
 rm -f $seq.full
diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/109
+++ b/tests/qemu-iotests/109
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_qemu
-    rm -f $TEST_IMG.src
-	_cleanup_test_img
+    _rm_test_img "$TEST_IMG.src"
+    _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
-        rm -f "$TEST_IMG.copy"
+    _cleanup_test_img
+    _rm_test_img "$TEST_IMG.copy"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/122
+++ b/tests/qemu-iotests/122
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-    rm -f "$TEST_IMG".[123]
-	_cleanup_test_img
+    for img in "$TEST_IMG".[123]; do
+        _rm_test_img "$img"
+    done
+    _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/123
+++ b/tests/qemu-iotests/123
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$SRC_IMG"
+    _rm_test_img "$SRC_IMG"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/141
+++ b/tests/qemu-iotests/141
@@ -XXX,XX +XXX,XX @@ _cleanup()
 {
     _cleanup_qemu
     _cleanup_test_img
-    rm -f "$TEST_DIR"/{b,m,o}.$IMGFMT
+    for img in "$TEST_DIR"/{b,m,o}.$IMGFMT; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/142
+++ b/tests/qemu-iotests/142
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f $TEST_IMG.snap
+    _rm_test_img "$TEST_IMG.snap"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/144
+++ b/tests/qemu-iotests/144
@@ -XXX,XX +XXX,XX @@ TMP_SNAP2=${TEST_DIR}/tmp2.qcow2
 _cleanup()
 {
     _cleanup_qemu
-    rm -f "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"
+    for img in "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"; do
+        _rm_test_img "$img"
+    done
 }
 
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/153
+++ b/tests/qemu-iotests/153
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "${TEST_IMG}.base"
-    rm -f "${TEST_IMG}.overlay"
-    rm -f "${TEST_IMG}.convert"
-    rm -f "${TEST_IMG}.a"
-    rm -f "${TEST_IMG}.b"
-    rm -f "${TEST_IMG}.c"
-    rm -f "${TEST_IMG}.lnk"
+    for img in "${TEST_IMG}".{base,overlay,convert,a,b,c,lnk}; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_qemu
-    rm -f "$TEST_IMG"{,.target}{,.backing,.overlay}
+    for img in "$TEST_IMG"{,.target}{,.backing,.overlay}; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
@@ -XXX,XX +XXX,XX @@ _send_qemu_cmd $QEMU_HANDLE \
     '"status": "null"'
 
 # Remove the source images
-rm -f "$TEST_IMG{,.backing,.overlay}"
+for img in "$TEST_IMG{,.backing,.overlay}"; do
+    _rm_test_img "$img"
+done
 
 echo
 
diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/159
+++ b/tests/qemu-iotests/159
@@ -XXX,XX +XXX,XX @@ status=1
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.out"
+    _rm_test_img "$TEST_IMG.out"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/160
+++ b/tests/qemu-iotests/160
@@ -XXX,XX +XXX,XX @@ status=1
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.out" "$TEST_IMG.out.dd"
+    _rm_test_img "$TEST_IMG.out"
+    _rm_test_img "$TEST_IMG.out.dd"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/161
+++ b/tests/qemu-iotests/161
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.base"
-    rm -f "$TEST_IMG.int"
+    _rm_test_img "$TEST_IMG.base"
+    _rm_test_img "$TEST_IMG.int"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/170
+++ b/tests/qemu-iotests/170
@@ -XXX,XX +XXX,XX @@ status=1
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.out"
+    _rm_test_img  "$TEST_IMG.out"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/172
+++ b/tests/qemu-iotests/172
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
-    rm -f "$TEST_IMG.2"
-    rm -f "$TEST_IMG.3"
+    _cleanup_test_img
+    _rm_test_img "$TEST_IMG.2"
+    _rm_test_img "$TEST_IMG.3"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/173
+++ b/tests/qemu-iotests/173
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
 _cleanup()
 {
     _cleanup_qemu
-    rm  -f "${QEMU_TEST_DIR}/image.base" "${QEMU_TEST_DIR}/image.snp1"
+    _rm_test_img "${TEST_DIR}/image.base"
+    _rm_test_img "${TEST_DIR}/image.snp1"
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/178
+++ b/tests/qemu-iotests/178
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.converted"
+    _rm_test_img "$TEST_IMG.converted"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/182
+++ b/tests/qemu-iotests/182
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.overlay"
+    _rm_test_img "$TEST_IMG.overlay"
     rm -f "$SOCK_DIR/nbd.socket"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/183
+++ b/tests/qemu-iotests/183
@@ -XXX,XX +XXX,XX @@ MIG_SOCKET="${SOCK_DIR}/migrate"
 _cleanup()
 {
     rm -f "${MIG_SOCKET}"
-    rm -f "${TEST_IMG}.dest"
+    _rm_test_img "${TEST_IMG}.dest"
     _cleanup_test_img
     _cleanup_qemu
 }
diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/185
+++ b/tests/qemu-iotests/185
@@ -XXX,XX +XXX,XX @@ status=1 # failure is the default!
 
 _cleanup()
 {
-    rm -f "${TEST_IMG}.mid"
-    rm -f "${TEST_IMG}.copy"
+    _rm_test_img "${TEST_IMG}.mid"
+    _rm_test_img "${TEST_IMG}.copy"
     _cleanup_test_img
     _cleanup_qemu
 }
diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/187
+++ b/tests/qemu-iotests/187
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
-    rm -f "$TEST_IMG.2"
-    rm -f "$TEST_IMG.3"
+    _cleanup_test_img
+    _rm_test_img "$TEST_IMG.2"
+    _rm_test_img "$TEST_IMG.3"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/190
+++ b/tests/qemu-iotests/190
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.converted"
+    _rm_test_img "$TEST_IMG.converted"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -XXX,XX +XXX,XX @@ status=1 # failure is the default!
 
 _cleanup()
 {
-    rm -f "${TEST_IMG}.mid"
-    rm -f "${TEST_IMG}.ovl2"
-    rm -f "${TEST_IMG}.ovl3"
+    _rm_test_img "${TEST_IMG}.mid"
+    _rm_test_img "${TEST_IMG}.ovl2"
+    _rm_test_img "${TEST_IMG}.ovl3"
     _cleanup_test_img
     _cleanup_qemu
 }
diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/195
+++ b/tests/qemu-iotests/195
@@ -XXX,XX +XXX,XX @@ status=1 # failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.mid"
+    _rm_test_img "$TEST_IMG.mid"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -XXX,XX +XXX,XX @@ esac
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_WRAP"
+    _rm_test_img "$TEST_WRAP"
     rm -f "$BLKDBG_CONF"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
 _cleanup()
 {
     _cleanup_qemu
-    rm -f "${TEST_IMG}" "${BACKING_IMG}"
+    _rm_test_img "${TEST_IMG}"
+    _rm_test_img "${BACKING_IMG}"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215
@@ -XXX,XX +XXX,XX @@ esac
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_WRAP"
+    _rm_test_img "$TEST_WRAP"
     rm -f "$BLKDBG_CONF"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/225 b/tests/qemu-iotests/225
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/225
+++ b/tests/qemu-iotests/225
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.not_base"
+    _rm_test_img "$TEST_IMG.not_base"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/229
+++ b/tests/qemu-iotests/229
@@ -XXX,XX +XXX,XX @@ _cleanup()
 {
     _cleanup_qemu
     _cleanup_test_img
-    rm -f "$TEST_IMG" "$DEST_IMG"
+    _rm_test_img "$TEST_IMG"
+    _rm_test_img "$DEST_IMG"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/232
+++ b/tests/qemu-iotests/232
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f $TEST_IMG.[01234]
+    for img in "$TEST_IMG".[01234]; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f $TEST_IMG.data
+    _rm_test_img "$TEST_IMG.data"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f $TEST_IMG.data
-    rm -f $TEST_IMG.src
+    _rm_test_img "$TEST_IMG.data"
+    _rm_test_img "$TEST_IMG.src"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/247
+++ b/tests/qemu-iotests/247
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f $TEST_IMG.[01234]
+    for img in "$TEST_IMG".[01234]; do
+        _rm_test_img "$img"
+    done
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/249
+++ b/tests/qemu-iotests/249
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.base"
-    rm -f "$TEST_IMG.int"
+    _rm_test_img "$TEST_IMG.base"
+    _rm_test_img "$TEST_IMG.int"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/252 b/tests/qemu-iotests/252
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/252
+++ b/tests/qemu-iotests/252
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 _cleanup()
 {
     _cleanup_test_img
-    rm -f "$TEST_IMG.base_new"
+    _rm_test_img "$TEST_IMG.base_new"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
-- 
2.24.1

This will not work with external data files, so try to get tests working
without it as far as possible.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-17-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/063     | 12 ++++--------
 tests/qemu-iotests/063.out |  3 ++-
 tests/qemu-iotests/085     |  9 +++------
 tests/qemu-iotests/085.out |  8 ++++----
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -XXX,XX +XXX,XX @@ _unsupported_imgopts "subformat=monolithicFlat" \
 _make_test_img 4M
 
 echo "== Testing conversion with -n fails with no target file =="
-# check .orig file does not exist
-rm -f "$TEST_IMG.orig"
 if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" >/dev/null 2>&1; then
     exit 1
 fi
 
 echo "== Testing conversion with -n succeeds with a target file =="
-rm -f "$TEST_IMG.orig"
-cp "$TEST_IMG" "$TEST_IMG.orig"
+_rm_test_img "$TEST_IMG.orig"
+TEST_IMG="$TEST_IMG.orig" _make_test_img 4M
 if ! $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" ; then
     exit 1
 fi
@@ -XXX,XX +XXX,XX @@ fi
 _check_test_img
 
 echo "== Testing conversion to a smaller file fails =="
-rm -f "$TEST_IMG.orig"
-mv "$TEST_IMG" "$TEST_IMG.orig"
-_make_test_img 2M
-if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev/null 2>&1; then
+TEST_IMG="$TEST_IMG.target" _make_test_img 2M
+if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.target" >/dev/null 2>&1; then
     exit 1
 fi
 
diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/063.out
+++ b/tests/qemu-iotests/063.out
@@ -XXX,XX +XXX,XX @@ QA output created by 063
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
 == Testing conversion with -n fails with no target file ==
 == Testing conversion with -n succeeds with a target file ==
+Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=4194304
 == Testing conversion to raw is the same after conversion with -n ==
 == Testing conversion back to original format ==
 No errors were found on the image.
 == Testing conversion to a smaller file fails ==
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
+Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=2097152
 == Regression testing for copy offloading bug ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
 Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=1048576
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/085
+++ b/tests/qemu-iotests/085
@@ -XXX,XX +XXX,XX @@ add_snapshot_image()
 {
     base_image="${TEST_DIR}/$((${1}-1))-${snapshot_virt0}"
     snapshot_file="${TEST_DIR}/${1}-${snapshot_virt0}"
-    _make_test_img -u -b "${base_image}" "$size"
-    mv "${TEST_IMG}" "${snapshot_file}"
+    TEST_IMG=$snapshot_file _make_test_img -u -b "${base_image}" "$size"
     do_blockdev_add "$1" "'backing': null, " "${snapshot_file}"
 }
 
@@ -XXX,XX +XXX,XX @@ blockdev_snapshot()
 
 size=128M
 
-_make_test_img $size
-mv "${TEST_IMG}" "${TEST_IMG}.1"
-_make_test_img $size
-mv "${TEST_IMG}" "${TEST_IMG}.2"
+TEST_IMG="$TEST_IMG.1" _make_test_img $size
+TEST_IMG="$TEST_IMG.2" _make_test_img $size
 
 echo
 echo === Running QEMU ===
diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/085.out
+++ b/tests/qemu-iotests/085.out
@@ -XXX,XX +XXX,XX @@
 QA output created by 085
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Formatting 'TEST_DIR/t.IMGFMT.1', fmt=IMGFMT size=134217728
+Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=134217728
 
 === Running QEMU ===
 
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=qcow2 size=134217728 backing_fil
 
 === Create a couple of snapshots using blockdev-snapshot ===
 
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
+Formatting 'TEST_DIR/11-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
 { 'execute': 'blockdev-add', 'arguments': { 'driver': 'IMGFMT', 'node-name': 'snap_11', 'backing': null, 'file': { 'driver': 'file', 'filename': 'TEST_DIR/11-snapshot-v0.IMGFMT', 'node-name': 'file_11' } } }
 {"return": {}}
 { 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_11' } }
 {"return": {}}
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
+Formatting 'TEST_DIR/12-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
 { 'execute': 'blockdev-add', 'arguments': { 'driver': 'IMGFMT', 'node-name': 'snap_12', 'backing': null, 'file': { 'driver': 'file', 'filename': 'TEST_DIR/12-snapshot-v0.IMGFMT', 'node-name': 'file_12' } } }
 {"return": {}}
 { 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_12' } }
-- 
2.24.1

The image end offset as reported by qemu-img check is different when
using an external data file; we do not care about its value here, so we
can just filter it.  Incidentally, common.rc already has _check_test_img
for us which does exactly that.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-18-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/091     | 2 +-
 tests/qemu-iotests/091.out | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/091
+++ b/tests/qemu-iotests/091
@@ -XXX,XX +XXX,XX @@ echo "Check image pattern"
 ${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir | _filter_qemu_io
 
 echo "Running 'qemu-img check -r all \$TEST_IMG'"
-"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_qemu
+_check_test_img -r all
 
 echo "*** done"
 rm -f $seq.full
diff --git a/tests/qemu-iotests/091.out b/tests/qemu-iotests/091.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/091.out
+++ b/tests/qemu-iotests/091.out
@@ -XXX,XX +XXX,XX @@ read 4194304/4194304 bytes at offset 0
 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 Running 'qemu-img check -r all $TEST_IMG'
 No errors were found on the image.
-80/16384 = 0.49% allocated, 0.00% fragmented, 0.00% compressed clusters
-Image end offset: 5570560
 *** done
-- 
2.24.1

The only difference is that the json:{} filename of the image looks
different.  We actually do not care about that filename in this test, we
are only interested in (1) that there is a json:{} filename, and (2)
whether the backing filename can be constructed.

So just filter out the json:{} data, thus making this test pass both
with and without data_file.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-19-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/110     | 7 +++++--
 tests/qemu-iotests/110.out | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110
@@ -XXX,XX +XXX,XX @@ echo
 # Across blkdebug without a config file, you cannot reconstruct filenames, so
 # qemu is incapable of knowing the directory of the top image from the filename
 # alone. However, using bdrv_dirname(), it should still work.
+# (Filter out the json:{} filename so this test works with external data files)
 TEST_IMG="json:{
     'driver': '$IMGFMT',
     'file': {
@@ -XXX,XX +XXX,XX @@ TEST_IMG="json:{
             }
         ]
     }
-}" _img_info | _filter_img_info | grep -v 'backing file format'
+}" _img_info | _filter_img_info | grep -v 'backing file format' \
+    | _filter_json_filename
 
 echo
 echo '=== Backing name is always relative to the backed image ==='
@@ -XXX,XX +XXX,XX @@ TEST_IMG="json:{
             }
         ]
     }
-}" _img_info | _filter_img_info | grep -v 'backing file format'
+}" _img_info | _filter_img_info | grep -v 'backing file format' \
+    | _filter_json_filename
 
 
 # success, all done
diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/110.out
+++ b/tests/qemu-iotests/110.out
@@ -XXX,XX +XXX,XX @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
 
 === Non-reconstructable filename ===
 
-image: json:{"driver": "IMGFMT", "file": {"set-state.0.event": "read_aio", "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "set-state.0.new_state": 42}}
+image: json:{ /* filtered */ }
 file format: IMGFMT
 virtual size: 64 MiB (67108864 bytes)
 backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b
 
 === Nodes without a common directory ===
 
-image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "vote-threshold": 1}}
+image: json:{ /* filtered */ }
 file format: IMGFMT
 virtual size: 64 MiB (67108864 bytes)
 backing file: t.IMGFMT.base (cannot determine actual path)
-- 
2.24.1

When using an external data file, there are no refcounts for data
clusters.  We thus have to adjust the corruption test in this patch to
not be based around a data cluster allocation, but the L2 table
allocation (L2 tables are still refcounted with external data files).

Furthermore, we should not print qcow2.py's list of incompatible
features because it differs depending on whether there is an external
data file or not.

With those two changes, the test will work both with and without
external data files (once that options works with the iotests at all).

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-20-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/137     | 15 +++++++++++----
 tests/qemu-iotests/137.out |  6 ++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/137
+++ b/tests/qemu-iotests/137
@@ -XXX,XX +XXX,XX @@ $QEMU_IO \
     "$TEST_IMG" 2>&1 | _filter_qemu_io
 
 # The dirty bit must not be set
-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
+# (Filter the external data file bit)
+if $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features \
+    | grep -q '\<0\>'
+then
+    echo 'ERROR: Dirty bit set'
+else
+    echo 'OK: Dirty bit not set'
+fi
 
 # Similarly we can test whether corruption detection has been enabled:
-# Create L1/L2, overwrite first entry in refcount block, allocate something.
+# Create L1, overwrite refcounts, force allocation of L2 by writing
+# data.
 # Disabling the checks should fail, so the corruption must be detected.
 _make_test_img 64M
-$QEMU_IO -c "write 0 64k" "$TEST_IMG" | _filter_qemu_io
-poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00"
+poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00\x00\x00\x00\x00\x00\x00"
 $QEMU_IO \
     -c "reopen -o overlap-check=none,lazy-refcounts=42" \
     -c "write 64k 64k" \
diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/137.out
+++ b/tests/qemu-iotests/137.out
@@ -XXX,XX +XXX,XX @@ qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 ./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
-incompatible_features     []
+OK: Dirty bit not set
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-wrote 65536/65536 bytes at offset 0
-64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
-qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with qcow2_header); further corruption events will be suppressed
+qcow2: Marking image as corrupt: Preventing invalid allocation of L2 table at offset 0; further corruption events will be suppressed
 write failed: Input/output error
 *** done
-- 
2.24.1

We do not care about the json:{} filenames here, so we can just filter
them out and thus make the test work both with and without external data
files.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-21-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/198     | 6 ++++--
 tests/qemu-iotests/198.out | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/198
+++ b/tests/qemu-iotests/198
@@ -XXX,XX +XXX,XX @@ echo
 echo "== checking image base =="
 $QEMU_IMG info --image-opts $IMGSPECBASE | _filter_img_info --format-specific \
     | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
-          -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
+          -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
+    | _filter_json_filename
 
 echo
 echo "== checking image layer =="
 $QEMU_IMG info --image-opts $IMGSPECLAYER | _filter_img_info --format-specific \
     | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
-          -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
+          -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
+    | _filter_json_filename
 
 
 # success, all done
diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/198.out
+++ b/tests/qemu-iotests/198.out
@@ -XXX,XX +XXX,XX @@ read 16777216/16777216 bytes at offset 0
 16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 == checking image base ==
-image: json:{"encrypt.key-secret": "sec0", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.base"}}
+image: json:{ /* filtered */ }
 file format: IMGFMT
 virtual size: 16 MiB (16777216 bytes)
 Format specific information:
@@ -XXX,XX +XXX,XX @@ Format specific information:
         master key iters: 1024
 
 == checking image layer ==
-image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}}
+image: json:{ /* filtered */ }
 file format: IMGFMT
 virtual size: 16 MiB (16777216 bytes)
 backing file: TEST_DIR/t.IMGFMT.base
-- 
2.24.1

diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/007
+++ b/tests/qemu-iotests/007
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 # refcount_bits must be at least 4 so we can create ten internal snapshots
-# (1 bit supports none, 2 bits support two, 4 bits support 14)
-_unsupported_imgopts 'refcount_bits=$1\|2$[^0-9]'
+# (1 bit supports none, 2 bits support two, 4 bits support 14);
+# snapshot are generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=$1\|2$[^0-9]' data_file
 
 echo
 echo "creating image"
diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/014
+++ b/tests/qemu-iotests/014
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# Compression and snapshots do not work with external data files
+_unsupported_imgopts data_file
 
 TEST_OFFSETS="0 4294967296"
 TEST_OPS="writev read write readv"
diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/015
+++ b/tests/qemu-iotests/015
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # actually any format that supports snapshots
 _supported_fmt qcow2
 _supported_proto generic
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 echo
 echo "creating image"
diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026
@@ -XXX,XX +XXX,XX @@ _supported_cache_modes writethrough none
 # 32 and 64 bits do not work either, however, due to different leaked cluster
 # count on error.
 # Thus, the only remaining option is refcount_bits=16.
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+#
+# As for data_file, none of the refcount tests can work for it.
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)' \
+    data_file
 
 echo "Errors while writing 128 kB"
 echo
diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/029
+++ b/tests/qemu-iotests/029
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 offset_size=24
 offset_l1_size=36
diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-# We want to test compat=0.10, which does not support refcount widths
-# other than 16
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# 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]\|$$\)'
 
 CLUSTER_SIZE=65536
 
diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-# Only qcow2v3 and later supports feature bits
-_unsupported_imgopts 'compat=0.10'
+# Only qcow2v3 and later supports feature bits;
+# qcow2.py does not support external data files
+_unsupported_imgopts 'compat=0.10' data_file
 
 echo
 echo === Image with unknown incompatible feature bit ===
diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/039
+++ b/tests/qemu-iotests/039
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 _supported_os Linux
 _default_cache_mode writethrough
 _supported_cache_modes writethrough
+# Some of these test cases expect no external data file so that all
+# clusters are part of the qcow2 image and refcounted
+_unsupported_imgopts data_file
 
 size=128M
 
diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
+# data_file does not support compressed clusters
+_unsupported_imgopts data_file
 
 CLUSTER_SIZE=64k
 size=128M
diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/048
+++ b/tests/qemu-iotests/048
@@ -XXX,XX +XXX,XX @@ _compare()
 _supported_fmt raw qcow2 qed luks
 _supported_proto file
 _supported_os Linux
+# Using 'cp' is incompatible with external data files
+_unsupported_imgopts data_file
 
 # Remove once all tests are fixed to use TEST_IMG_FILE
 # correctly and common.rc sets it unconditionally
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _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
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# other than refcount_bits=16;
+# it also will not support an external data file
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)' data_file
 _require_drivers nbd
 
 do_run_qemu()
diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/058
+++ b/tests/qemu-iotests/058
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
 _require_command QEMU_NBD
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 nbd_snapshot_img="nbd:unix:$nbd_unix_socket"
 
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -XXX,XX +XXX,XX @@ _filter_io_error()
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# These tests only work for compat=1.1 images with refcount_bits=16
-_unsupported_imgopts 'compat=0.10' 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# These tests only work for compat=1.1 images without an external
+# data file with refcount_bits=16
+_unsupported_imgopts 'compat=0.10' data_file \
+    'refcount_bits=$[^1]\|.\([^6]\|$$\)'
 
 # The repair process will create a large file - so check for availability first
 _require_large_file 64G
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
 # Conversion between different compat versions can only really work
-# with refcount_bits=16
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# with refcount_bits=16;
+# we have explicit tests for data_file here, but the whole test does
+# not work with it
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)' data_file
 
 echo
 echo "=== Testing version downgrade with zero expansion ==="
diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/062
+++ b/tests/qemu-iotests/062
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 # We need zero clusters and snapshots
-_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
 
 IMG_SIZE=64M
 
diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/066
+++ b/tests/qemu-iotests/066
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 # We need zero clusters and snapshots
-_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
+# (TODO: Consider splitting the snapshot part into a separate test
+#        file, so this one runs with refcount_bits=1 and data_file)
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
 
 # Intentionally create an unaligned image
 IMG_SIZE=$((64 * 1024 * 1024 + 512))
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _supported_fmt qcow2
 _supported_proto file
-# Because anything other than 16 would change the output of query-block
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# Because anything other than 16 would change the output of query-block,
+# and external data files would change the output of
+# query-named-block-nodes
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)' data_file
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
 
 IMG_SIZE=128K
 
diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _require_drivers blkdebug blkverify
+# blkdebug can only inject errors on bs->file, not on the data_file,
+# so thie test does not work with external data files
+_unsupported_imgopts data_file
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/073
+++ b/tests/qemu-iotests/073
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
+# External data files do not support compressed clusters
+# (TODO: Consider writing a version for external data files that does
+#        not test compressed clusters)
+_unsupported_imgopts data_file
 
 CLUSTER_SIZE=64k
 size=128M
diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/074
+++ b/tests/qemu-iotests/074
@@ -XXX,XX +XXX,XX @@ _compare()
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# blkdebug can only inject errors on bs->file
+_unsupported_imgopts data_file
 
 # Setup test basic parameters
 TEST_IMG2=$TEST_IMG.2
diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/080
+++ b/tests/qemu-iotests/080
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# - Internal snapshots are (currently) impossible with refcount_bits=1
+# - Internal snapshots are (currently) impossible with refcount_bits=1,
+#   and generally impossible with external data files
 # - This is generally a test for compat=1.1 images
-_unsupported_imgopts 'refcount_bits=1[^0-9]' 'compat=0.10'
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file 'compat=0.10'
 
 header_size=104
 
diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/090
+++ b/tests/qemu-iotests/090
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
+# External data files do not support compressed clusters
+_unsupported_imgopts data_file
 
 IMG_SIZE=128K
 
diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/098
+++ b/tests/qemu-iotests/098
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-# The code path we want to test here only works for compat=1.1 images
-_unsupported_imgopts 'compat=0.10'
+# The code path we want to test here only works for compat=1.1 images;
+# blkdebug can only inject errors on bs->file, so external data files
+# do not work with this test
+_unsupported_imgopts 'compat=0.10' data_file
 
 for event in l1_update empty_image_prepare reftable_update refblock_alloc; do
 
diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/099
+++ b/tests/qemu-iotests/099
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 qed vdi vhdx vmdk vpc
 _supported_proto file
 _supported_os Linux
 _require_drivers blkdebug blkverify
+# data_file would change the json:{} filenames
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
-    "subformat=twoGbMaxExtentSparse"
+    "subformat=twoGbMaxExtentSparse" data_file
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/103
+++ b/tests/qemu-iotests/103
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 IMG_SIZE=64K
 
diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/108
+++ b/tests/qemu-iotests/108
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# This test directly modifies a refblock so it relies on refcount_bits being 16
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# This test directly modifies a refblock so it relies on refcount_bits being 16;
+# and the low-level modification it performs are not tuned for external data
+# files
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)' data_file
 
 echo
 echo '=== Repairing an image without any refcount table ==='
diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/112
+++ b/tests/qemu-iotests/112
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 # This test will set refcount_bits on its own which would conflict with the
-# manual setting; compat will be overridden as well
-_unsupported_imgopts refcount_bits 'compat=0.10'
+# 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
 
 print_refcount_bits()
 {
diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/114
+++ b/tests/qemu-iotests/114
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
+# qcow2.py does not work too well with external data files
+_unsupported_imgopts data_file
 
 
 TEST_IMG="$TEST_IMG.base" _make_test_img 64M
diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/121
+++ b/tests/qemu-iotests/121
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# Refcount structures are used much differently with external data
+# files
+_unsupported_imgopts data_file
 
 echo
 echo '=== New refcount structures may not conflict with existing structures ==='
diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/138
+++ b/tests/qemu-iotests/138
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# With an external data file, data clusters are not refcounted
+# (and so qemu-img check does not check their refcount)
+_unsupported_imgopts data_file
 
 echo
 echo '=== Check on an image with a multiple of 2^32 clusters ==='
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2 qed
 _supported_proto generic
 _unsupported_proto vxhs
+# Copying files around with cp does not work with external data files
+_unsupported_imgopts data_file
 
 # Create source disk
 TEST_IMG="$TEST_IMG.backing" _make_test_img 1M
diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/176
+++ b/tests/qemu-iotests/176
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# Persistent dirty bitmaps require compat=1.1
-_unsupported_imgopts 'compat=0.10'
+# Persistent dirty bitmaps require compat=1.1;
+# Internal snapshots forbid using an external data file
+# (they work with refcount_bits=1 here, though, because there actually
+# is no data when creating the snapshot)
+_unsupported_imgopts 'compat=0.10' data_file
 
 run_qemu()
 {
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
+# An external data file would change the query-named-block-nodes output
+_unsupported_imgopts data_file
 
 size=64M
 
diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/201
+++ b/tests/qemu-iotests/201
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2
 _supported_proto generic
 _supported_os Linux
 
-# Internal snapshots are (currently) impossible with refcount_bits=1
-# This was taken from test 080
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 size=64M
 _make_test_img $size
diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/214
+++ b/tests/qemu-iotests/214
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 
 # Repairing the corrupted image requires qemu-img check to store a
 # refcount up to 3, which requires at least two refcount bits.
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# External data files do not support compressed clusters.
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 
 echo
diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/217
+++ b/tests/qemu-iotests/217
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 
 # This test needs clusters with at least a refcount of 2 so that
 # OFLAG_COPIED is not set.  refcount_bits=1 is therefore unsupported.
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# (As are external data files.)
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 echo
 echo '=== Simulating an I/O error during snapshot deletion ==='
diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/220
+++ b/tests/qemu-iotests/220
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# To use a different refcount width but 16 bits we need compat=1.1
-_unsupported_imgopts 'compat=0.10'
+# To use a different refcount width but 16 bits we need compat=1.1,
+# and external data files do not support compressed clusters.
+_unsupported_imgopts 'compat=0.10' data_file
 
 echo "== Creating huge file =="
 
diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# External data files do not work with compat=0.10
-_unsupported_imgopts 'compat=0.10'
+# External data files do not work with compat=0.10, and because there
+# is an explicit case for external data files here, we cannot allow
+# the user to specify whether to use one
+_unsupported_imgopts 'compat=0.10' data_file
 
 for mode in off metadata falloc full; do
 
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-# External data files do not work with compat=0.10
-_unsupported_imgopts 'compat=0.10'
+# External data files do not work with compat=0.10, and because we use
+# our own external data file, we cannot let the user specify one
+_unsupported_imgopts 'compat=0.10' data_file
 
 echo
 echo "=== Create and open image with external data file ==="
diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/250
+++ b/tests/qemu-iotests/250
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# This test does not make much sense with external data files
+_unsupported_imgopts data_file
 
 # This test checks that qcow2_process_discards does not truncate a discard
 # request > 2G.
diff --git a/tests/qemu-iotests/261 b/tests/qemu-iotests/261
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/261
+++ b/tests/qemu-iotests/261
@@ -XXX,XX +XXX,XX @@ _supported_os Linux
 # (1) We create a v2 image that supports nothing but refcount_bits=16
 # (2) We do some refcount management on our own which expects
 #     refcount_bits=16
-_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)'
+# As for data files, they do not support snapshots at all.
+_unsupported_imgopts 'refcount_bits=$[^1]\|.\([^6]\|$$\)' data_file
 
 # Parameters:
 #   $1: image filename
diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/267
+++ b/tests/qemu-iotests/267
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 _supported_os Linux
 _require_drivers copy-on-read
 
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/273 b/tests/qemu-iotests/273
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/273
+++ b/tests/qemu-iotests/273
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+# External data files would add nodes to the block graph, so it would
+# not match the reference output
+_unsupported_imgopts data_file
 
 do_run_qemu()
 {
-- 
2.24.1

The problem with allowing the data_file option is that you want to use a
different data file per image used in the test.  Therefore, we need to
allow patterns like -o data_file='$TEST_IMG.data_file'.

Then, we need to filter it out from qemu-img map, qemu-img create, and
remove the data file in _rm_test_img.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-23-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/common.filter | 23 +++++++++++++++++++++--
 tests/qemu-iotests/common.rc     | 22 +++++++++++++++++++++-
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -XXX,XX +XXX,XX @@ _filter_actual_image_size()
 # replace driver-specific options in the "Formatting..." line
 _filter_img_create()
 {
-    $SED -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
+    data_file_filter=()
+    if data_file=$(_get_data_file "$TEST_IMG"); then
+        data_file_filter=(-e "s# data_file=$data_file##")
+    fi
+
+    $SED "${data_file_filter[@]}" \
+        -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
         -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
         -e "s#$TEST_DIR#TEST_DIR#g" \
         -e "s#$SOCK_DIR#SOCK_DIR#g" \
@@ -XXX,XX +XXX,XX @@ _filter_img_info()
 # human and json output
 _filter_qemu_img_map()
 {
+    # Assuming the data_file value in $IMGOPTS contains a '$TEST_IMG',
+    # create a filter that replaces the data file name by $TEST_IMG.
+    # Example:
+    #   In $IMGOPTS: 'data_file=$TEST_IMG.data_file'
+    #   Then data_file_pattern == '$.*$.data_file'
+    #   And  data_file_filter  == -e 's#$.*$.data_file#\1#
+    data_file_filter=()
+    if data_file_pattern=$(_get_data_file '\$.*\$'); then
+        data_file_filter=(-e "s#$data_file_pattern#\\1#")
+    fi
+
     $SED -e 's/$[0-9a-fx]* *[0-9a-fx]* *$[0-9a-fx]* */\1/g' \
         -e 's/"offset": [0-9]\+/"offset": OFFSET/g' \
-        -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt
+        -e 's/Mapped to *//' \
+        "${data_file_filter[@]}" \
+        | _filter_testdir | _filter_imgfmt
 }
 
 _filter_nbd()
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ _stop_nbd_server()
     fi
 }
 
+# Gets the data_file value from IMGOPTS and replaces the '$TEST_IMG'
+# pattern by '$1'
+# Caution: The replacement is done with sed, so $1 must be escaped
+#          properly.  (The delimiter is '#'.)
+_get_data_file()
+{
+    if ! echo "$IMGOPTS" | grep -q 'data_file='; then
+        return 1
+    fi
+
+    echo "$IMGOPTS" | sed -e 's/.*data_file=$[^,]*$.*/\1/' \
+                    | sed -e "s#\\\$TEST_IMG#$1#"
+}
+
 _make_test_img()
 {
     # extra qemu-img options can be added by tests
@@ -XXX,XX +XXX,XX @@ _make_test_img()
     fi
 
     if [ -n "$IMGOPTS" ]; then
-        optstr=$(_optstr_add "$optstr" "$IMGOPTS")
+        imgopts_expanded=$(echo "$IMGOPTS" | sed -e "s#\\\$TEST_IMG#$img_name#")
+        optstr=$(_optstr_add "$optstr" "$imgopts_expanded")
     fi
     if [ -n "$IMGKEYSECRET" ]; then
         object_options="--object secret,id=keysec0,data=$IMGKEYSECRET"
@@ -XXX,XX +XXX,XX @@ _rm_test_img()
         # Remove all the extents for vmdk
         "$QEMU_IMG" info "$img" 2>/dev/null | grep 'filename:' | cut -f 2 -d: \
             | xargs -I {} rm -f "{}"
+    elif [ "$IMGFMT" = "qcow2" ]; then
+        # Remove external data file
+        if data_file=$(_get_data_file "$img"); then
+            rm -f "$data_file"
+        fi
     fi
     rm -f "$img"
 }
-- 
2.24.1

From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>

Allow writing all the data compressed through the filter driver.
The written data will be aligned by the cluster size.
Based on the QEMU current implementation, that data can be written to
unallocated clusters only. May be used for a backup job.

Suggested-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 1575288906-551879-2-git-send-email-andrey.shinkevich@virtuozzo.com
[mreitz: Replace NULL bdrv_get_format_name() by "(no format)"]
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/Makefile.objs     |   1 +
 block/filter-compress.c | 168 ++++++++++++++++++++++++++++++++++++++++
 qapi/block-core.json    |  10 ++-
 3 files changed, 175 insertions(+), 4 deletions(-)
 create mode 100644 block/filter-compress.c

diff --git a/block/Makefile.objs b/block/Makefile.objs
index XXXXXXX..XXXXXXX 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -XXX,XX +XXX,XX @@ block-obj-y += crypto.o
 
 block-obj-y += aio_task.o
 block-obj-y += backup-top.o
+block-obj-y += filter-compress.o
 
 common-obj-y += stream.o
 
diff --git a/block/filter-compress.c b/block/filter-compress.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/block/filter-compress.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * Compress filter block driver
+ *
+ * Copyright (c) 2019 Virtuozzo International GmbH
+ *
+ * Author:
+ *   Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
+ *   (based on block/copy-on-read.c by Max Reitz)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 or
+ * (at your option) any later version of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qemu/osdep.h"
+#include "block/block_int.h"
+#include "qemu/module.h"
+#include "qapi/error.h"
+
+
+static int compress_open(BlockDriverState *bs, QDict *options, int flags,
+                         Error **errp)
+{
+    bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file, false,
+                               errp);
+    if (!bs->file) {
+        return -EINVAL;
+    }
+
+    if (!bs->file->bs->drv || !block_driver_can_compress(bs->file->bs->drv)) {
+        error_setg(errp,
+                   "Compression is not supported for underlying format: %s",
+                   bdrv_get_format_name(bs->file->bs) ?: "(no format)");
+
+        return -ENOTSUP;
+    }
+
+    bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |
+        (BDRV_REQ_FUA & bs->file->bs->supported_write_flags);
+
+    bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |
+        ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
+            bs->file->bs->supported_zero_flags);
+
+    return 0;
+}
+
+
+static int64_t compress_getlength(BlockDriverState *bs)
+{
+    return bdrv_getlength(bs->file->bs);
+}
+
+
+static int coroutine_fn compress_co_preadv_part(BlockDriverState *bs,
+                                                uint64_t offset, uint64_t bytes,
+                                                QEMUIOVector *qiov,
+                                                size_t qiov_offset,
+                                                int flags)
+{
+    return bdrv_co_preadv_part(bs->file, offset, bytes, qiov, qiov_offset,
+                               flags);
+}
+
+
+static int coroutine_fn compress_co_pwritev_part(BlockDriverState *bs,
+                                                 uint64_t offset,
+                                                 uint64_t bytes,
+                                                 QEMUIOVector *qiov,
+                                                 size_t qiov_offset, int flags)
+{
+    return bdrv_co_pwritev_part(bs->file, offset, bytes, qiov, qiov_offset,
+                                flags | BDRV_REQ_WRITE_COMPRESSED);
+}
+
+
+static int coroutine_fn compress_co_pwrite_zeroes(BlockDriverState *bs,
+                                                  int64_t offset, int bytes,
+                                                  BdrvRequestFlags flags)
+{
+    return bdrv_co_pwrite_zeroes(bs->file, offset, bytes, flags);
+}
+
+
+static int coroutine_fn compress_co_pdiscard(BlockDriverState *bs,
+                                             int64_t offset, int bytes)
+{
+    return bdrv_co_pdiscard(bs->file, offset, bytes);
+}
+
+
+static void compress_refresh_limits(BlockDriverState *bs, Error **errp)
+{
+    BlockDriverInfo bdi;
+    int ret;
+
+    if (!bs->file) {
+        return;
+    }
+
+    ret = bdrv_get_info(bs->file->bs, &bdi);
+    if (ret < 0 || bdi.cluster_size == 0) {
+        return;
+    }
+
+    bs->bl.request_alignment = bdi.cluster_size;
+}
+
+
+static void compress_eject(BlockDriverState *bs, bool eject_flag)
+{
+    bdrv_eject(bs->file->bs, eject_flag);
+}
+
+
+static void compress_lock_medium(BlockDriverState *bs, bool locked)
+{
+    bdrv_lock_medium(bs->file->bs, locked);
+}
+
+
+static bool compress_recurse_is_first_non_filter(BlockDriverState *bs,
+                                                 BlockDriverState *candidate)
+{
+    return bdrv_recurse_is_first_non_filter(bs->file->bs, candidate);
+}
+
+
+static BlockDriver bdrv_compress = {
+    .format_name                        = "compress",
+
+    .bdrv_open                          = compress_open,
+    .bdrv_child_perm                    = bdrv_filter_default_perms,
+
+    .bdrv_getlength                     = compress_getlength,
+
+    .bdrv_co_preadv_part                = compress_co_preadv_part,
+    .bdrv_co_pwritev_part               = compress_co_pwritev_part,
+    .bdrv_co_pwrite_zeroes              = compress_co_pwrite_zeroes,
+    .bdrv_co_pdiscard                   = compress_co_pdiscard,
+    .bdrv_refresh_limits                = compress_refresh_limits,
+
+    .bdrv_eject                         = compress_eject,
+    .bdrv_lock_medium                   = compress_lock_medium,
+
+    .bdrv_co_block_status               = bdrv_co_block_status_from_file,
+
+    .bdrv_recurse_is_first_non_filter   = compress_recurse_is_first_non_filter,
+
+    .has_variable_length                = true,
+    .is_filter                          = true,
+};
+
+static void bdrv_compress_init(void)
+{
+    bdrv_register(&bdrv_compress);
+}
+
+block_init(bdrv_compress_init);
diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 # @copy-on-read: Since 3.0
 # @blklogwrites: Since 3.0
 # @blkreplay: Since 4.2
+# @compress: Since 5.0
 #
 # Since: 2.9
 ##
 { 'enum': 'BlockdevDriver',
   'data': [ 'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs',
-            'cloop', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps', 'gluster',
-            'host_cdrom', 'host_device', 'http', 'https', 'iscsi', 'luks',
-            'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow',
-            'qcow2', 'qed', 'quorum', 'raw', 'rbd',
+            'cloop', 'compress', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps',
+            'gluster', 'host_cdrom', 'host_device', 'http', 'https', 'iscsi',
+            'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels',
+            'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
             { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' },
             'sheepdog',
             'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
@@ -XXX,XX +XXX,XX @@
       'blkreplay':  'BlockdevOptionsBlkreplay',
       'bochs':      'BlockdevOptionsGenericFormat',
       'cloop':      'BlockdevOptionsGenericFormat',
+      'compress':   'BlockdevOptionsGenericFormat',
       'copy-on-read':'BlockdevOptionsGenericFormat',
       'dmg':        'BlockdevOptionsGenericFormat',
       'file':       'BlockdevOptionsFile',
-- 
2.24.1

From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>

QEMU currently supports writing compressed data of the size equal to
one cluster. This patch allows writing QCOW2 compressed data that
exceed one cluster. Now, we split buffered data into separate clusters
and write them compressed using the block/aio_task API.

Suggested-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1575288906-551879-3-git-send-email-andrey.shinkevich@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2.c | 102 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 75 insertions(+), 27 deletions(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ fail:
     return ret;
 }
 
-/* XXX: put compressed sectors first, then all the cluster aligned
-   tables to avoid losing bytes in alignment */
 static coroutine_fn int
-qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
+qcow2_co_pwritev_compressed_task(BlockDriverState *bs,
                                  uint64_t offset, uint64_t bytes,
                                  QEMUIOVector *qiov, size_t qiov_offset)
 {
@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
     uint8_t *buf, *out_buf;
     uint64_t cluster_offset;
 
-    if (has_data_file(bs)) {
-        return -ENOTSUP;
-    }
-
-    if (bytes == 0) {
-        /* align end of file to a sector boundary to ease reading with
-           sector based I/Os */
-        int64_t len = bdrv_getlength(bs->file->bs);
-        if (len < 0) {
-            return len;
-        }
-        return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
-    }
-
-    if (offset_into_cluster(s, offset)) {
-        return -EINVAL;
-    }
+    assert(bytes == s->cluster_size || (bytes < s->cluster_size &&
+           (offset + bytes == bs->total_sectors << BDRV_SECTOR_BITS)));
 
     buf = qemu_blockalign(bs, s->cluster_size);
-    if (bytes != s->cluster_size) {
-        if (bytes > s->cluster_size ||
-            offset + bytes != bs->total_sectors << BDRV_SECTOR_BITS)
-        {
-            qemu_vfree(buf);
-            return -EINVAL;
-        }
+    if (bytes < s->cluster_size) {
         /* Zero-pad last write if image size is not cluster aligned */
         memset(buf + bytes, 0, s->cluster_size - bytes);
     }
@@ -XXX,XX +XXX,XX @@ fail:
     return ret;
 }
 
+static coroutine_fn int qcow2_co_pwritev_compressed_task_entry(AioTask *task)
+{
+    Qcow2AioTask *t = container_of(task, Qcow2AioTask, task);
+
+    assert(!t->cluster_type && !t->l2meta);
+
+    return qcow2_co_pwritev_compressed_task(t->bs, t->offset, t->bytes, t->qiov,
+                                            t->qiov_offset);
+}
+
+/*
+ * XXX: put compressed sectors first, then all the cluster aligned
+ * tables to avoid losing bytes in alignment
+ */
+static coroutine_fn int
+qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
+                                 uint64_t offset, uint64_t bytes,
+                                 QEMUIOVector *qiov, size_t qiov_offset)
+{
+    BDRVQcow2State *s = bs->opaque;
+    AioTaskPool *aio = NULL;
+    int ret = 0;
+
+    if (has_data_file(bs)) {
+        return -ENOTSUP;
+    }
+
+    if (bytes == 0) {
+        /*
+         * align end of file to a sector boundary to ease reading with
+         * sector based I/Os
+         */
+        int64_t len = bdrv_getlength(bs->file->bs);
+        if (len < 0) {
+            return len;
+        }
+        return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
+    }
+
+    if (offset_into_cluster(s, offset)) {
+        return -EINVAL;
+    }
+
+    while (bytes && aio_task_pool_status(aio) == 0) {
+        uint64_t chunk_size = MIN(bytes, s->cluster_size);
+
+        if (!aio && chunk_size != bytes) {
+            aio = aio_task_pool_new(QCOW2_MAX_WORKERS);
+        }
+
+        ret = qcow2_add_task(bs, aio, qcow2_co_pwritev_compressed_task_entry,
+                             0, 0, offset, chunk_size, qiov, qiov_offset, NULL);
+        if (ret < 0) {
+            break;
+        }
+        qiov_offset += chunk_size;
+        offset += chunk_size;
+        bytes -= chunk_size;
+    }
+
+    if (aio) {
+        aio_task_pool_wait_all(aio);
+        if (ret == 0) {
+            ret = aio_task_pool_status(aio);
+        }
+        g_free(aio);
+    }
+
+    return ret;
+}
+
 static int coroutine_fn
 qcow2_co_preadv_compressed(BlockDriverState *bs,
                            uint64_t file_cluster_offset,
-- 
2.24.1

From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>

Add the case to the iotest #214 that checks possibility of writing
compressed data of more than one cluster size. The test case involves
the compress filter driver showing a sample usage of that.

Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1575288906-551879-4-git-send-email-andrey.shinkevich@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/214     | 43 ++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/214.out | 14 +++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/214
+++ b/tests/qemu-iotests/214
@@ -XXX,XX +XXX,XX @@ _check_test_img -r all
 $QEMU_IO -c "read  -P 0x11  0 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
 $QEMU_IO -c "read  -P 0x22 4M 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
 
+echo
+echo "=== Write compressed data of multiple clusters ==="
+echo
+cluster_size=0x10000
+_make_test_img 2M -o cluster_size=$cluster_size
+
+echo "Write uncompressed data:"
+let data_size="8 * $cluster_size"
+$QEMU_IO -c "write -P 0xaa 0 $data_size" "$TEST_IMG" \
+         2>&1 | _filter_qemu_io | _filter_testdir
+sizeA=$($QEMU_IMG info --output=json "$TEST_IMG" |
+        sed -n '/"actual-size":/ s/[^0-9]//gp')
+
+_make_test_img 2M -o cluster_size=$cluster_size
+echo "Write compressed data:"
+let data_size="3 * $cluster_size + $cluster_size / 2"
+# Set compress on. That will align the written data
+# by the cluster size and will write them compressed.
+QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \
+$QEMU_IO -c "write -P 0xbb 0 $data_size" --image-opts \
+         "driver=compress,file.driver=$IMGFMT,file.file.driver=file,file.file.filename=$TEST_IMG" \
+         2>&1 | _filter_qemu_io | _filter_testdir
+
+let offset="4 * $cluster_size + $cluster_size / 4"
+QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \
+$QEMU_IO -c "write -P 0xcc $offset $data_size" "json:{\
+    'driver': 'compress',
+    'file': {'driver': '$IMGFMT',
+             'file': {'driver': 'file',
+                      'filename': '$TEST_IMG'}}}" | \
+                          _filter_qemu_io | _filter_testdir
+
+sizeB=$($QEMU_IMG info --output=json "$TEST_IMG" |
+        sed -n '/"actual-size":/ s/[^0-9]//gp')
+
+if [ $sizeA -le $sizeB ]
+then
+    echo "Compression ERROR"
+fi
+
+$QEMU_IMG check --output=json "$TEST_IMG" |
+          sed -n 's/,$//; /"compressed-clusters":/ s/^ *//p'
+
 # success, all done
 echo '*** done'
 rm -f $seq.full
diff --git a/tests/qemu-iotests/214.out b/tests/qemu-iotests/214.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/214.out
+++ b/tests/qemu-iotests/214.out
@@ -XXX,XX +XXX,XX @@ read 4194304/4194304 bytes at offset 0
 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 read 4194304/4194304 bytes at offset 4194304
 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+=== Write compressed data of multiple clusters ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
+Write uncompressed data:
+wrote 524288/524288 bytes at offset 0
+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
+Write compressed data:
+wrote 229376/229376 bytes at offset 0
+224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 229376/229376 bytes at offset 278528
+224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+"compressed-clusters": 8
 *** done
-- 
2.24.1

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Commit 6f6e1698a6 desugarized "-machine accel=" to a list
of "-accel" options. Since now "-machine accel" and "-accel"
became incompatible, update the iotests to the new format.

Error reported here:
https://gitlab.com/qemu-project/qemu/-/jobs/385801004#L3400

Reported-by: GitLab CI
Fixes: 6f6e1698a6 (vl: configure accelerators from -accel options)
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200106130951.29873-1-philmd@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/235   | 2 +-
 tests/qemu-iotests/check | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/235
+++ b/tests/qemu-iotests/235
@@ -XXX,XX +XXX,XX @@ qemu_img_create('-f', iotests.imgfmt, '-o', 'preallocation=metadata', disk,
                 str(size))
 
 vm = QEMUMachine(iotests.qemu_prog)
-vm.add_args('-machine', 'accel=kvm:tcg')
+vm.add_args('-accel', 'kvm', '-accel', 'tcg')
 if iotests.qemu_default_machine == 's390-ccw-virtio':
         vm.add_args('-no-shutdown')
 vm.add_args('-drive', 'id=src,file=' + disk)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -XXX,XX +XXX,XX @@ export QEMU_PROG="$(type -p "$QEMU_PROG")"
 
 case "$QEMU_PROG" in
     *qemu-system-arm|*qemu-system-aarch64)
-        export QEMU_OPTIONS="-nodefaults -display none -machine virt,accel=qtest"
+        export QEMU_OPTIONS="-nodefaults -display none -machine virt -accel qtest"
         ;;
     *qemu-system-tricore)
-        export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard,accel=qtest"
+        export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard -accel qtest"
         ;;
     *)
-        export QEMU_OPTIONS="-nodefaults -display none -machine accel=qtest"
+        export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
         ;;
 esac
 
-- 
2.24.1

When dropping backup-top, we need to drain the node before freeing the
BlockCopyState.  Otherwise, requests may still be in flight and then the
assertion in shres_destroy() will fail.

(This becomes visible in intermittent failure of 056.)

Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20191219182638.104621-1-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/backup-top.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/backup-top.c b/block/backup-top.c
index XXXXXXX..XXXXXXX 100644
--- a/block/backup-top.c
+++ b/block/backup-top.c
@@ -XXX,XX +XXX,XX @@ void bdrv_backup_top_drop(BlockDriverState *bs)
     BDRVBackupTopState *s = bs->opaque;
     AioContext *aio_context = bdrv_get_aio_context(bs);
 
-    block_copy_state_free(s->bcs);
-
     aio_context_acquire(aio_context);
 
     bdrv_drained_begin(bs);
 
+    block_copy_state_free(s->bcs);
+
     s->active = false;
     bdrv_child_refresh_perms(bs, bs->backing, &error_abort);
     bdrv_replace_node(bs, backing_bs(bs), &error_abort);
-- 
2.24.1

The following changes since commit f5fe7c17ac4e309e47e78f0f9761aebc8d2f2c81:

Merge tag 'pull-tcg-20230823-2' of https://gitlab.com/rth7680/qemu into staging (2023-08-28 16:07:04 -0400)

are available in the Git repository at:

https://gitlab.com/hreitz/qemu.git tags/pull-block-2023-09-01

for you to fetch changes up to 380448464dd89291cf7fd7434be6c225482a334d:

tests/file-io-error: New test (2023-08-29 13:01:24 +0200)

----------------------------------------------------------------
Block patches

- Fix for file-posix's zoning code crashing on I/O errors
- Throttling refactoring

----------------------------------------------------------------
Hanna Czenczek (5):
  file-posix: Clear bs->bl.zoned on error
  file-posix: Check bs->bl.zoned for zone info
  file-posix: Fix zone update in I/O error path
  file-posix: Simplify raw_co_prw's 'out' zone code
  tests/file-io-error: New test

Zhenwei Pi (9):
  throttle: introduce enum ThrottleDirection
  test-throttle: use enum ThrottleDirection
  throttle: support read-only and write-only
  test-throttle: test read only and write only
  cryptodev: use NULL throttle timer cb for read direction
  throttle: use enum ThrottleDirection instead of bool is_write
  throttle: use THROTTLE_MAX/ARRAY_SIZE for hard code
  fsdev: Use ThrottleDirection instread of bool is_write
  block/throttle-groups: Use ThrottleDirection instread of bool is_write

fsdev/qemu-fsdev-throttle.h                |   4 +-
 include/block/throttle-groups.h            |   6 +-
 include/qemu/throttle.h                    |  16 +-
 backends/cryptodev.c                       |  12 +-
 block/block-backend.c                      |   4 +-
 block/file-posix.c                         |  42 +++---
 block/throttle-groups.c                    | 163 +++++++++++----------
 block/throttle.c                           |   8 +-
 fsdev/qemu-fsdev-throttle.c                |  18 ++-
 hw/9pfs/cofile.c                           |   4 +-
 tests/unit/test-throttle.c                 |  76 +++++++++-
 util/throttle.c                            |  84 +++++++----
 tests/qemu-iotests/tests/file-io-error     | 119 +++++++++++++++
 tests/qemu-iotests/tests/file-io-error.out |  33 +++++
 14 files changed, 418 insertions(+), 171 deletions(-)
 create mode 100755 tests/qemu-iotests/tests/file-io-error
 create mode 100644 tests/qemu-iotests/tests/file-io-error.out

-- 
2.41.0

From: zhenwei pi <pizhenwei@bytedance.com>

Use enum ThrottleDirection instead of number index.

Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20230728022006.1098509-2-pizhenwei@bytedance.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
---
 include/qemu/throttle.h | 11 ++++++++---
 util/throttle.c         | 16 +++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/include/qemu/throttle.h b/include/qemu/throttle.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/throttle.h
+++ b/include/qemu/throttle.h
@@ -XXX,XX +XXX,XX @@ typedef struct ThrottleState {
     int64_t previous_leak;    /* timestamp of the last leak done */
 } ThrottleState;
 
+typedef enum {
+    THROTTLE_READ = 0,
+    THROTTLE_WRITE,
+    THROTTLE_MAX
+} ThrottleDirection;
+
 typedef struct ThrottleTimers {
-    QEMUTimer *timers[2];     /* timers used to do the throttling */
+    QEMUTimer *timers[THROTTLE_MAX];    /* timers used to do the throttling */
     QEMUClockType clock_type; /* the clock used */
 
     /* Callbacks */
-    QEMUTimerCB *read_timer_cb;
-    QEMUTimerCB *write_timer_cb;
+    QEMUTimerCB *timer_cb[THROTTLE_MAX];
     void *timer_opaque;
 } ThrottleTimers;
 
diff --git a/util/throttle.c b/util/throttle.c
index XXXXXXX..XXXXXXX 100644
--- a/util/throttle.c
+++ b/util/throttle.c
@@ -XXX,XX +XXX,XX @@ static bool throttle_compute_timer(ThrottleState *ts,
 void throttle_timers_attach_aio_context(ThrottleTimers *tt,
                                         AioContext *new_context)
 {
-    tt->timers[0] = aio_timer_new(new_context, tt->clock_type, SCALE_NS,
-                                  tt->read_timer_cb, tt->timer_opaque);
-    tt->timers[1] = aio_timer_new(new_context, tt->clock_type, SCALE_NS,
-                                  tt->write_timer_cb, tt->timer_opaque);
+    tt->timers[THROTTLE_READ] =
+        aio_timer_new(new_context, tt->clock_type, SCALE_NS,
+                      tt->timer_cb[THROTTLE_READ], tt->timer_opaque);
+    tt->timers[THROTTLE_WRITE] =
+        aio_timer_new(new_context, tt->clock_type, SCALE_NS,
+                      tt->timer_cb[THROTTLE_WRITE], tt->timer_opaque);
 }
 
 /*
@@ -XXX,XX +XXX,XX @@ void throttle_timers_init(ThrottleTimers *tt,
     memset(tt, 0, sizeof(ThrottleTimers));
 
     tt->clock_type = clock_type;
-    tt->read_timer_cb = read_timer_cb;
-    tt->write_timer_cb = write_timer_cb;
+    tt->timer_cb[THROTTLE_READ] = read_timer_cb;
+    tt->timer_cb[THROTTLE_WRITE] = write_timer_cb;
     tt->timer_opaque = timer_opaque;
     throttle_timers_attach_aio_context(tt, aio_context);
 }
@@ -XXX,XX +XXX,XX @@ void throttle_timers_detach_aio_context(ThrottleTimers *tt)
 {
     int i;
 
-    for (i = 0; i < 2; i++) {
+    for (i = 0; i < THROTTLE_MAX; i++) {
         throttle_timer_destroy(&tt->timers[i]);
     }
 }
-- 
2.41.0

From: zhenwei pi <pizhenwei@bytedance.com>

Use enum ThrottleDirection instead in the throttle test codes.

Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20230728022006.1098509-3-pizhenwei@bytedance.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
---
 tests/unit/test-throttle.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/test-throttle.c b/tests/unit/test-throttle.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/unit/test-throttle.c
+++ b/tests/unit/test-throttle.c
@@ -XXX,XX +XXX,XX @@ static void test_init(void)
 
     /* check initialized fields */
     g_assert(tt->clock_type == QEMU_CLOCK_VIRTUAL);
-    g_assert(tt->timers[0]);
-    g_assert(tt->timers[1]);
+    g_assert(tt->timers[THROTTLE_READ]);
+    g_assert(tt->timers[THROTTLE_WRITE]);
 
     /* check other fields where cleared */
     g_assert(!ts.previous_leak);
@@ -XXX,XX +XXX,XX @@ static void test_destroy(void)
     throttle_timers_init(tt, ctx, QEMU_CLOCK_VIRTUAL,
                          read_timer_cb, write_timer_cb, &ts);
     throttle_timers_destroy(tt);
-    for (i = 0; i < 2; i++) {
+    for (i = 0; i < THROTTLE_MAX; i++) {
         g_assert(!tt->timers[i]);
     }
 }
-- 
2.41.0

From: zhenwei pi <pizhenwei@bytedance.com>

Only one direction is necessary in several scenarios:
- a read-only disk
- operations on a device are considered as *write* only. For example,
  encrypt/decrypt/sign/verify operations on a cryptodev use a single
  *write* timer(read timer callback is defined, but never invoked).

Allow a single direction in throttle, this reduces memory, and uplayer
does not need a dummy callback any more.

Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20230728022006.1098509-4-pizhenwei@bytedance.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
---
 util/throttle.c | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/util/throttle.c b/util/throttle.c
index XXXXXXX..XXXXXXX 100644
--- a/util/throttle.c
+++ b/util/throttle.c
@@ -XXX,XX +XXX,XX @@ static bool throttle_compute_timer(ThrottleState *ts,
 void throttle_timers_attach_aio_context(ThrottleTimers *tt,
                                         AioContext *new_context)
 {
-    tt->timers[THROTTLE_READ] =
-        aio_timer_new(new_context, tt->clock_type, SCALE_NS,
-                      tt->timer_cb[THROTTLE_READ], tt->timer_opaque);
-    tt->timers[THROTTLE_WRITE] =
-        aio_timer_new(new_context, tt->clock_type, SCALE_NS,
-                      tt->timer_cb[THROTTLE_WRITE], tt->timer_opaque);
+    ThrottleDirection dir;
+
+    for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
+        if (tt->timer_cb[dir]) {
+            tt->timers[dir] =
+                aio_timer_new(new_context, tt->clock_type, SCALE_NS,
+                              tt->timer_cb[dir], tt->timer_opaque);
+        }
+    }
 }
 
 /*
@@ -XXX,XX +XXX,XX @@ void throttle_timers_init(ThrottleTimers *tt,
                           QEMUTimerCB *write_timer_cb,
                           void *timer_opaque)
 {
+    assert(read_timer_cb || write_timer_cb);
     memset(tt, 0, sizeof(ThrottleTimers));
 
     tt->clock_type = clock_type;
@@ -XXX,XX +XXX,XX @@ void throttle_timers_init(ThrottleTimers *tt,
 /* destroy a timer */
 static void throttle_timer_destroy(QEMUTimer **timer)
 {
-    assert(*timer != NULL);
+    if (*timer == NULL) {
+        return;
+    }
 
     timer_free(*timer);
     *timer = NULL;
@@ -XXX,XX +XXX,XX @@ static void throttle_timer_destroy(QEMUTimer **timer)
 /* Remove timers from event loop */
 void throttle_timers_detach_aio_context(ThrottleTimers *tt)
 {
-    int i;
+    ThrottleDirection dir;
 
-    for (i = 0; i < THROTTLE_MAX; i++) {
-        throttle_timer_destroy(&tt->timers[i]);
+    for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
+        throttle_timer_destroy(&tt->timers[dir]);
     }
 }
 
@@ -XXX,XX +XXX,XX @@ void throttle_timers_destroy(ThrottleTimers *tt)
 /* is any throttling timer configured */
 bool throttle_timers_are_initialized(ThrottleTimers *tt)
 {
-    if (tt->timers[0]) {
-        return true;
+    ThrottleDirection dir;
+
+    for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
+        if (tt->timers[dir]) {
+            return true;
+        }
     }
 
     return false;
@@ -XXX,XX +XXX,XX @@ bool throttle_schedule_timer(ThrottleState *ts,
 {
     int64_t now = qemu_clock_get_ns(tt->clock_type);
     int64_t next_timestamp;
+    QEMUTimer *timer;
     bool must_wait;
 
+    timer = is_write ? tt->timers[THROTTLE_WRITE] : tt->timers[THROTTLE_READ];
+    assert(timer);
+
     must_wait = throttle_compute_timer(ts,
                                        is_write,
                                        now,
@@ -XXX,XX +XXX,XX @@ bool throttle_schedule_timer(ThrottleState *ts,
     }
 
     /* request throttled and timer pending -> do nothing */
-    if (timer_pending(tt->timers[is_write])) {
+    if (timer_pending(timer)) {
         return true;
     }
 
     /* request throttled and timer not pending -> arm timer */
-    timer_mod(tt->timers[is_write], next_timestamp);
+    timer_mod(timer, next_timestamp);
     return true;
 }
 
-- 
2.41.0

From: zhenwei pi <pizhenwei@bytedance.com>

Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20230728022006.1098509-5-pizhenwei@bytedance.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
---
 tests/unit/test-throttle.c | 66 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/tests/unit/test-throttle.c b/tests/unit/test-throttle.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/unit/test-throttle.c
+++ b/tests/unit/test-throttle.c
@@ -XXX,XX +XXX,XX @@ static void test_init(void)
     throttle_timers_destroy(tt);
 }
 
+static void test_init_readonly(void)
+{
+    int i;
+
+    tt = &tgm.throttle_timers;
+
+    /* fill the structures with crap */
+    memset(&ts, 1, sizeof(ts));
+    memset(tt, 1, sizeof(*tt));
+
+    /* init structures */
+    throttle_init(&ts);
+    throttle_timers_init(tt, ctx, QEMU_CLOCK_VIRTUAL,
+                         read_timer_cb, NULL, &ts);
+
+    /* check initialized fields */
+    g_assert(tt->clock_type == QEMU_CLOCK_VIRTUAL);
+    g_assert(tt->timers[THROTTLE_READ]);
+    g_assert(!tt->timers[THROTTLE_WRITE]);
+
+    /* check other fields where cleared */
+    g_assert(!ts.previous_leak);
+    g_assert(!ts.cfg.op_size);
+    for (i = 0; i < BUCKETS_COUNT; i++) {
+        g_assert(!ts.cfg.buckets[i].avg);
+        g_assert(!ts.cfg.buckets[i].max);
+        g_assert(!ts.cfg.buckets[i].level);
+    }
+
+    throttle_timers_destroy(tt);
+}
+
+static void test_init_writeonly(void)
+{
+    int i;
+
+    tt = &tgm.throttle_timers;
+
+    /* fill the structures with crap */
+    memset(&ts, 1, sizeof(ts));
+    memset(tt, 1, sizeof(*tt));
+
+    /* init structures */
+    throttle_init(&ts);
+    throttle_timers_init(tt, ctx, QEMU_CLOCK_VIRTUAL,
+                         NULL, write_timer_cb, &ts);
+
+    /* check initialized fields */
+    g_assert(tt->clock_type == QEMU_CLOCK_VIRTUAL);
+    g_assert(!tt->timers[THROTTLE_READ]);
+    g_assert(tt->timers[THROTTLE_WRITE]);
+
+    /* check other fields where cleared */
+    g_assert(!ts.previous_leak);
+    g_assert(!ts.cfg.op_size);
+    for (i = 0; i < BUCKETS_COUNT; i++) {
+        g_assert(!ts.cfg.buckets[i].avg);
+        g_assert(!ts.cfg.buckets[i].max);
+        g_assert(!ts.cfg.buckets[i].level);
+    }
+
+    throttle_timers_destroy(tt);
+}
+
 static void test_destroy(void)
 {
     int i;
@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv)
     g_test_add_func("/throttle/leak_bucket",        test_leak_bucket);
     g_test_add_func("/throttle/compute_wait",       test_compute_wait);
     g_test_add_func("/throttle/init",               test_init);
+    g_test_add_func("/throttle/init_readonly",      test_init_readonly);
+    g_test_add_func("/throttle/init_writeonly",     test_init_writeonly);
     g_test_add_func("/throttle/destroy",            test_destroy);
     g_test_add_func("/throttle/have_timer",         test_have_timer);
     g_test_add_func("/throttle/detach_attach",      test_detach_attach);
-- 
2.41.0

From: zhenwei pi <pizhenwei@bytedance.com>

Operations on a cryptodev are considered as *write* only, the callback
of read direction is never invoked. Use NULL instead of an unreachable
path(cryptodev_backend_throttle_timer_cb on read direction).

The dummy read timer(never invoked) is already removed here, it means
that the 'FIXME' tag is no longer needed.

Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20230728022006.1098509-6-pizhenwei@bytedance.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
---
 backends/cryptodev.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/backends/cryptodev.c b/backends/cryptodev.c
index XXXXXXX..XXXXXXX 100644
--- a/backends/cryptodev.c
+++ b/backends/cryptodev.c
@@ -XXX,XX +XXX,XX @@ static void cryptodev_backend_set_throttle(CryptoDevBackend *backend, int field,
     if (!enabled) {
         throttle_init(&backend->ts);
         throttle_timers_init(&backend->tt, qemu_get_aio_context(),
-                             QEMU_CLOCK_REALTIME,
-                             cryptodev_backend_throttle_timer_cb, /* FIXME */
+                             QEMU_CLOCK_REALTIME, NULL,
                              cryptodev_backend_throttle_timer_cb, backend);
     }
 
-- 
2.41.0

From: zhenwei pi <pizhenwei@bytedance.com>

enum ThrottleDirection is already there, use ThrottleDirection instead
of 'bool is_write' for throttle API, also modify related codes from
block, fsdev, cryptodev and tests.

Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20230728022006.1098509-7-pizhenwei@bytedance.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
---
 include/qemu/throttle.h     |  5 +++--
 backends/cryptodev.c        |  9 +++++----
 block/throttle-groups.c     |  6 ++++--
 fsdev/qemu-fsdev-throttle.c |  8 +++++---
 tests/unit/test-throttle.c  |  4 ++--
 util/throttle.c             | 31 +++++++++++++++++--------------
 6 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/include/qemu/throttle.h b/include/qemu/throttle.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/throttle.h
+++ b/include/qemu/throttle.h
@@ -XXX,XX +XXX,XX @@ void throttle_config_init(ThrottleConfig *cfg);
 /* usage */
 bool throttle_schedule_timer(ThrottleState *ts,
                              ThrottleTimers *tt,
-                             bool is_write);
+                             ThrottleDirection direction);
 
-void throttle_account(ThrottleState *ts, bool is_write, uint64_t size);
+void throttle_account(ThrottleState *ts, ThrottleDirection direction,
+                      uint64_t size);
 void throttle_limits_to_config(ThrottleLimits *arg, ThrottleConfig *cfg,
                                Error **errp);
 void throttle_config_to_limits(ThrottleConfig *cfg, ThrottleLimits *var);
diff --git a/backends/cryptodev.c b/backends/cryptodev.c
index XXXXXXX..XXXXXXX 100644
--- a/backends/cryptodev.c
+++ b/backends/cryptodev.c
@@ -XXX,XX +XXX,XX @@ static void cryptodev_backend_throttle_timer_cb(void *opaque)
             continue;
         }
 
-        throttle_account(&backend->ts, true, ret);
+        throttle_account(&backend->ts, THROTTLE_WRITE, ret);
         cryptodev_backend_operation(backend, op_info);
         if (throttle_enabled(&backend->tc) &&
-            throttle_schedule_timer(&backend->ts, &backend->tt, true)) {
+            throttle_schedule_timer(&backend->ts, &backend->tt,
+                                    THROTTLE_WRITE)) {
             break;
         }
     }
@@ -XXX,XX +XXX,XX @@ int cryptodev_backend_crypto_operation(
         goto do_account;
     }
 
-    if (throttle_schedule_timer(&backend->ts, &backend->tt, true) ||
+    if (throttle_schedule_timer(&backend->ts, &backend->tt, THROTTLE_WRITE) ||
         !QTAILQ_EMPTY(&backend->opinfos)) {
         QTAILQ_INSERT_TAIL(&backend->opinfos, op_info, next);
         return 0;
@@ -XXX,XX +XXX,XX @@ do_account:
         return ret;
     }
 
-    throttle_account(&backend->ts, true, ret);
+    throttle_account(&backend->ts, THROTTLE_WRITE, ret);
 
     return cryptodev_backend_operation(backend, op_info);
 }
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index XXXXXXX..XXXXXXX 100644
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -XXX,XX +XXX,XX @@ static bool throttle_group_schedule_timer(ThrottleGroupMember *tgm,
     ThrottleState *ts = tgm->throttle_state;
     ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
     ThrottleTimers *tt = &tgm->throttle_timers;
+    ThrottleDirection direction = is_write ? THROTTLE_WRITE : THROTTLE_READ;
     bool must_wait;
 
     if (qatomic_read(&tgm->io_limits_disabled)) {
@@ -XXX,XX +XXX,XX @@ static bool throttle_group_schedule_timer(ThrottleGroupMember *tgm,
         return true;
     }
 
-    must_wait = throttle_schedule_timer(ts, tt, is_write);
+    must_wait = throttle_schedule_timer(ts, tt, direction);
 
     /* If a timer just got armed, set tgm as the current token */
     if (must_wait) {
@@ -XXX,XX +XXX,XX @@ void coroutine_fn throttle_group_co_io_limits_intercept(ThrottleGroupMember *tgm
     bool must_wait;
     ThrottleGroupMember *token;
     ThrottleGroup *tg = container_of(tgm->throttle_state, ThrottleGroup, ts);
+    ThrottleDirection direction = is_write ? THROTTLE_WRITE : THROTTLE_READ;
 
     assert(bytes >= 0);
 
@@ -XXX,XX +XXX,XX @@ void coroutine_fn throttle_group_co_io_limits_intercept(ThrottleGroupMember *tgm
     }
 
     /* The I/O will be executed, so do the accounting */
-    throttle_account(tgm->throttle_state, is_write, bytes);
+    throttle_account(tgm->throttle_state, direction, bytes);
 
     /* Schedule the next request */
     schedule_next_request(tgm, is_write);
diff --git a/fsdev/qemu-fsdev-throttle.c b/fsdev/qemu-fsdev-throttle.c
index XXXXXXX..XXXXXXX 100644
--- a/fsdev/qemu-fsdev-throttle.c
+++ b/fsdev/qemu-fsdev-throttle.c
@@ -XXX,XX +XXX,XX @@ void fsdev_throttle_init(FsThrottle *fst)
 void coroutine_fn fsdev_co_throttle_request(FsThrottle *fst, bool is_write,
                                             struct iovec *iov, int iovcnt)
 {
+    ThrottleDirection direction = is_write ? THROTTLE_WRITE : THROTTLE_READ;
+
     if (throttle_enabled(&fst->cfg)) {
-        if (throttle_schedule_timer(&fst->ts, &fst->tt, is_write) ||
+        if (throttle_schedule_timer(&fst->ts, &fst->tt, direction) ||
             !qemu_co_queue_empty(&fst->throttled_reqs[is_write])) {
             qemu_co_queue_wait(&fst->throttled_reqs[is_write], NULL);
         }
 
-        throttle_account(&fst->ts, is_write, iov_size(iov, iovcnt));
+        throttle_account(&fst->ts, direction, iov_size(iov, iovcnt));
 
         if (!qemu_co_queue_empty(&fst->throttled_reqs[is_write]) &&
-            !throttle_schedule_timer(&fst->ts, &fst->tt, is_write)) {
+            !throttle_schedule_timer(&fst->ts, &fst->tt, direction)) {
             qemu_co_queue_next(&fst->throttled_reqs[is_write]);
         }
     }
diff --git a/tests/unit/test-throttle.c b/tests/unit/test-throttle.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/unit/test-throttle.c
+++ b/tests/unit/test-throttle.c
@@ -XXX,XX +XXX,XX @@ static bool do_test_accounting(bool is_ops, /* are we testing bps or ops */
     throttle_config(&ts, QEMU_CLOCK_VIRTUAL, &cfg);
 
     /* account a read */
-    throttle_account(&ts, false, size);
+    throttle_account(&ts, THROTTLE_READ, size);
     /* account a write */
-    throttle_account(&ts, true, size);
+    throttle_account(&ts, THROTTLE_WRITE, size);
 
     /* check total result */
     index = to_test[is_ops][0];
diff --git a/util/throttle.c b/util/throttle.c
index XXXXXXX..XXXXXXX 100644
--- a/util/throttle.c
+++ b/util/throttle.c
@@ -XXX,XX +XXX,XX @@ int64_t throttle_compute_wait(LeakyBucket *bkt)
 
 /* This function compute the time that must be waited while this IO
  *
- * @is_write:   true if the current IO is a write, false if it's a read
+ * @direction:  throttle direction
  * @ret:        time to wait
  */
 static int64_t throttle_compute_wait_for(ThrottleState *ts,
-                                         bool is_write)
+                                         ThrottleDirection direction)
 {
     BucketType to_check[2][4] = { {THROTTLE_BPS_TOTAL,
                                    THROTTLE_OPS_TOTAL,
@@ -XXX,XX +XXX,XX @@ static int64_t throttle_compute_wait_for(ThrottleState *ts,
     int i;
 
     for (i = 0; i < 4; i++) {
-        BucketType index = to_check[is_write][i];
+        BucketType index = to_check[direction][i];
         wait = throttle_compute_wait(&ts->cfg.buckets[index]);
         if (wait > max_wait) {
             max_wait = wait;
@@ -XXX,XX +XXX,XX @@ static int64_t throttle_compute_wait_for(ThrottleState *ts,
 
 /* compute the timer for this type of operation
  *
- * @is_write:   the type of operation
+ * @direction:  throttle direction
  * @now:        the current clock timestamp
  * @next_timestamp: the resulting timer
  * @ret:        true if a timer must be set
  */
 static bool throttle_compute_timer(ThrottleState *ts,
-                                   bool is_write,
+                                   ThrottleDirection direction,
                                    int64_t now,
                                    int64_t *next_timestamp)
 {
@@ -XXX,XX +XXX,XX @@ static bool throttle_compute_timer(ThrottleState *ts,
     throttle_do_leak(ts, now);
 
     /* compute the wait time if any */
-    wait = throttle_compute_wait_for(ts, is_write);
+    wait = throttle_compute_wait_for(ts, direction);
 
     /* if the code must wait compute when the next timer should fire */
     if (wait) {
@@ -XXX,XX +XXX,XX @@ void throttle_get_config(ThrottleState *ts, ThrottleConfig *cfg)
  * NOTE: this function is not unit tested due to it's usage of timer_mod
  *
  * @tt:       the timers structure
- * @is_write: the type of operation (read/write)
+ * @direction: throttle direction
  * @ret:      true if the timer has been scheduled else false
  */
 bool throttle_schedule_timer(ThrottleState *ts,
                              ThrottleTimers *tt,
-                             bool is_write)
+                             ThrottleDirection direction)
 {
     int64_t now = qemu_clock_get_ns(tt->clock_type);
     int64_t next_timestamp;
     QEMUTimer *timer;
     bool must_wait;
 
-    timer = is_write ? tt->timers[THROTTLE_WRITE] : tt->timers[THROTTLE_READ];
+    assert(direction < THROTTLE_MAX);
+    timer = tt->timers[direction];
     assert(timer);
 
     must_wait = throttle_compute_timer(ts,
-                                       is_write,
+                                       direction,
                                        now,
                                        &next_timestamp);
 
@@ -XXX,XX +XXX,XX @@ bool throttle_schedule_timer(ThrottleState *ts,
 
 /* do the accounting for this operation
  *
- * @is_write: the type of operation (read/write)
+ * @direction: throttle direction
  * @size:     the size of the operation
  */
-void throttle_account(ThrottleState *ts, bool is_write, uint64_t size)
+void throttle_account(ThrottleState *ts, ThrottleDirection direction,
+                      uint64_t size)
 {
     const BucketType bucket_types_size[2][2] = {
         { THROTTLE_BPS_TOTAL, THROTTLE_BPS_READ },
@@ -XXX,XX +XXX,XX @@ void throttle_account(ThrottleState *ts, bool is_write, uint64_t size)
     double units = 1.0;
     unsigned i;
 
+    assert(direction < THROTTLE_MAX);
     /* if cfg.op_size is defined and smaller than size we compute unit count */
     if (ts->cfg.op_size && size > ts->cfg.op_size) {
         units = (double) size / ts->cfg.op_size;
@@ -XXX,XX +XXX,XX @@ void throttle_account(ThrottleState *ts, bool is_write, uint64_t size)
     for (i = 0; i < 2; i++) {
         LeakyBucket *bkt;
 
-        bkt = &ts->cfg.buckets[bucket_types_size[is_write][i]];
+        bkt = &ts->cfg.buckets[bucket_types_size[direction][i]];
         bkt->level += size;
         if (bkt->burst_length > 1) {
             bkt->burst_level += size;
         }
 
-        bkt = &ts->cfg.buckets[bucket_types_units[is_write][i]];
+        bkt = &ts->cfg.buckets[bucket_types_units[direction][i]];
         bkt->level += units;
         if (bkt->burst_length > 1) {
             bkt->burst_level += units;
-- 
2.41.0

From: zhenwei pi <pizhenwei@bytedance.com>

The first dimension of both to_check and
bucket_types_size/bucket_types_units is used as throttle direction,
use THROTTLE_MAX instead of hard coded number. Also use ARRAY_SIZE()
to avoid hard coded number for the second dimension.

Hanna noticed that the two array should be static. Yes, turn them
into static variables.

Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20230728022006.1098509-8-pizhenwei@bytedance.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
---
 util/throttle.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/util/throttle.c b/util/throttle.c
index XXXXXXX..XXXXXXX 100644
--- a/util/throttle.c
+++ b/util/throttle.c
@@ -XXX,XX +XXX,XX @@ int64_t throttle_compute_wait(LeakyBucket *bkt)
 static int64_t throttle_compute_wait_for(ThrottleState *ts,
                                          ThrottleDirection direction)
 {
-    BucketType to_check[2][4] = { {THROTTLE_BPS_TOTAL,
+    static const BucketType to_check[THROTTLE_MAX][4] = {
+                                  {THROTTLE_BPS_TOTAL,
                                    THROTTLE_OPS_TOTAL,
                                    THROTTLE_BPS_READ,
                                    THROTTLE_OPS_READ},
@@ -XXX,XX +XXX,XX @@ static int64_t throttle_compute_wait_for(ThrottleState *ts,
     int64_t wait, max_wait = 0;
     int i;
 
-    for (i = 0; i < 4; i++) {
+    for (i = 0; i < ARRAY_SIZE(to_check[THROTTLE_READ]); i++) {
         BucketType index = to_check[direction][i];
         wait = throttle_compute_wait(&ts->cfg.buckets[index]);
         if (wait > max_wait) {
@@ -XXX,XX +XXX,XX @@ bool throttle_schedule_timer(ThrottleState *ts,
 void throttle_account(ThrottleState *ts, ThrottleDirection direction,
                       uint64_t size)
 {
-    const BucketType bucket_types_size[2][2] = {
+    static const BucketType bucket_types_size[THROTTLE_MAX][2] = {
         { THROTTLE_BPS_TOTAL, THROTTLE_BPS_READ },
         { THROTTLE_BPS_TOTAL, THROTTLE_BPS_WRITE }
     };
-    const BucketType bucket_types_units[2][2] = {
+    static const BucketType bucket_types_units[THROTTLE_MAX][2] = {
         { THROTTLE_OPS_TOTAL, THROTTLE_OPS_READ },
         { THROTTLE_OPS_TOTAL, THROTTLE_OPS_WRITE }
     };
@@ -XXX,XX +XXX,XX @@ void throttle_account(ThrottleState *ts, ThrottleDirection direction,
         units = (double) size / ts->cfg.op_size;
     }
 
-    for (i = 0; i < 2; i++) {
+    for (i = 0; i < ARRAY_SIZE(bucket_types_size[THROTTLE_READ]); i++) {
         LeakyBucket *bkt;
 
         bkt = &ts->cfg.buckets[bucket_types_size[direction][i]];
-- 
2.41.0

From: zhenwei pi <pizhenwei@bytedance.com>

'bool is_write' style is obsolete from throttle framework, adapt
fsdev to the new style.

Cc: Greg Kurz <groug@kaod.org>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20230728022006.1098509-9-pizhenwei@bytedance.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
---
 fsdev/qemu-fsdev-throttle.h |  4 ++--
 fsdev/qemu-fsdev-throttle.c | 14 +++++++-------
 hw/9pfs/cofile.c            |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/fsdev/qemu-fsdev-throttle.h b/fsdev/qemu-fsdev-throttle.h
index XXXXXXX..XXXXXXX 100644
--- a/fsdev/qemu-fsdev-throttle.h
+++ b/fsdev/qemu-fsdev-throttle.h
@@ -XXX,XX +XXX,XX @@ typedef struct FsThrottle {
     ThrottleState ts;
     ThrottleTimers tt;
     ThrottleConfig cfg;
-    CoQueue      throttled_reqs[2];
+    CoQueue      throttled_reqs[THROTTLE_MAX];
 } FsThrottle;
 
 int fsdev_throttle_parse_opts(QemuOpts *, FsThrottle *, Error **);
 
 void fsdev_throttle_init(FsThrottle *);
 
-void coroutine_fn fsdev_co_throttle_request(FsThrottle *, bool ,
+void coroutine_fn fsdev_co_throttle_request(FsThrottle *, ThrottleDirection ,
                                             struct iovec *, int);
 
 void fsdev_throttle_cleanup(FsThrottle *);
diff --git a/fsdev/qemu-fsdev-throttle.c b/fsdev/qemu-fsdev-throttle.c
index XXXXXXX..XXXXXXX 100644
--- a/fsdev/qemu-fsdev-throttle.c
+++ b/fsdev/qemu-fsdev-throttle.c
@@ -XXX,XX +XXX,XX @@ void fsdev_throttle_init(FsThrottle *fst)
     }
 }
 
-void coroutine_fn fsdev_co_throttle_request(FsThrottle *fst, bool is_write,
+void coroutine_fn fsdev_co_throttle_request(FsThrottle *fst,
+                                            ThrottleDirection direction,
                                             struct iovec *iov, int iovcnt)
 {
-    ThrottleDirection direction = is_write ? THROTTLE_WRITE : THROTTLE_READ;
-
+    assert(direction < THROTTLE_MAX);
     if (throttle_enabled(&fst->cfg)) {
         if (throttle_schedule_timer(&fst->ts, &fst->tt, direction) ||
-            !qemu_co_queue_empty(&fst->throttled_reqs[is_write])) {
-            qemu_co_queue_wait(&fst->throttled_reqs[is_write], NULL);
+            !qemu_co_queue_empty(&fst->throttled_reqs[direction])) {
+            qemu_co_queue_wait(&fst->throttled_reqs[direction], NULL);
         }
 
         throttle_account(&fst->ts, direction, iov_size(iov, iovcnt));
 
-        if (!qemu_co_queue_empty(&fst->throttled_reqs[is_write]) &&
+        if (!qemu_co_queue_empty(&fst->throttled_reqs[direction]) &&
             !throttle_schedule_timer(&fst->ts, &fst->tt, direction)) {
-            qemu_co_queue_next(&fst->throttled_reqs[is_write]);
+            qemu_co_queue_next(&fst->throttled_reqs[direction]);
         }
     }
 }
diff --git a/hw/9pfs/cofile.c b/hw/9pfs/cofile.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/9pfs/cofile.c
+++ b/hw/9pfs/cofile.c
@@ -XXX,XX +XXX,XX @@ int coroutine_fn v9fs_co_pwritev(V9fsPDU *pdu, V9fsFidState *fidp,
     if (v9fs_request_cancelled(pdu)) {
         return -EINTR;
     }
-    fsdev_co_throttle_request(s->ctx.fst, true, iov, iovcnt);
+    fsdev_co_throttle_request(s->ctx.fst, THROTTLE_WRITE, iov, iovcnt);
     v9fs_co_run_in_worker(
         {
             err = s->ops->pwritev(&s->ctx, &fidp->fs, iov, iovcnt, offset);
@@ -XXX,XX +XXX,XX @@ int coroutine_fn v9fs_co_preadv(V9fsPDU *pdu, V9fsFidState *fidp,
     if (v9fs_request_cancelled(pdu)) {
         return -EINTR;
     }
-    fsdev_co_throttle_request(s->ctx.fst, false, iov, iovcnt);
+    fsdev_co_throttle_request(s->ctx.fst, THROTTLE_READ, iov, iovcnt);
     v9fs_co_run_in_worker(
         {
             err = s->ops->preadv(&s->ctx, &fidp->fs, iov, iovcnt, offset);
-- 
2.41.0

From: zhenwei pi <pizhenwei@bytedance.com>

'bool is_write' style is obsolete from throttle framework, adapt
block throttle groups to the new style:
- use ThrottleDirection instead of 'bool is_write'. Ex,
  schedule_next_request(ThrottleGroupMember *tgm, bool is_write)
  -> schedule_next_request(ThrottleGroupMember *tgm, ThrottleDirection direction)

- use THROTTLE_MAX instead of hard code. Ex, ThrottleGroupMember *tokens[2]
  -> ThrottleGroupMember *tokens[THROTTLE_MAX]

- use ThrottleDirection instead of hard code on iteration. Ex, (i = 0; i < 2; i++)
  -> for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++)

Use a simple python script to test the new style:
 #!/usr/bin/python3
import subprocess
import random
import time

commands = ['virsh blkdeviotune jammy vda --write-bytes-sec ', \
            'virsh blkdeviotune jammy vda --write-iops-sec ', \
            'virsh blkdeviotune jammy vda --read-bytes-sec ', \
            'virsh blkdeviotune jammy vda --read-iops-sec ']

for loop in range(1, 1000):
    time.sleep(random.randrange(3, 5))
    command = commands[random.randrange(0, 3)] + str(random.randrange(0, 1000000))
    subprocess.run(command, shell=True, check=True)

This works fine.

Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20230728022006.1098509-10-pizhenwei@bytedance.com>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
---
 include/block/throttle-groups.h |   6 +-
 block/block-backend.c           |   4 +-
 block/throttle-groups.c         | 161 ++++++++++++++++----------------
 block/throttle.c                |   8 +-
 4 files changed, 90 insertions(+), 89 deletions(-)

diff --git a/include/block/throttle-groups.h b/include/block/throttle-groups.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/throttle-groups.h
+++ b/include/block/throttle-groups.h
@@ -XXX,XX +XXX,XX @@ typedef struct ThrottleGroupMember {
     AioContext   *aio_context;
     /* throttled_reqs_lock protects the CoQueues for throttled requests.  */
     CoMutex      throttled_reqs_lock;
-    CoQueue      throttled_reqs[2];
+    CoQueue      throttled_reqs[THROTTLE_MAX];
 
     /* Nonzero if the I/O limits are currently being ignored; generally
      * it is zero.  Accessed with atomic operations.
@@ -XXX,XX +XXX,XX @@ typedef struct ThrottleGroupMember {
      * throttle_state tells us if I/O limits are configured. */
     ThrottleState *throttle_state;
     ThrottleTimers throttle_timers;
-    unsigned       pending_reqs[2];
+    unsigned       pending_reqs[THROTTLE_MAX];
     QLIST_ENTRY(ThrottleGroupMember) round_robin;
 
 } ThrottleGroupMember;
@@ -XXX,XX +XXX,XX @@ void throttle_group_restart_tgm(ThrottleGroupMember *tgm);
 
 void coroutine_fn throttle_group_co_io_limits_intercept(ThrottleGroupMember *tgm,
                                                         int64_t bytes,
-                                                        bool is_write);
+                                                        ThrottleDirection direction);
 void throttle_group_attach_aio_context(ThrottleGroupMember *tgm,
                                        AioContext *new_context);
 void throttle_group_detach_aio_context(ThrottleGroupMember *tgm);
diff --git a/block/block-backend.c b/block/block-backend.c
index XXXXXXX..XXXXXXX 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -XXX,XX +XXX,XX @@ blk_co_do_preadv_part(BlockBackend *blk, int64_t offset, int64_t bytes,
     /* throttling disk I/O */
     if (blk->public.throttle_group_member.throttle_state) {
         throttle_group_co_io_limits_intercept(&blk->public.throttle_group_member,
-                bytes, false);
+                bytes, THROTTLE_READ);
     }
 
     ret = bdrv_co_preadv_part(blk->root, offset, bytes, qiov, qiov_offset,
@@ -XXX,XX +XXX,XX @@ blk_co_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes,
     /* throttling disk I/O */
     if (blk->public.throttle_group_member.throttle_state) {
         throttle_group_co_io_limits_intercept(&blk->public.throttle_group_member,
-                bytes, true);
+                bytes, THROTTLE_WRITE);
     }
 
     if (!blk->enable_write_cache) {
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index XXXXXXX..XXXXXXX 100644
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -XXX,XX +XXX,XX @@
 
 static void throttle_group_obj_init(Object *obj);
 static void throttle_group_obj_complete(UserCreatable *obj, Error **errp);
-static void timer_cb(ThrottleGroupMember *tgm, bool is_write);
+static void timer_cb(ThrottleGroupMember *tgm, ThrottleDirection direction);
 
 /* The ThrottleGroup structure (with its ThrottleState) is shared
  * among different ThrottleGroupMembers and it's independent from
@@ -XXX,XX +XXX,XX @@ struct ThrottleGroup {
     QemuMutex lock; /* This lock protects the following four fields */
     ThrottleState ts;
     QLIST_HEAD(, ThrottleGroupMember) head;
-    ThrottleGroupMember *tokens[2];
-    bool any_timer_armed[2];
+    ThrottleGroupMember *tokens[THROTTLE_MAX];
+    bool any_timer_armed[THROTTLE_MAX];
     QEMUClockType clock_type;
 
     /* This field is protected by the global QEMU mutex */
@@ -XXX,XX +XXX,XX @@ static ThrottleGroupMember *throttle_group_next_tgm(ThrottleGroupMember *tgm)
  * This assumes that tg->lock is held.
  *
  * @tgm:        the ThrottleGroupMember
- * @is_write:   the type of operation (read/write)
+ * @direction:  the ThrottleDirection
  * @ret:        whether the ThrottleGroupMember has pending requests.
  */
 static inline bool tgm_has_pending_reqs(ThrottleGroupMember *tgm,
-                                        bool is_write)
+                                        ThrottleDirection direction)
 {
-    return tgm->pending_reqs[is_write];
+    return tgm->pending_reqs[direction];
 }
 
 /* Return the next ThrottleGroupMember in the round-robin sequence with pending
@@ -XXX,XX +XXX,XX @@ static inline bool tgm_has_pending_reqs(ThrottleGroupMember *tgm,
  * This assumes that tg->lock is held.
  *
  * @tgm:       the current ThrottleGroupMember
- * @is_write:  the type of operation (read/write)
+ * @direction: the ThrottleDirection
  * @ret:       the next ThrottleGroupMember with pending requests, or tgm if
  *             there is none.
  */
 static ThrottleGroupMember *next_throttle_token(ThrottleGroupMember *tgm,
-                                                bool is_write)
+                                                ThrottleDirection direction)
 {
     ThrottleState *ts = tgm->throttle_state;
     ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
@@ -XXX,XX +XXX,XX @@ static ThrottleGroupMember *next_throttle_token(ThrottleGroupMember *tgm,
      * it's being drained. Skip the round-robin search and return tgm
      * immediately if it has pending requests. Otherwise we could be
      * forcing it to wait for other member's throttled requests. */
-    if (tgm_has_pending_reqs(tgm, is_write) &&
+    if (tgm_has_pending_reqs(tgm, direction) &&
         qatomic_read(&tgm->io_limits_disabled)) {
         return tgm;
     }
 
-    start = token = tg->tokens[is_write];
+    start = token = tg->tokens[direction];
 
     /* get next bs round in round robin style */
     token = throttle_group_next_tgm(token);
-    while (token != start && !tgm_has_pending_reqs(token, is_write)) {
+    while (token != start && !tgm_has_pending_reqs(token, direction)) {
         token = throttle_group_next_tgm(token);
     }
 
@@ -XXX,XX +XXX,XX @@ static ThrottleGroupMember *next_throttle_token(ThrottleGroupMember *tgm,
      * then decide the token is the current tgm because chances are
      * the current tgm got the current request queued.
      */
-    if (token == start && !tgm_has_pending_reqs(token, is_write)) {
+    if (token == start && !tgm_has_pending_reqs(token, direction)) {
         token = tgm;
     }
 
     /* Either we return the original TGM, or one with pending requests */
-    assert(token == tgm || tgm_has_pending_reqs(token, is_write));
+    assert(token == tgm || tgm_has_pending_reqs(token, direction));
 
     return token;
 }
@@ -XXX,XX +XXX,XX @@ static ThrottleGroupMember *next_throttle_token(ThrottleGroupMember *tgm,
  * This assumes that tg->lock is held.
  *
  * @tgm:        the current ThrottleGroupMember
- * @is_write:   the type of operation (read/write)
+ * @direction:  the ThrottleDirection
  * @ret:        whether the I/O request needs to be throttled or not
  */
 static bool throttle_group_schedule_timer(ThrottleGroupMember *tgm,
-                                          bool is_write)
+                                          ThrottleDirection direction)
 {
     ThrottleState *ts = tgm->throttle_state;
     ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
     ThrottleTimers *tt = &tgm->throttle_timers;
-    ThrottleDirection direction = is_write ? THROTTLE_WRITE : THROTTLE_READ;
     bool must_wait;
 
     if (qatomic_read(&tgm->io_limits_disabled)) {
@@ -XXX,XX +XXX,XX @@ static bool throttle_group_schedule_timer(ThrottleGroupMember *tgm,
     }
 
     /* Check if any of the timers in this group is already armed */
-    if (tg->any_timer_armed[is_write]) {
+    if (tg->any_timer_armed[direction]) {
         return true;
     }
 
@@ -XXX,XX +XXX,XX @@ static bool throttle_group_schedule_timer(ThrottleGroupMember *tgm,
 
     /* If a timer just got armed, set tgm as the current token */
     if (must_wait) {
-        tg->tokens[is_write] = tgm;
-        tg->any_timer_armed[is_write] = true;
+        tg->tokens[direction] = tgm;
+        tg->any_timer_armed[direction] = true;
     }
 
     return must_wait;
@@ -XXX,XX +XXX,XX @@ static bool throttle_group_schedule_timer(ThrottleGroupMember *tgm,
  * any request was actually pending.
  *
  * @tgm:       the current ThrottleGroupMember
- * @is_write:  the type of operation (read/write)
+ * @direction: the ThrottleDirection
  */
 static bool coroutine_fn throttle_group_co_restart_queue(ThrottleGroupMember *tgm,
-                                                         bool is_write)
+                                                         ThrottleDirection direction)
 {
     bool ret;
 
     qemu_co_mutex_lock(&tgm->throttled_reqs_lock);
-    ret = qemu_co_queue_next(&tgm->throttled_reqs[is_write]);
+    ret = qemu_co_queue_next(&tgm->throttled_reqs[direction]);
     qemu_co_mutex_unlock(&tgm->throttled_reqs_lock);
 
     return ret;
@@ -XXX,XX +XXX,XX @@ static bool coroutine_fn throttle_group_co_restart_queue(ThrottleGroupMember *tg
  * This assumes that tg->lock is held.
  *
  * @tgm:       the current ThrottleGroupMember
- * @is_write:  the type of operation (read/write)
+ * @direction: the ThrottleDirection
  */
-static void schedule_next_request(ThrottleGroupMember *tgm, bool is_write)
+static void schedule_next_request(ThrottleGroupMember *tgm,
+                                  ThrottleDirection direction)
 {
     ThrottleState *ts = tgm->throttle_state;
     ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
@@ -XXX,XX +XXX,XX @@ static void schedule_next_request(ThrottleGroupMember *tgm, bool is_write)
     ThrottleGroupMember *token;
 
     /* Check if there's any pending request to schedule next */
-    token = next_throttle_token(tgm, is_write);
-    if (!tgm_has_pending_reqs(token, is_write)) {
+    token = next_throttle_token(tgm, direction);
+    if (!tgm_has_pending_reqs(token, direction)) {
         return;
     }
 
     /* Set a timer for the request if it needs to be throttled */
-    must_wait = throttle_group_schedule_timer(token, is_write);
+    must_wait = throttle_group_schedule_timer(token, direction);
 
     /* If it doesn't have to wait, queue it for immediate execution */
     if (!must_wait) {
         /* Give preference to requests from the current tgm */
         if (qemu_in_coroutine() &&
-            throttle_group_co_restart_queue(tgm, is_write)) {
+            throttle_group_co_restart_queue(tgm, direction)) {
             token = tgm;
         } else {
             ThrottleTimers *tt = &token->throttle_timers;
             int64_t now = qemu_clock_get_ns(tg->clock_type);
-            timer_mod(tt->timers[is_write], now);
-            tg->any_timer_armed[is_write] = true;
+            timer_mod(tt->timers[direction], now);
+            tg->any_timer_armed[direction] = true;
         }
-        tg->tokens[is_write] = token;
+        tg->tokens[direction] = token;
     }
 }
 
@@ -XXX,XX +XXX,XX @@ static void schedule_next_request(ThrottleGroupMember *tgm, bool is_write)
  *
  * @tgm:       the current ThrottleGroupMember
  * @bytes:     the number of bytes for this I/O
- * @is_write:  the type of operation (read/write)
+ * @direction: the ThrottleDirection
  */
 void coroutine_fn throttle_group_co_io_limits_intercept(ThrottleGroupMember *tgm,
                                                         int64_t bytes,
-                                                        bool is_write)
+                                                        ThrottleDirection direction)
 {
     bool must_wait;
     ThrottleGroupMember *token;
     ThrottleGroup *tg = container_of(tgm->throttle_state, ThrottleGroup, ts);
-    ThrottleDirection direction = is_write ? THROTTLE_WRITE : THROTTLE_READ;
 
     assert(bytes >= 0);
+    assert(direction < THROTTLE_MAX);
 
     qemu_mutex_lock(&tg->lock);
 
     /* First we check if this I/O has to be throttled. */
-    token = next_throttle_token(tgm, is_write);
-    must_wait = throttle_group_schedule_timer(token, is_write);
+    token = next_throttle_token(tgm, direction);
+    must_wait = throttle_group_schedule_timer(token, direction);
 
     /* Wait if there's a timer set or queued requests of this type */
-    if (must_wait || tgm->pending_reqs[is_write]) {
-        tgm->pending_reqs[is_write]++;
+    if (must_wait || tgm->pending_reqs[direction]) {
+        tgm->pending_reqs[direction]++;
         qemu_mutex_unlock(&tg->lock);
         qemu_co_mutex_lock(&tgm->throttled_reqs_lock);
-        qemu_co_queue_wait(&tgm->throttled_reqs[is_write],
+        qemu_co_queue_wait(&tgm->throttled_reqs[direction],
                            &tgm->throttled_reqs_lock);
         qemu_co_mutex_unlock(&tgm->throttled_reqs_lock);
         qemu_mutex_lock(&tg->lock);
-        tgm->pending_reqs[is_write]--;
+        tgm->pending_reqs[direction]--;
     }
 
     /* The I/O will be executed, so do the accounting */
     throttle_account(tgm->throttle_state, direction, bytes);
 
     /* Schedule the next request */
-    schedule_next_request(tgm, is_write);
+    schedule_next_request(tgm, direction);
 
     qemu_mutex_unlock(&tg->lock);
 }
 
 typedef struct {
     ThrottleGroupMember *tgm;
-    bool is_write;
+    ThrottleDirection direction;
 } RestartData;
 
 static void coroutine_fn throttle_group_restart_queue_entry(void *opaque)
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn throttle_group_restart_queue_entry(void *opaque)
     ThrottleGroupMember *tgm = data->tgm;
     ThrottleState *ts = tgm->throttle_state;
     ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
-    bool is_write = data->is_write;
+    ThrottleDirection direction = data->direction;
     bool empty_queue;
 
-    empty_queue = !throttle_group_co_restart_queue(tgm, is_write);
+    empty_queue = !throttle_group_co_restart_queue(tgm, direction);
 
     /* If the request queue was empty then we have to take care of
      * scheduling the next one */
     if (empty_queue) {
         qemu_mutex_lock(&tg->lock);
-        schedule_next_request(tgm, is_write);
+        schedule_next_request(tgm, direction);
         qemu_mutex_unlock(&tg->lock);
     }
 
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn throttle_group_restart_queue_entry(void *opaque)
     aio_wait_kick();
 }
 
-static void throttle_group_restart_queue(ThrottleGroupMember *tgm, bool is_write)
+static void throttle_group_restart_queue(ThrottleGroupMember *tgm,
+                                        ThrottleDirection direction)
 {
     Coroutine *co;
     RestartData *rd = g_new0(RestartData, 1);
 
     rd->tgm = tgm;
-    rd->is_write = is_write;
+    rd->direction = direction;
 
     /* This function is called when a timer is fired or when
      * throttle_group_restart_tgm() is called. Either way, there can
      * be no timer pending on this tgm at this point */
-    assert(!timer_pending(tgm->throttle_timers.timers[is_write]));
+    assert(!timer_pending(tgm->throttle_timers.timers[direction]));
 
     qatomic_inc(&tgm->restart_pending);
 
@@ -XXX,XX +XXX,XX @@ static void throttle_group_restart_queue(ThrottleGroupMember *tgm, bool is_write
 
 void throttle_group_restart_tgm(ThrottleGroupMember *tgm)
 {
-    int i;
+    ThrottleDirection dir;
 
     if (tgm->throttle_state) {
-        for (i = 0; i < 2; i++) {
-            QEMUTimer *t = tgm->throttle_timers.timers[i];
+        for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
+            QEMUTimer *t = tgm->throttle_timers.timers[dir];
             if (timer_pending(t)) {
                 /* If there's a pending timer on this tgm, fire it now */
                 timer_del(t);
-                timer_cb(tgm, i);
+                timer_cb(tgm, dir);
             } else {
                 /* Else run the next request from the queue manually */
-                throttle_group_restart_queue(tgm, i);
+                throttle_group_restart_queue(tgm, dir);
             }
         }
     }
@@ -XXX,XX +XXX,XX @@ void throttle_group_get_config(ThrottleGroupMember *tgm, ThrottleConfig *cfg)
  * because it had been throttled.
  *
  * @tgm:       the ThrottleGroupMember whose request had been throttled
- * @is_write:  the type of operation (read/write)
+ * @direction: the ThrottleDirection
  */
-static void timer_cb(ThrottleGroupMember *tgm, bool is_write)
+static void timer_cb(ThrottleGroupMember *tgm, ThrottleDirection direction)
 {
     ThrottleState *ts = tgm->throttle_state;
     ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
 
     /* The timer has just been fired, so we can update the flag */
     qemu_mutex_lock(&tg->lock);
-    tg->any_timer_armed[is_write] = false;
+    tg->any_timer_armed[direction] = false;
     qemu_mutex_unlock(&tg->lock);
 
     /* Run the request that was waiting for this timer */
-    throttle_group_restart_queue(tgm, is_write);
+    throttle_group_restart_queue(tgm, direction);
 }
 
 static void read_timer_cb(void *opaque)
 {
-    timer_cb(opaque, false);
+    timer_cb(opaque, THROTTLE_READ);
 }
 
 static void write_timer_cb(void *opaque)
 {
-    timer_cb(opaque, true);
+    timer_cb(opaque, THROTTLE_WRITE);
 }
 
 /* Register a ThrottleGroupMember from the throttling group, also initializing
@@ -XXX,XX +XXX,XX @@ void throttle_group_register_tgm(ThrottleGroupMember *tgm,
                                  const char *groupname,
                                  AioContext *ctx)
 {
-    int i;
+    ThrottleDirection dir;
     ThrottleState *ts = throttle_group_incref(groupname);
     ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
 
@@ -XXX,XX +XXX,XX @@ void throttle_group_register_tgm(ThrottleGroupMember *tgm,
 
     QEMU_LOCK_GUARD(&tg->lock);
     /* If the ThrottleGroup is new set this ThrottleGroupMember as the token */
-    for (i = 0; i < 2; i++) {
-        if (!tg->tokens[i]) {
-            tg->tokens[i] = tgm;
+    for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
+        if (!tg->tokens[dir]) {
+            tg->tokens[dir] = tgm;
         }
+        qemu_co_queue_init(&tgm->throttled_reqs[dir]);
     }
 
     QLIST_INSERT_HEAD(&tg->head, tgm, round_robin);
@@ -XXX,XX +XXX,XX @@ void throttle_group_register_tgm(ThrottleGroupMember *tgm,
                          write_timer_cb,
                          tgm);
     qemu_co_mutex_init(&tgm->throttled_reqs_lock);
-    qemu_co_queue_init(&tgm->throttled_reqs[0]);
-    qemu_co_queue_init(&tgm->throttled_reqs[1]);
 }
 
 /* Unregister a ThrottleGroupMember from its group, removing it from the list,
@@ -XXX,XX +XXX,XX @@ void throttle_group_unregister_tgm(ThrottleGroupMember *tgm)
     ThrottleState *ts = tgm->throttle_state;
     ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
     ThrottleGroupMember *token;
-    int i;
+    ThrottleDirection dir;
 
     if (!ts) {
         /* Discard already unregistered tgm */
@@ -XXX,XX +XXX,XX @@ void throttle_group_unregister_tgm(ThrottleGroupMember *tgm)
     AIO_WAIT_WHILE(tgm->aio_context, qatomic_read(&tgm->restart_pending) > 0);
 
     WITH_QEMU_LOCK_GUARD(&tg->lock) {
-        for (i = 0; i < 2; i++) {
-            assert(tgm->pending_reqs[i] == 0);
-            assert(qemu_co_queue_empty(&tgm->throttled_reqs[i]));
-            assert(!timer_pending(tgm->throttle_timers.timers[i]));
-            if (tg->tokens[i] == tgm) {
+        for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
+            assert(tgm->pending_reqs[dir] == 0);
+            assert(qemu_co_queue_empty(&tgm->throttled_reqs[dir]));
+            assert(!timer_pending(tgm->throttle_timers.timers[dir]));
+            if (tg->tokens[dir] == tgm) {
                 token = throttle_group_next_tgm(tgm);
                 /* Take care of the case where this is the last tgm in the group */
                 if (token == tgm) {
                     token = NULL;
                 }
-                tg->tokens[i] = token;
+                tg->tokens[dir] = token;
             }
         }
 
@@ -XXX,XX +XXX,XX @@ void throttle_group_detach_aio_context(ThrottleGroupMember *tgm)
 {
     ThrottleGroup *tg = container_of(tgm->throttle_state, ThrottleGroup, ts);
     ThrottleTimers *tt = &tgm->throttle_timers;
-    int i;
+    ThrottleDirection dir;
 
     /* Requests must have been drained */
-    assert(tgm->pending_reqs[0] == 0 && tgm->pending_reqs[1] == 0);
-    assert(qemu_co_queue_empty(&tgm->throttled_reqs[0]));
-    assert(qemu_co_queue_empty(&tgm->throttled_reqs[1]));
+    for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
+        assert(tgm->pending_reqs[dir] == 0);
+        assert(qemu_co_queue_empty(&tgm->throttled_reqs[dir]));
+    }
 
     /* Kick off next ThrottleGroupMember, if necessary */
     WITH_QEMU_LOCK_GUARD(&tg->lock) {
-        for (i = 0; i < 2; i++) {
-            if (timer_pending(tt->timers[i])) {
-                tg->any_timer_armed[i] = false;
-                schedule_next_request(tgm, i);
+        for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) {
+            if (timer_pending(tt->timers[dir])) {
+                tg->any_timer_armed[dir] = false;
+                schedule_next_request(tgm, dir);
             }
         }
     }
diff --git a/block/throttle.c b/block/throttle.c
index XXXXXXX..XXXXXXX 100644
--- a/block/throttle.c
+++ b/block/throttle.c
@@ -XXX,XX +XXX,XX @@ throttle_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,
 {
 
     ThrottleGroupMember *tgm = bs->opaque;
-    throttle_group_co_io_limits_intercept(tgm, bytes, false);
+    throttle_group_co_io_limits_intercept(tgm, bytes, THROTTLE_READ);
 
     return bdrv_co_preadv(bs->file, offset, bytes, qiov, flags);
 }
@@ -XXX,XX +XXX,XX @@ throttle_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,
                     QEMUIOVector *qiov, BdrvRequestFlags flags)
 {
     ThrottleGroupMember *tgm = bs->opaque;
-    throttle_group_co_io_limits_intercept(tgm, bytes, true);
+    throttle_group_co_io_limits_intercept(tgm, bytes, THROTTLE_WRITE);
 
     return bdrv_co_pwritev(bs->file, offset, bytes, qiov, flags);
 }
@@ -XXX,XX +XXX,XX @@ throttle_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int64_t bytes,
                           BdrvRequestFlags flags)
 {
     ThrottleGroupMember *tgm = bs->opaque;
-    throttle_group_co_io_limits_intercept(tgm, bytes, true);
+    throttle_group_co_io_limits_intercept(tgm, bytes, THROTTLE_WRITE);
 
     return bdrv_co_pwrite_zeroes(bs->file, offset, bytes, flags);
 }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn GRAPH_RDLOCK
 throttle_co_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes)
 {
     ThrottleGroupMember *tgm = bs->opaque;
-    throttle_group_co_io_limits_intercept(tgm, bytes, true);
+    throttle_group_co_io_limits_intercept(tgm, bytes, THROTTLE_WRITE);
 
     return bdrv_co_pdiscard(bs->file, offset, bytes);
 }
-- 
2.41.0

bs->bl.zoned is what indicates whether the zone information is present
and valid; it is the only thing that raw_refresh_zoned_limits() sets if
CONFIG_BLKZONED is not defined, and it is also the only thing that it
sets if CONFIG_BLKZONED is defined, but there are no zones.

Make sure that it is always set to BLK_Z_NONE if there is an error
anywhere in raw_refresh_zoned_limits() so that we do not accidentally
announce zones while our information is incomplete or invalid.

This also fixes a memory leak in the last error path in
raw_refresh_zoned_limits().

Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
Message-Id: <20230824155345.109765-2-hreitz@redhat.com>
Reviewed-by: Sam Li <faithilikerun@gmail.com>
---
 block/file-posix.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static void raw_refresh_zoned_limits(BlockDriverState *bs, struct stat *st,
     BlockZoneModel zoned;
     int ret;
 
-    bs->bl.zoned = BLK_Z_NONE;
-
     ret = get_sysfs_zoned_model(st, &zoned);
     if (ret < 0 || zoned == BLK_Z_NONE) {
-        return;
+        goto no_zoned;
     }
     bs->bl.zoned = zoned;
 
@@ -XXX,XX +XXX,XX @@ static void raw_refresh_zoned_limits(BlockDriverState *bs, struct stat *st,
     if (ret < 0) {
         error_setg_errno(errp, -ret, "Unable to read chunk_sectors "
                                      "sysfs attribute");
-        return;
+        goto no_zoned;
     } else if (!ret) {
         error_setg(errp, "Read 0 from chunk_sectors sysfs attribute");
-        return;
+        goto no_zoned;
     }
     bs->bl.zone_size = ret << BDRV_SECTOR_BITS;
 
@@ -XXX,XX +XXX,XX @@ static void raw_refresh_zoned_limits(BlockDriverState *bs, struct stat *st,
     if (ret < 0) {
         error_setg_errno(errp, -ret, "Unable to read nr_zones "
                                      "sysfs attribute");
-        return;
+        goto no_zoned;
     } else if (!ret) {
         error_setg(errp, "Read 0 from nr_zones sysfs attribute");
-        return;
+        goto no_zoned;
     }
     bs->bl.nr_zones = ret;
 
@@ -XXX,XX +XXX,XX @@ static void raw_refresh_zoned_limits(BlockDriverState *bs, struct stat *st,
     ret = get_zones_wp(bs, s->fd, 0, bs->bl.nr_zones, 0);
     if (ret < 0) {
         error_setg_errno(errp, -ret, "report wps failed");
-        bs->wps = NULL;
-        return;
+        goto no_zoned;
     }
     qemu_co_mutex_init(&bs->wps->colock);
+    return;
+
+no_zoned:
+    bs->bl.zoned = BLK_Z_NONE;
+    g_free(bs->wps);
+    bs->wps = NULL;
 }
 #else /* !defined(CONFIG_BLKZONED) */
 static void raw_refresh_zoned_limits(BlockDriverState *bs, struct stat *st,
-- 
2.41.0

Instead of checking bs->wps or bs->bl.zone_size for whether zone
information is present, check bs->bl.zoned.  That is the flag that
raw_refresh_zoned_limits() reliably sets to indicate zone support.  If
it is set to something other than BLK_Z_NONE, other values and objects
like bs->wps and bs->bl.zone_size must be non-null/zero and valid; if it
is not, we cannot rely on their validity.

Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
Message-Id: <20230824155345.109765-3-hreitz@redhat.com>
Reviewed-by: Sam Li <faithilikerun@gmail.com>
---
 block/file-posix.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_prw(BlockDriverState *bs, uint64_t offset,
     if (fd_open(bs) < 0)
         return -EIO;
 #if defined(CONFIG_BLKZONED)
-    if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) && bs->wps) {
+    if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
+        bs->bl.zoned != BLK_Z_NONE) {
         qemu_co_mutex_lock(&bs->wps->colock);
-        if (type & QEMU_AIO_ZONE_APPEND && bs->bl.zone_size) {
+        if (type & QEMU_AIO_ZONE_APPEND) {
             int index = offset / bs->bl.zone_size;
             offset = bs->wps->wp[index];
         }
@@ -XXX,XX +XXX,XX @@ out:
 {
     BlockZoneWps *wps = bs->wps;
     if (ret == 0) {
-        if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND))
-            && wps && bs->bl.zone_size) {
+        if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
+            bs->bl.zoned != BLK_Z_NONE) {
             uint64_t *wp = &wps->wp[offset / bs->bl.zone_size];
             if (!BDRV_ZT_IS_CONV(*wp)) {
                 if (type & QEMU_AIO_ZONE_APPEND) {
@@ -XXX,XX +XXX,XX @@ out:
         }
     }
 
-    if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) && wps) {
+    if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
+        bs->blk.zoned != BLK_Z_NONE) {
         qemu_co_mutex_unlock(&wps->colock);
     }
 }
-- 
2.41.0

We duplicate the same condition three times here, pull it out to the top
level.

Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
Message-Id: <20230824155345.109765-5-hreitz@redhat.com>
Reviewed-by: Sam Li <faithilikerun@gmail.com>
---
 block/file-posix.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_prw(BlockDriverState *bs, uint64_t offset,
 
 out:
 #if defined(CONFIG_BLKZONED)
-{
-    BlockZoneWps *wps = bs->wps;
-    if (ret == 0) {
-        if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
-            bs->bl.zoned != BLK_Z_NONE) {
+    if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
+        bs->bl.zoned != BLK_Z_NONE) {
+        BlockZoneWps *wps = bs->wps;
+        if (ret == 0) {
             uint64_t *wp = &wps->wp[offset / bs->bl.zone_size];
             if (!BDRV_ZT_IS_CONV(*wp)) {
                 if (type & QEMU_AIO_ZONE_APPEND) {
@@ -XXX,XX +XXX,XX @@ out:
                     *wp = offset + bytes;
                 }
             }
-        }
-    } else {
-        if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
-            bs->bl.zoned != BLK_Z_NONE) {
+        } else {
             update_zones_wp(bs, s->fd, 0, 1);
         }
-    }
 
-    if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) &&
-        bs->blk.zoned != BLK_Z_NONE) {
         qemu_co_mutex_unlock(&wps->colock);
     }
-}
 #endif
     return ret;
 }
-- 
2.41.0

This is a regression test for
https://bugzilla.redhat.com/show_bug.cgi?id=2234374.

All this test needs to do is trigger an I/O error inside of file-posix
(specifically raw_co_prw()).  One reliable way to do this without
requiring special privileges is to use a FUSE export, which allows us to
inject any error that we want, e.g. via blkdebug.

Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
Message-Id: <20230824155345.109765-6-hreitz@redhat.com>
[hreitz: Fixed test to be skipped when there is no FUSE support, to
         suppress fusermount's allow_other warning, and to be skipped
         with $IMGOPTSSYNTAX enabled]
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
---
 tests/qemu-iotests/tests/file-io-error     | 119 +++++++++++++++++++++
 tests/qemu-iotests/tests/file-io-error.out |  33 ++++++
 2 files changed, 152 insertions(+)
 create mode 100755 tests/qemu-iotests/tests/file-io-error
 create mode 100644 tests/qemu-iotests/tests/file-io-error.out

diff --git a/tests/qemu-iotests/tests/file-io-error b/tests/qemu-iotests/tests/file-io-error
new file mode 100755
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/tests/file-io-error
@@ -XXX,XX +XXX,XX @@
+#!/usr/bin/env bash
+# group: rw
+#
+# Produce an I/O error in file-posix, and hope that it is not catastrophic.
+# Regression test for: https://bugzilla.redhat.com/show_bug.cgi?id=2234374
+#
+# Copyright (C) 2023 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+seq=$(basename "$0")
+echo "QA output created by $seq"
+
+status=1	# failure is the default!
+
+_cleanup()
+{
+    _cleanup_qemu
+    rm -f "$TEST_DIR/fuse-export"
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ../common.rc
+. ../common.filter
+. ../common.qemu
+
+# Format-agnostic (we do not use any), but we do test the file protocol
+_supported_proto file
+_require_drivers blkdebug null-co
+
+if [ "$IMGOPTSSYNTAX" = "true" ]; then
+    # We need `$QEMU_IO -f file` to work; IMGOPTSSYNTAX uses --image-opts,
+    # breaking -f.
+    _unsupported_fmt $IMGFMT
+fi
+
+# This is a regression test of a bug in which flie-posix would access zone
+# information in case of an I/O error even when there is no zone information,
+# resulting in a division by zero.
+# To reproduce the problem, we need to trigger an I/O error inside of
+# file-posix, which can be done (rootless) by providing a FUSE export that
+# presents only errors when accessed.
+
+_launch_qemu
+_send_qemu_cmd $QEMU_HANDLE \
+    "{'execute': 'qmp_capabilities'}" \
+    'return'
+
+_send_qemu_cmd $QEMU_HANDLE \
+    "{'execute': 'blockdev-add',
+      'arguments': {
+          'driver': 'blkdebug',
+          'node-name': 'node0',
+          'inject-error': [{'event': 'none'}],
+          'image': {
+              'driver': 'null-co'
+          }
+      }}" \
+    'return'
+
+# FUSE mountpoint must exist and be a regular file
+touch "$TEST_DIR/fuse-export"
+
+# The grep -v to filter fusermount's (benign) error when /etc/fuse.conf does
+# not contain user_allow_other and the subsequent check for missing FUSE support
+# have both been taken from iotest 308.
+output=$(_send_qemu_cmd $QEMU_HANDLE \
+    "{'execute': 'block-export-add',
+      'arguments': {
+          'id': 'exp0',
+          'type': 'fuse',
+          'node-name': 'node0',
+          'mountpoint': '$TEST_DIR/fuse-export',
+          'writable': true
+      }}" \
+    'return' \
+    | grep -v 'option allow_other only allowed if')
+
+if echo "$output" | grep -q "Parameter 'type' does not accept value 'fuse'"; then
+    _notrun 'No FUSE support'
+fi
+echo "$output"
+
+echo
+# This should fail, but gracefully, i.e. just print an I/O error, not crash.
+$QEMU_IO -f file -c 'write 0 64M' "$TEST_DIR/fuse-export" | _filter_qemu_io
+echo
+
+_send_qemu_cmd $QEMU_HANDLE \
+    "{'execute': 'block-export-del',
+      'arguments': {'id': 'exp0'}}" \
+    'return'
+
+_send_qemu_cmd $QEMU_HANDLE \
+    '' \
+    'BLOCK_EXPORT_DELETED'
+
+_send_qemu_cmd $QEMU_HANDLE \
+    "{'execute': 'blockdev-del',
+      'arguments': {'node-name': 'node0'}}" \
+    'return'
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/tests/file-io-error.out b/tests/qemu-iotests/tests/file-io-error.out
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/tests/file-io-error.out
@@ -XXX,XX +XXX,XX @@
+QA output created by file-io-error
+{'execute': 'qmp_capabilities'}
+{"return": {}}
+{'execute': 'blockdev-add',
+      'arguments': {
+          'driver': 'blkdebug',
+          'node-name': 'node0',
+          'inject-error': [{'event': 'none'}],
+          'image': {
+              'driver': 'null-co'
+          }
+      }}
+{"return": {}}
+{'execute': 'block-export-add',
+      'arguments': {
+          'id': 'exp0',
+          'type': 'fuse',
+          'node-name': 'node0',
+          'mountpoint': 'TEST_DIR/fuse-export',
+          'writable': true
+      }}
+{"return": {}}
+
+write failed: Input/output error
+
+{'execute': 'block-export-del',
+      'arguments': {'id': 'exp0'}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "exp0"}}
+{'execute': 'blockdev-del',
+      'arguments': {'node-name': 'node0'}}
+{"return": {}}
+*** done
-- 
2.41.0