Series comparison

-[Qemu-devel] [PULL 00/27] Block layer patches
+[PULL 00/15] Block layer patches
-The following changes since commit 22d96eac64877c4d96f9928babb6f2fcc68faacf:
+The following changes since commit 22dbfdecc3c52228d3489da3fe81da92b21197bf:
-  Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2019-04-29 19:11:15 +0100)
+  Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20191010.0' into staging (2019-10-14 15:09:08 +0100)
 are available in the Git repository at:
   git://repo.or.cz/qemu/kevin.git tags/for-upstream
-for you to fetch changes up to 54277a2aab876aba7b55c7e88e2b372691849741:
+for you to fetch changes up to a1406a9262a087d9ec9627b88da13c4590b61dae:
-  block/qed: add missed coroutine_fn markers (2019-04-30 15:29:00 +0200)
+  iotests: Test large write request to qcow2 file (2019-10-14 17:12:48 +0200)
 ----------------------------------------------------------------
 Block layer patches:
-- iotests: Fix output of qemu-io related tests
+- block: Fix crash with qcow2 partial cluster COW with small cluster
-- Don't ignore bdrv_set_aio_context() for nodes with bs->drv = NUL
+  sizes (misaligned write requests with BDRV_REQ_NO_FALLBACK)
-- vmdk: Set vmdk parent backing_format to vmdk
+- qcow2: Fix integer overflow potentially causing corruption with huge
-- qcow2: Preallocation fixes (especially for external data files)
+  requests
-- Add linear-buffer-based APIs (as wrappers around qiov-based ones)
+- vhdx: Detect truncated image files
-- Various code cleanups and small corner case fixes
+- tools: Support help options for --object
 - Various block-related replay improvements
 - iotests/028: Fix for long $TEST_DIRs
 ----------------------------------------------------------------
-Alberto Garcia (3):
+Alberto Garcia (1):
-      qcow2: Fix error handling in the compression code
+      block: Reject misaligned write requests with BDRV_REQ_NO_FALLBACK
       commit: Make base read-only if there is an early failure
       iotests: Check that images are in read-only mode after block-commit
-Eric Blake (2):
+Kevin Wolf (4):
-      cutils: Fix size_to_str() on 32-bit platforms
+      vl: Split off user_creatable_print_help()
-      qemu-img: Saner printing of large file sizes
+      qemu-io: Support help options for --object
       qemu-img: Support help options for --object
       qemu-nbd: Support help options for --object
-Kevin Wolf (5):
+Max Reitz (3):
-      block: Fix AioContext switch for bs->drv == NULL
+      iotests/028: Fix for long $TEST_DIRs
-      qcow2: Avoid COW during metadata preallocation
+      qcow2: Limit total allocation range to INT_MAX
-      qcow2: Add errp to preallocate_co()
+      iotests: Test large write request to qcow2 file
       qcow2: Fix full preallocation with external data file
       qcow2: Fix qcow2_make_empty() with external data file
-Max Reitz (2):
+Pavel Dovgaluk (6):
-      iotests: Perform the correct test in 082
+      block: implement bdrv_snapshot_goto for blkreplay
-      qemu-img: Make create hint at protocol options
+      replay: disable default snapshot for record/replay
       replay: update docs for record/replay with block devices
       replay: don't drain/flush bdrv queue while RR is working
       replay: finish record/replay before closing the disks
       replay: add BH oneshot event for block layer
-Sam Eiderman (1):
+Peter Lieven (1):
-      vmdk: Set vmdk parent backing_format to vmdk
+      block/vhdx: add check for truncated image files
-Stefano Garzarella (2):
+ docs/replay.txt                 |  12 +++-
-      block/vhdx: Remove redundant IEC binary prefixes definition
+ include/qom/object_interfaces.h |  12 ++++
-      block/vhdx: Use IEC binary prefixes for size constants
+ include/sysemu/replay.h         |   4 ++
  replay/replay-internal.h        |   1 +
  block/blkreplay.c               |   8 +++
  block/block-backend.c           |   9 ++-
  block/io.c                      |  39 ++++++++++++-
  block/iscsi.c                   |   5 +-
  block/nfs.c                     |   6 +-
  block/null.c                    |   4 +-
  block/nvme.c                    |   6 +-
  block/qcow2-cluster.c           |   5 +-
  block/rbd.c                     |   5 +-
  block/vhdx.c                    | 120 ++++++++++++++++++++++++++++++++++------
  block/vxhs.c                    |   5 +-
  cpus.c                          |   2 -
  qemu-img.c                      |  34 +++++++-----
  qemu-io.c                       |   9 ++-
  qemu-nbd.c                      |   9 ++-
  qom/object_interfaces.c         |  61 ++++++++++++++++++++
  replay/replay-events.c          |  16 ++++++
  replay/replay.c                 |   2 +
  stubs/replay-user.c             |   9 +++
  vl.c                            |  63 ++++-----------------
  stubs/Makefile.objs             |   1 +
  tests/qemu-iotests/028          |  11 +++-
  tests/qemu-iotests/028.out      |   1 -
  tests/qemu-iotests/268          |  55 ++++++++++++++++++
  tests/qemu-iotests/268.out      |   7 +++
  tests/qemu-iotests/270          |  83 +++++++++++++++++++++++++++
  tests/qemu-iotests/270.out      |   9 +++
  tests/qemu-iotests/group        |   2 +
 files changed, 504 insertions(+), 111 deletions(-)
  create mode 100644 stubs/replay-user.c
  create mode 100755 tests/qemu-iotests/268
  create mode 100644 tests/qemu-iotests/268.out
  create mode 100755 tests/qemu-iotests/270
  create mode 100644 tests/qemu-iotests/270.out
-Thomas Huth (1):
-      tests/qemu-iotests: Fix output of qemu-io related tests
-Vladimir Sementsov-Ogievskiy (10):
-      block: introduce byte-based io helpers
-      block/qcow2: use buffer-based io
-      block/qcow: use buffer-based io
-      block/qed: use buffer-based io
-      block/parallels: use buffer-based io
-      block/backup: use buffer-based io
-      block/commit: use buffer-based io
-      block/stream: use buffer-based io
-      qemu-img: use buffer-based io
-      block/qed: add missed coroutine_fn markers
-Zhengui li (1):
-      vpc: unlock Coroutine lock to make IO submit Concurrently
- block/qed.h                    |  28 ++++---
- block/vhdx.h                   |  16 ++--
- include/block/block_int.h      |  16 ++++
- include/sysemu/block-backend.h |  19 +++++
- block.c                        |  12 +--
- block/backup.c                 |  14 ++--
- block/commit.c                 |   8 +-
- block/parallels.c              |  14 ++--
- block/qapi.c                   |  49 +++---------
- block/qcow.c                   |  19 ++---
- block/qcow2.c                  |  80 ++++++++++----------
- block/qed-check.c              |   4 +-
- block/qed-table.c              |  45 ++++++-----
- block/qed.c                    |  11 ++-
- block/stream.c                 |   4 +-
- block/vhdx-log.c               |   2 +-
- block/vhdx.c                   |   7 +-
- block/vmdk.c                   |   2 +
- block/vpc.c                    |   4 +
- qemu-img.c                     |  26 ++++---
- util/cutils.c                  |   2 +-
- tests/qemu-iotests/026.out     | 168 ++++++++++++++++++++---------------------
- tests/qemu-iotests/043.out     |   6 +-
- tests/qemu-iotests/053.out     |   2 +-
- tests/qemu-iotests/059.out     |  10 +--
- tests/qemu-iotests/060.out     |  16 ++--
- tests/qemu-iotests/061.out     |  12 +--
- tests/qemu-iotests/069.out     |   2 +-
- tests/qemu-iotests/070.out     |   4 +-
- tests/qemu-iotests/075.out     |  14 ++--
- tests/qemu-iotests/076.out     |   6 +-
- tests/qemu-iotests/078.out     |  12 +--
- tests/qemu-iotests/080.out     |  40 +++++-----
- tests/qemu-iotests/081.out     |   2 +-
- tests/qemu-iotests/082         |   5 +-
- tests/qemu-iotests/082.out     |  51 ++++++++-----
- tests/qemu-iotests/084.out     |   8 +-
- tests/qemu-iotests/088.out     |  12 +--
- tests/qemu-iotests/089.out     |   2 +-
- tests/qemu-iotests/095.out     |   4 +-
- tests/qemu-iotests/103.out     |  14 ++--
- tests/qemu-iotests/104.out     |   6 +-
- tests/qemu-iotests/110.out     |   6 +-
- tests/qemu-iotests/114.out     |   4 +-
- tests/qemu-iotests/116.out     |  14 ++--
- tests/qemu-iotests/126.out     |   4 +-
- tests/qemu-iotests/130.out     |  10 +--
- tests/qemu-iotests/131.out     |   2 +-
- tests/qemu-iotests/133.out     |  30 ++++----
- tests/qemu-iotests/137.out     |  28 +++----
- tests/qemu-iotests/140.out     |   2 +-
- tests/qemu-iotests/143.out     |   2 +-
- tests/qemu-iotests/153.out     |  32 ++++----
- tests/qemu-iotests/187.out     |   6 +-
- tests/qemu-iotests/188.out     |   2 +-
- tests/qemu-iotests/191.out     |   8 +-
- tests/qemu-iotests/195.out     |   4 +-
- tests/qemu-iotests/197.out     |   2 +-
- tests/qemu-iotests/198.out     |   4 +-
- tests/qemu-iotests/205         |   2 +-
- tests/qemu-iotests/206.out     |  10 +--
- tests/qemu-iotests/207.out     |  12 +--
- tests/qemu-iotests/210.out     |   8 +-
- tests/qemu-iotests/211.out     |  10 +--
- tests/qemu-iotests/212.out     |  10 +--
- tests/qemu-iotests/213.out     |  10 +--
- tests/qemu-iotests/215.out     |   2 +-
- tests/qemu-iotests/226.out     |  16 ++--
- tests/qemu-iotests/233.out     |   4 +-
- tests/qemu-iotests/237.out     |  22 +++---
- tests/qemu-iotests/242.out     |  10 +--
- tests/qemu-iotests/244.out     |  10 +--
- tests/qemu-iotests/249         | 115 ++++++++++++++++++++++++++++
- tests/qemu-iotests/249.out     |  35 +++++++++
- tests/qemu-iotests/group       |   1 +
-files changed, 696 insertions(+), 519 deletions(-)
- create mode 100755 tests/qemu-iotests/249
- create mode 100644 tests/qemu-iotests/249.out

-[Qemu-devel] [PULL 01/27] tests/qemu-iotests: Fix output of qemu-io related tests
+Deleted patch
-From: Thomas Huth <thuth@redhat.com>
-One of the recent commits changed the way qemu-io prints out its
-errors and warnings - they are now prefixed with the program name.
-We've got to adapt the iotests accordingly to prevent that they
-are failing.
-Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/026.out | 168 ++++++++++++++++++-------------------
- tests/qemu-iotests/060.out |   6 +-
- tests/qemu-iotests/069.out |   2 +-
- tests/qemu-iotests/070.out |   2 +-
- tests/qemu-iotests/075.out |  14 ++--
- tests/qemu-iotests/076.out |   6 +-
- tests/qemu-iotests/078.out |  12 +--
- tests/qemu-iotests/080.out |  40 ++++-----
- tests/qemu-iotests/081.out |   2 +-
- tests/qemu-iotests/088.out |  12 +--
- tests/qemu-iotests/103.out |  14 ++--
- tests/qemu-iotests/114.out |   2 +-
- tests/qemu-iotests/116.out |  14 ++--
- tests/qemu-iotests/131.out |   2 +-
- tests/qemu-iotests/133.out |  30 +++----
- tests/qemu-iotests/137.out |  28 +++----
- tests/qemu-iotests/140.out |   2 +-
- tests/qemu-iotests/143.out |   2 +-
- tests/qemu-iotests/153.out |  30 +++----
- tests/qemu-iotests/187.out |   6 +-
- tests/qemu-iotests/188.out |   2 +-
- tests/qemu-iotests/197.out |   2 +-
- tests/qemu-iotests/205     |   2 +-
- tests/qemu-iotests/215.out |   2 +-
- tests/qemu-iotests/226.out |  16 ++--
- tests/qemu-iotests/244.out |  10 +--
-files changed, 214 insertions(+), 214 deletions(-)
-diff --git a/tests/qemu-iotests/026.out b/tests/qemu-iotests/026.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/026.out
-+++ b/tests/qemu-iotests/026.out
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l1_update; errno: 5; imm: off; once: off; write
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l1_update; errno: 5; imm: off; once: off; write -b
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l1_update; errno: 28; imm: off; once: off; write
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l1_update; errno: 28; imm: off; once: off; write -b
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l2_update; errno: 5; imm: off; once: off; write
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l2_update; errno: 5; imm: off; once: off; write -b
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l2_update; errno: 28; imm: off; once: off; write
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l2_update; errno: 28; imm: off; once: off; write -b
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l2_alloc_write; errno: 5; imm: off; once: off; write
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l2_alloc_write; errno: 28; imm: off; once: off; write
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: write_aio; errno: 5; imm: off; once: off; write
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: write_aio; errno: 5; imm: off; once: off; write -b
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: write_aio; errno: 28; imm: off; once: off; write
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: write_aio; errno: 28; imm: off; once: off; write -b
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_load; errno: 5; imm: off; once: off; write
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_load; errno: 5; imm: off; once: off; write -b
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_load; errno: 28; imm: off; once: off; write
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_load; errno: 28; imm: off; once: off; write -b
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_update_part; errno: 5; imm: off; once: off; write
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_update_part; errno: 5; imm: off; once: off; write -b
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_update_part; errno: 28; imm: off; once: off; write
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_update_part; errno: 28; imm: off; once: off; write -b
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc; errno: 5; imm: off; once: off; write
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc; errno: 5; imm: off; once: off; write -b
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc; errno: 28; imm: off; once: off; write
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc; errno: 28; imm: off; once: off; write -b
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write -b
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc_write; errno: 28; imm: off; once: off; write
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc_write; errno: 28; imm: off; once: off; write -b
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write -b
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write -b
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write -b
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l1_grow_write_table; errno: 5; imm: off; once: off
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l1_grow_write_table; errno: 28; imm: off; once: off
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
- No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l1_grow_activate_table; errno: 5; imm: off; once: off
--Failed to flush the L2 table cache: Input/output error
--Failed to flush the refcount block cache: Input/output error
-+qemu-io: Failed to flush the L2 table cache: Input/output error
-+qemu-io: Failed to flush the refcount block cache: Input/output error
- write failed: Input/output error
-leaked clusters were found on the image.
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l1_grow_activate_table; errno: 28; imm: off; once: off
--Failed to flush the L2 table cache: No space left on device
--Failed to flush the refcount block cache: No space left on device
-+qemu-io: Failed to flush the L2 table cache: No space left on device
-+qemu-io: Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
-leaked clusters were found on the image.
-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 @@ Format specific information:
-     lazy refcounts: false
-     refcount bits: 16
-     corrupt: true
--can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
-+qemu-io: can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
- no file open, try 'help open'
- read 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- === Testing zero refcount table size ===
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
-+qemu-io: can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
- ERROR cluster 0 refcount=0 reference=1
- ERROR cluster 3 refcount=0 reference=1
- Rebuilding refcount structure
-@@ -XXX,XX +XXX,XX @@ Can't get refcount for cluster 2: Input/output error
- Can't get refcount for cluster 3: Input/output error
- Rebuilding refcount structure
- Repairing cluster 1 refcount=1 reference=0
--can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
-+qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
- --- Repairing ---
- Leaked cluster 1 refcount=1 reference=0
- Repairing cluster 1 refcount=1 reference=0
-diff --git a/tests/qemu-iotests/069.out b/tests/qemu-iotests/069.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/069.out
-+++ b/tests/qemu-iotests/069.out
-@@ -XXX,XX +XXX,XX @@ QA output created by 069
- Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file=TEST_DIR/t.IMGFMT.base
--can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
-+qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
- *** done
-diff --git a/tests/qemu-iotests/070.out b/tests/qemu-iotests/070.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/070.out
-+++ b/tests/qemu-iotests/070.out
-@@ -XXX,XX +XXX,XX @@
- QA output created by 070
- === Verify open image read-only fails, due to dirty log ===
--can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
-+qemu-io: can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
- To replay the log, run:
- qemu-img check -r all 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx'
- === Verify open image replays log  ===
-diff --git a/tests/qemu-iotests/075.out b/tests/qemu-iotests/075.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/075.out
-+++ b/tests/qemu-iotests/075.out
-@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 1048064
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- == block_size must be a multiple of 512 ==
--can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
-+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
- == block_size cannot be zero ==
--can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
-+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
- == huge block_size ===
--can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
-+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
- == offsets_size overflow ===
--can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
-+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
- == refuse images that require too many offsets ===
--can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
-+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
- == refuse images with non-monotonically increasing offsets ==
--can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
-+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
- == refuse images with invalid compressed block size ==
--can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
-+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
- *** done
-diff --git a/tests/qemu-iotests/076.out b/tests/qemu-iotests/076.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/076.out
-+++ b/tests/qemu-iotests/076.out
-@@ -XXX,XX +XXX,XX @@ read 65536/65536 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- == Negative catalog size ==
--can't open device TEST_DIR/parallels-v1: Catalog too large
-+qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
- == Overflow in catalog allocation ==
--can't open device TEST_DIR/parallels-v1: Catalog too large
-+qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
- == Zero sectors per track ==
--can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
-+qemu-io: can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
- == Read from a valid v2 image ==
- read 65536/65536 bytes at offset 0
-diff --git a/tests/qemu-iotests/078.out b/tests/qemu-iotests/078.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/078.out
-+++ b/tests/qemu-iotests/078.out
-@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- == Negative catalog size ==
--can't open device TEST_DIR/empty.bochs: Catalog size is too large
-+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
- == Overflow for catalog size * sizeof(uint32_t) ==
--can't open device TEST_DIR/empty.bochs: Catalog size is too large
-+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
- == Too small catalog bitmap for image size ==
--can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
--can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
-+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
-+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
- == Negative extent size ==
--can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
-+qemu-io: can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
- == Zero extent size ==
--can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
-+qemu-io: can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
- *** done
-diff --git a/tests/qemu-iotests/080.out b/tests/qemu-iotests/080.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/080.out
-+++ b/tests/qemu-iotests/080.out
-@@ -XXX,XX +XXX,XX @@ QA output created by 080
- == Huge header size ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
--can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
-+qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
-+qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
- == Huge unknown header extension ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--can't open device TEST_DIR/t.qcow2: Invalid backing file offset
--can't open device TEST_DIR/t.qcow2: Header extension too large
--can't open device TEST_DIR/t.qcow2: Header extension too large
-+qemu-io: can't open device TEST_DIR/t.qcow2: Invalid backing file offset
-+qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
-+qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
- == Huge refcount table size ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--can't open device TEST_DIR/t.qcow2: Reference count table too large
--can't open device TEST_DIR/t.qcow2: Reference count table too large
-+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
-+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
- == Misaligned refcount table ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
-+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
- == Huge refcount offset ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
-+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
- == Invalid snapshot table ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--can't open device TEST_DIR/t.qcow2: Snapshot table too large
--can't open device TEST_DIR/t.qcow2: Snapshot table too large
--can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
--can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
-+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
-+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
-+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
-+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
- == Hitting snapshot table size limit ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 0
- == Invalid L1 table ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--can't open device TEST_DIR/t.qcow2: Active L1 table too large
--can't open device TEST_DIR/t.qcow2: Active L1 table too large
--can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
--can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
-+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
-+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
-+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
-+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
- == Invalid L1 table (with internal snapshot in the image) ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': L1 table is too small
- == Invalid backing file size ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--can't open device TEST_DIR/t.qcow2: Backing file name too long
-+qemu-io: can't open device TEST_DIR/t.qcow2: Backing file name too long
- == Invalid L2 entry (huge physical offset) ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 0
- qemu-img: Failed to load snapshot: Snapshot L1 table offset invalid
- qemu-img: Snapshot L1 table offset invalid
- qemu-img: Failed to turn zero into data clusters: Invalid argument
--Failed to flush the refcount block cache: Invalid argument
-+qemu-io: Failed to flush the refcount block cache: Invalid argument
- write failed: Invalid argument
- qemu-img: Snapshot L1 table offset invalid
- qemu-img: Could not apply snapshot 'test': Failed to load snapshot: Invalid argument
-@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 0
- qemu-img: Failed to load snapshot: Snapshot L1 table too large
- qemu-img: Snapshot L1 table too large
- qemu-img: Failed to turn zero into data clusters: File too large
--Failed to flush the refcount block cache: File too large
-+qemu-io: Failed to flush the refcount block cache: File too large
- write failed: File too large
- qemu-img: Snapshot L1 table too large
- qemu-img: Could not apply snapshot 'test': Failed to load snapshot: File too large
-diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/081.out
-+++ b/tests/qemu-iotests/081.out
-@@ -XXX,XX +XXX,XX @@ read 10485760/10485760 bytes at offset 0
-MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- == checking the blkverify mode with invalid settings ==
--can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
-+qemu-io: can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
- == dynamically adding a child to a quorum ==
- Testing:
-diff --git a/tests/qemu-iotests/088.out b/tests/qemu-iotests/088.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/088.out
-+++ b/tests/qemu-iotests/088.out
-@@ -XXX,XX +XXX,XX @@ QA output created by 088
- == Invalid block size ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--can't open device TEST_DIR/t.vpc: Invalid block size 0
--can't open device TEST_DIR/t.vpc: Invalid block size 0
--can't open device TEST_DIR/t.vpc: Invalid block size 128
--can't open device TEST_DIR/t.vpc: Invalid block size 128
--can't open device TEST_DIR/t.vpc: Invalid block size 305419896
--can't open device TEST_DIR/t.vpc: Invalid block size 305419896
-+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
-+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
-+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
-+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
-+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
-+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
- *** done
-diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/103.out
-+++ b/tests/qemu-iotests/103.out
-@@ -XXX,XX +XXX,XX @@ wrote 65536/65536 bytes at offset 0
- === Testing invalid option combinations ===
--can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
--can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
--can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
--can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
--can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
--can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
--can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-+qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
-+qemu-io: can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
-+qemu-io: can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
-+qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
-+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
- === Testing valid option combinations ===
-diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/114.out
-+++ b/tests/qemu-iotests/114.out
-@@ -XXX,XX +XXX,XX @@ virtual size: 64M (67108864 bytes)
- cluster_size: 65536
- backing file: TEST_DIR/t.IMGFMT.base
- backing file format: foo
--can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
-+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
- no file open, try 'help open'
- read 4096/4096 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-diff --git a/tests/qemu-iotests/116.out b/tests/qemu-iotests/116.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/116.out
-+++ b/tests/qemu-iotests/116.out
-@@ -XXX,XX +XXX,XX @@ QA output created by 116
- == truncated header cluster ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
--can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
-+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
- == invalid header magic ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
--can't open device TEST_DIR/t.qed: Image not in QED format
-+qemu-io: can't open device TEST_DIR/t.qed: Image not in QED format
- == invalid cluster size ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
--can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
-+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
- == invalid table size ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
--can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
-+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
- == invalid header size ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
--can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
-+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
- == invalid L1 table offset ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
--can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
-+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
- == invalid image size ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
--can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
-+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
- *** done
-diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/131.out
-+++ b/tests/qemu-iotests/131.out
-@@ -XXX,XX +XXX,XX @@ read 32768/32768 bytes at offset 163840
- read 32768/32768 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- == Corrupt image ==
--can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
-+qemu-io: can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
- ERROR image was not closed correctly
-errors were found on the image.
-diff --git a/tests/qemu-iotests/133.out b/tests/qemu-iotests/133.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/133.out
-+++ b/tests/qemu-iotests/133.out
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t
- === Check that node-name can't be changed ===
--Cannot change the option 'node-name'
--Cannot change the option 'node-name'
--Cannot change the option 'node-name'
-+qemu-io: Cannot change the option 'node-name'
-+qemu-io: Cannot change the option 'node-name'
-+qemu-io: Cannot change the option 'node-name'
- === Check that unchanged node-name is okay ===
- === Check that driver can't be changed ===
--Cannot change the option 'driver'
--Cannot change the option 'driver'
--Cannot change the option 'driver'
-+qemu-io: Cannot change the option 'driver'
-+qemu-io: Cannot change the option 'driver'
-+qemu-io: Cannot change the option 'driver'
- === Check that unchanged driver is okay ===
-@@ -XXX,XX +XXX,XX @@ format name: null-co
- === Check that mixing -c/-r/-w and their corresponding options is forbidden ===
--Cannot set both -r/-w and 'read-only'
--Cannot set both -r/-w and 'read-only'
--Cannot set both -c and the cache options
--Cannot set both -c and the cache options
--Cannot set both -c and the cache options
-+qemu-io: Cannot set both -r/-w and 'read-only'
-+qemu-io: Cannot set both -r/-w and 'read-only'
-+qemu-io: Cannot set both -c and the cache options
-+qemu-io: Cannot set both -c and the cache options
-+qemu-io: Cannot set both -c and the cache options
- === Check that invalid options are handled correctly ===
--Parameter 'read-only' expects 'on' or 'off'
--Parameter 'cache.no-flush' expects 'on' or 'off'
--Parameter 'cache.direct' expects 'on' or 'off'
--Parameter 'auto-read-only' expects 'on' or 'off'
-+qemu-io: Parameter 'read-only' expects 'on' or 'off'
-+qemu-io: Parameter 'cache.no-flush' expects 'on' or 'off'
-+qemu-io: Parameter 'cache.direct' expects 'on' or 'off'
-+qemu-io: Parameter 'auto-read-only' expects 'on' or 'off'
- *** done
-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 @@ read 33554432/33554432 bytes at offset 0
- === Try setting some invalid values ===
--Parameter 'lazy-refcounts' expects 'on' or 'off'
--cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
--l2-cache-size may not exceed cache-size
--refcount-cache-size may not exceed cache-size
--L2 cache entry size must be a power of two between 512 and the cluster size (65536)
--L2 cache entry size must be a power of two between 512 and the cluster size (65536)
--Refcount cache size too big
--Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
--Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
--Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
--Cache clean interval too big
-+qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
-+qemu-io: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
-+qemu-io: l2-cache-size may not exceed cache-size
-+qemu-io: refcount-cache-size may not exceed cache-size
-+qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-+qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-+qemu-io: Refcount cache size too big
-+qemu-io: Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
-+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
-+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
-+qemu-io: Cache clean interval too big
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=36028797018963968
--L2 cache size too big
-+qemu-io: L2 cache size too big
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- === Test transaction semantics ===
--Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
-+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
- wrote 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- ./common.rc: Killed                  ( if [ "${VALGRIND_QEMU}" == "y" ]; then
-@@ -XXX,XX +XXX,XX @@ incompatible_features     0x0
- 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)
--Parameter 'lazy-refcounts' expects 'on' or 'off'
-+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
- write failed: Input/output error
- *** done
-diff --git a/tests/qemu-iotests/140.out b/tests/qemu-iotests/140.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/140.out
-+++ b/tests/qemu-iotests/140.out
-@@ -XXX,XX +XXX,XX @@ wrote 65536/65536 bytes at offset 0
- read 65536/65536 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- {"return": {}}
--can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
-+qemu-io: can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
- server reported: export 'drv' not present
- {"return": {}}
- {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
-diff --git a/tests/qemu-iotests/143.out b/tests/qemu-iotests/143.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/143.out
-+++ b/tests/qemu-iotests/143.out
-@@ -XXX,XX +XXX,XX @@
- QA output created by 143
- {"return": {}}
- {"return": {}}
--can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
-+qemu-io: can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
- server reported: export 'no_such_export' not present
- {"return": {}}
- {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
-diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/153.out
-+++ b/tests/qemu-iotests/153.out
-@@ -XXX,XX +XXX,XX @@ Is another process using the image [TEST_DIR/t.qcow2]?
- == Running utility commands  ==
- _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
--can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
-+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
- Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
--can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
-+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
- Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_io_wrapper -c open  TEST_DIR/t.qcow2 -c read 0 512
--can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
-+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
- Is another process using the image [TEST_DIR/t.qcow2]?
- no file open, try 'help open'
- _qemu_io_wrapper -c open -r  TEST_DIR/t.qcow2 -c read 0 512
--can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
-+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
- Is another process using the image [TEST_DIR/t.qcow2]?
- no file open, try 'help open'
-@@ -XXX,XX +XXX,XX @@ file format: IMGFMT
- == Running utility commands -U ==
- _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
--can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
-+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
- _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
- _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
--can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
-+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
- no file open, try 'help open'
- _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
-@@ -XXX,XX +XXX,XX @@ Is another process using the image [TEST_DIR/t.qcow2]?
- == Running utility commands  ==
- _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
--can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
-+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
- Is another process using the image [TEST_DIR/t.qcow2]?
- _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
- _qemu_io_wrapper -c open  TEST_DIR/t.qcow2 -c read 0 512
--can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
-+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
- Is another process using the image [TEST_DIR/t.qcow2]?
- no file open, try 'help open'
-@@ -XXX,XX +XXX,XX @@ file format: IMGFMT
- == Running utility commands -U ==
- _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
--can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
-+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
- _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
- _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
--can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
-+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
- no file open, try 'help open'
- _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
-@@ -XXX,XX +XXX,XX @@ file format: IMGFMT
- == Running utility commands -U ==
- _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
--can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
-+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
- _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
- _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
--can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
-+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
- no file open, try 'help open'
- _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
-@@ -XXX,XX +XXX,XX @@ Adding drive
- {"return": "OKrn"}
- _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
--can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
-+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
- Is another process using the image [TEST_DIR/t.qcow2]?
- Creating overlay with qemu-img when the guest is running should be allowed
-@@ -XXX,XX +XXX,XX @@ _qemu_img_wrapper info TEST_DIR/t.qcow2
- {"return": ""}
- _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
--can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
-+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
- Is another process using the image [TEST_DIR/t.qcow2]?
- Closing the other
- {"return": ""}
-@@ -XXX,XX +XXX,XX @@ qemu-img: --force-share/-U conflicts with image options
- No conflict:
- Conflict:
---U conflicts with image options
-+qemu-io: -U conflicts with image options
- *** done
-diff --git a/tests/qemu-iotests/187.out b/tests/qemu-iotests/187.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/187.out
-+++ b/tests/qemu-iotests/187.out
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- Start from read-only
--Block node is read-only
-+qemu-io: Block node is read-only
- wrote 65536/65536 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--Block node is read-only
-+qemu-io: Block node is read-only
- Start from read-write
- wrote 65536/65536 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--Block node is read-only
-+qemu-io: Block node is read-only
- wrote 65536/65536 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- *** done
-diff --git a/tests/qemu-iotests/188.out b/tests/qemu-iotests/188.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/188.out
-+++ b/tests/qemu-iotests/188.out
-@@ -XXX,XX +XXX,XX @@ read 16777216/16777216 bytes at offset 0
-MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- == verify open failure with wrong password ==
--can't open: Invalid password, cannot unlock any keyslot
-+qemu-io: can't open: Invalid password, cannot unlock any keyslot
- *** done
-diff --git a/tests/qemu-iotests/197.out b/tests/qemu-iotests/197.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/197.out
-+++ b/tests/qemu-iotests/197.out
-@@ -XXX,XX +XXX,XX @@ read 2147483136/2147483136 bytes at offset 1024
-GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- read 1024/1024 bytes at offset 3221226496
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
-+qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
-GiB (0x80010000) bytes     allocated at offset 0 bytes (0x0)
-.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
-KiB (0x10000) bytes     allocated at offset 3 GiB (0xc0000000)
-diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/205
-+++ b/tests/qemu-iotests/205
-@@ -XXX,XX +XXX,XX @@ class TestNbdServerRemove(iotests.QMPTestCase):
-     def assertConnectFailed(self, qemu_io_output):
-         self.assertEqual(filter_qemu_io(qemu_io_output).strip(),
--                         "can't open device " + nbd_uri +
-+                         "qemu-io: can't open device " + nbd_uri +
-                          ": Requested export not available\n"
-                          "server reported: export 'exp' not present")
-diff --git a/tests/qemu-iotests/215.out b/tests/qemu-iotests/215.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/215.out
-+++ b/tests/qemu-iotests/215.out
-@@ -XXX,XX +XXX,XX @@ read 2147483136/2147483136 bytes at offset 1024
-GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- read 1024/1024 bytes at offset 3221226496
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
-+qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
-GiB (0x80010000) bytes     allocated at offset 0 bytes (0x0)
-.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
-KiB (0x10000) bytes     allocated at offset 3 GiB (0xc0000000)
-diff --git a/tests/qemu-iotests/226.out b/tests/qemu-iotests/226.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/226.out
-+++ b/tests/qemu-iotests/226.out
-@@ -XXX,XX +XXX,XX @@ QA output created by 226
- === Testing with driver:file ===
- == Testing RO ==
--can't open: A regular file was expected by the 'file' driver, but something else was given
--warning: Opening a character device as a file using the 'file' driver is deprecated
-+qemu-io: can't open: A regular file was expected by the 'file' driver, but something else was given
-+qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
- == Testing RW ==
--can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
--warning: Opening a character device as a file using the 'file' driver is deprecated
-+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
-+qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
- === Testing with driver:host_device ===
- == Testing RO ==
--can't open: 'host_device' driver expects either a character or block device
-+qemu-io: can't open: 'host_device' driver expects either a character or block device
- == Testing RW ==
--can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
-+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
- === Testing with driver:host_cdrom ===
- == Testing RO ==
--can't open: 'host_cdrom' driver expects either a character or block device
-+qemu-io: can't open: 'host_cdrom' driver expects either a character or block device
- == Testing RW ==
--can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
-+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
- *** done
-diff --git a/tests/qemu-iotests/244.out b/tests/qemu-iotests/244.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/244.out
-+++ b/tests/qemu-iotests/244.out
-@@ -XXX,XX +XXX,XX @@ read 65536/65536 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- read 65536/65536 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
-+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
- no file open, try 'help open'
- Data file required, but without data file name in the image:
--can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
-+qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
- no file open, try 'help open'
- read 65536/65536 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
-+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
- no file open, try 'help open'
- Setting data-file for an image with internal data:
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
-+qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
- no file open, try 'help open'
--can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
-+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
- no file open, try 'help open'
- === Conflicting features ===
---
-.20.1

-[Qemu-devel] [PULL 02/27] block: Fix AioContext switch for bs->drv == NULL
+Deleted patch
-Even for block nodes with bs->drv == NULL, we can't just ignore a
-bdrv_set_aio_context() call. Leaving the node in its old context can
-mean that it's still in an iothread context in bdrv_close_all() during
-shutdown, resulting in an attempted unlock of the AioContext lock which
-we don't hold.
-This is an example stack trace of a related crash:
- #0  0x00007ffff59da57f in raise () at /lib64/libc.so.6
- #1  0x00007ffff59c4895 in abort () at /lib64/libc.so.6
- #2  0x0000555555b97b1e in error_exit (err=<optimized out>, msg=msg@entry=0x555555d386d0 <__func__.19059> "qemu_mutex_unlock_impl") at util/qemu-thread-posix.c:36
- #3  0x0000555555b97f7f in qemu_mutex_unlock_impl (mutex=mutex@entry=0x5555568002f0, file=file@entry=0x555555d378df "util/async.c", line=line@entry=507) at util/qemu-thread-posix.c:97
- #4  0x0000555555b92f55 in aio_context_release (ctx=ctx@entry=0x555556800290) at util/async.c:507
- #5  0x0000555555b05cf8 in bdrv_prwv_co (child=child@entry=0x7fffc80012f0, offset=offset@entry=131072, qiov=qiov@entry=0x7fffffffd4f0, is_write=is_write@entry=true, flags=flags@entry=0)
-         at block/io.c:833
- #6  0x0000555555b060a9 in bdrv_pwritev (qiov=0x7fffffffd4f0, offset=131072, child=0x7fffc80012f0) at block/io.c:990
- #7  0x0000555555b060a9 in bdrv_pwrite (child=0x7fffc80012f0, offset=131072, buf=<optimized out>, bytes=<optimized out>) at block/io.c:990
- #8  0x0000555555ae172b in qcow2_cache_entry_flush (bs=bs@entry=0x555556810680, c=c@entry=0x5555568cc740, i=i@entry=0) at block/qcow2-cache.c:51
- #9  0x0000555555ae18dd in qcow2_cache_write (bs=bs@entry=0x555556810680, c=0x5555568cc740) at block/qcow2-cache.c:248
- #10 0x0000555555ae15de in qcow2_cache_flush (bs=0x555556810680, c=<optimized out>) at block/qcow2-cache.c:259
- #11 0x0000555555ae16b1 in qcow2_cache_flush_dependency (c=0x5555568a1700, c=0x5555568a1700, bs=0x555556810680) at block/qcow2-cache.c:194
- #12 0x0000555555ae16b1 in qcow2_cache_entry_flush (bs=bs@entry=0x555556810680, c=c@entry=0x5555568a1700, i=i@entry=0) at block/qcow2-cache.c:194
- #13 0x0000555555ae18dd in qcow2_cache_write (bs=bs@entry=0x555556810680, c=0x5555568a1700) at block/qcow2-cache.c:248
- #14 0x0000555555ae15de in qcow2_cache_flush (bs=bs@entry=0x555556810680, c=<optimized out>) at block/qcow2-cache.c:259
- #15 0x0000555555ad242c in qcow2_inactivate (bs=bs@entry=0x555556810680) at block/qcow2.c:2124
- #16 0x0000555555ad2590 in qcow2_close (bs=0x555556810680) at block/qcow2.c:2153
- #17 0x0000555555ab0c62 in bdrv_close (bs=0x555556810680) at block.c:3358
- #18 0x0000555555ab0c62 in bdrv_delete (bs=0x555556810680) at block.c:3542
- #19 0x0000555555ab0c62 in bdrv_unref (bs=0x555556810680) at block.c:4598
- #20 0x0000555555af4d72 in blk_remove_bs (blk=blk@entry=0x5555568103d0) at block/block-backend.c:785
- #21 0x0000555555af4dbb in blk_remove_all_bs () at block/block-backend.c:483
- #22 0x0000555555aae02f in bdrv_close_all () at block.c:3412
- #23 0x00005555557f9796 in main (argc=<optimized out>, argv=<optimized out>, envp=<optimized out>) at vl.c:4776
-The reproducer I used is a qcow2 image on gluster volume, where the
-virtual disk size (4 GB) is larger than the gluster volume size (64M),
-so we can easily trigger an ENOSPC. This backend is assigned to a
-virtio-blk device using an iothread, and then from the guest a
-'dd if=/dev/zero of=/dev/vda bs=1G count=1' causes the VM to stop
-because of an I/O error. qemu_gluster_co_flush_to_disk() sets
-bs->drv = NULL on error, so when virtio-blk stops the dataplane, the
-block nodes stay in the iothread AioContext. A 'quit' monitor command
-issued from this paused state crashes the process.
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1631227
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
----
- block.c | 12 ++----------
-file changed, 2 insertions(+), 10 deletions(-)
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ void bdrv_detach_aio_context(BlockDriverState *bs)
-     BdrvAioNotifier *baf, *baf_tmp;
-     BdrvChild *child;
--    if (!bs->drv) {
--        return;
--    }
--
-     assert(!bs->walking_aio_notifiers);
-     bs->walking_aio_notifiers = true;
-     QLIST_FOREACH_SAFE(baf, &bs->aio_notifiers, list, baf_tmp) {
-@@ -XXX,XX +XXX,XX @@ void bdrv_detach_aio_context(BlockDriverState *bs)
-      */
-     bs->walking_aio_notifiers = false;
--    if (bs->drv->bdrv_detach_aio_context) {
-+    if (bs->drv && bs->drv->bdrv_detach_aio_context) {
-         bs->drv->bdrv_detach_aio_context(bs);
-     }
-     QLIST_FOREACH(child, &bs->children, next) {
-@@ -XXX,XX +XXX,XX @@ void bdrv_attach_aio_context(BlockDriverState *bs,
-     BdrvAioNotifier *ban, *ban_tmp;
-     BdrvChild *child;
--    if (!bs->drv) {
--        return;
--    }
--
-     if (bs->quiesce_counter) {
-         aio_disable_external(new_context);
-     }
-@@ -XXX,XX +XXX,XX @@ void bdrv_attach_aio_context(BlockDriverState *bs,
-     QLIST_FOREACH(child, &bs->children, next) {
-         bdrv_attach_aio_context(child->bs, new_context);
-     }
--    if (bs->drv->bdrv_attach_aio_context) {
-+    if (bs->drv && bs->drv->bdrv_attach_aio_context) {
-         bs->drv->bdrv_attach_aio_context(bs, new_context);
-     }
---
-.20.1

-[Qemu-devel] [PULL 03/27] vpc: unlock Coroutine lock to make IO submit Concurrently
+Deleted patch
-From: Zhengui li <lizhengui@huawei.com>
-Concurrent IO becomes serial IO because of the qemu Coroutine lock,
-which reduce IO performance severely.
-So unlock Coroutine lock before bdrv_co_pwritev and
-bdrv_co_preadv to fix it.
-Signed-off-by: Zhengui li <lizhengui@huawei.com>
-Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/vpc.c | 4 ++++
-file changed, 4 insertions(+)
-diff --git a/block/vpc.c b/block/vpc.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vpc.c
-+++ b/block/vpc.c
-@@ -XXX,XX +XXX,XX @@ vpc_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
-             qemu_iovec_reset(&local_qiov);
-             qemu_iovec_concat(&local_qiov, qiov, bytes_done, n_bytes);
-+            qemu_co_mutex_unlock(&s->lock);
-             ret = bdrv_co_preadv(bs->file, image_offset, n_bytes,
-                                  &local_qiov, 0);
-+            qemu_co_mutex_lock(&s->lock);
-             if (ret < 0) {
-                 goto fail;
-             }
-@@ -XXX,XX +XXX,XX @@ vpc_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
-         qemu_iovec_reset(&local_qiov);
-         qemu_iovec_concat(&local_qiov, qiov, bytes_done, n_bytes);
-+        qemu_co_mutex_unlock(&s->lock);
-         ret = bdrv_co_pwritev(bs->file, image_offset, n_bytes,
-                               &local_qiov, 0);
-+        qemu_co_mutex_lock(&s->lock);
-         if (ret < 0) {
-             goto fail;
-         }
---
-.20.1

-[Qemu-devel] [PULL 04/27] vmdk: Set vmdk parent backing_format to vmdk
+Deleted patch
-From: Sam Eiderman <shmuel.eiderman@oracle.com>
-Commit b69864e5a ("vmdk: Support version=3 in VMDK descriptor files")
-fixed the probe function to correctly guess vmdk descriptors with
-version=3.
-This solves the issue where vmdk snapshot with parent vmdk descriptor
-containing "version=3" would be treated as raw instead vmdk.
-In the future case where a new vmdk version is introduced, we will again
-experience this issue, even if the user will provide "-f vmdk" it will
-only apply to the tip image and not to the underlying "misprobed" parent
-image.
-The code in vmdk.c already assumes that the backing file of vmdk must be
-vmdk (see vmdk_is_cid_valid which returns 0 if backing file is not
-vmdk).
-So let's make it official by supplying the backing_format as vmdk.
-Reviewed-by: Mark Kanda <mark.kanda@oracle.com>
-Reviewed-By: Liran Alon <liran.alon@oracle.com>
-Reviewed-by: Arbel Moshe <arbel.moshe@oracle.com>
-Signed-off-by: Shmuel Eiderman <shmuel.eiderman@oracle.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Fam Zheng <fam@euphon.net>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/vmdk.c | 2 ++
-file changed, 2 insertions(+)
-diff --git a/block/vmdk.c b/block/vmdk.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vmdk.c
-+++ b/block/vmdk.c
-@@ -XXX,XX +XXX,XX @@ static int vmdk_parent_open(BlockDriverState *bs)
-         pstrcpy(bs->auto_backing_file, end_name - p_name + 1, p_name);
-         pstrcpy(bs->backing_file, sizeof(bs->backing_file),
-                 bs->auto_backing_file);
-+        pstrcpy(bs->backing_format, sizeof(bs->backing_format),
-+                "vmdk");
-     }
- out:
---
-.20.1

-[Qemu-devel] [PULL 05/27] block/vhdx: Remove redundant IEC binary prefixes definition
+Deleted patch
-From: Stefano Garzarella <sgarzare@redhat.com>
-IEC binary prefixes are already defined in "qemu/units.h",
-so we can remove redundant definitions in "block/vhdx.h".
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/vhdx.h | 6 +-----
- block/vhdx.c | 3 ++-
-files changed, 3 insertions(+), 6 deletions(-)
-diff --git a/block/vhdx.h b/block/vhdx.h
-index XXXXXXX..XXXXXXX 100644
---- a/block/vhdx.h
-+++ b/block/vhdx.h
-@@ -XXX,XX +XXX,XX @@
- #ifndef BLOCK_VHDX_H
- #define BLOCK_VHDX_H
--
--#define KiB              (1 * 1024)
--#define MiB            (KiB * 1024)
--#define GiB            (MiB * 1024)
--#define TiB ((uint64_t) GiB * 1024)
-+#include "qemu/units.h"
- #define DEFAULT_LOG_SIZE 1048576 /* 1MiB */
- /* Structures and fields present in the VHDX file */
-diff --git a/block/vhdx.c b/block/vhdx.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vhdx.c
-+++ b/block/vhdx.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts,
-         return -EINVAL;
-     }
-     if (block_size > VHDX_BLOCK_SIZE_MAX) {
--        error_setg(errp, "Block size must not exceed %d", VHDX_BLOCK_SIZE_MAX);
-+        error_setg(errp, "Block size must not exceed %" PRId64,
-+                   VHDX_BLOCK_SIZE_MAX);
-         return -EINVAL;
-     }
---
-.20.1

-[Qemu-devel] [PULL 06/27] block/vhdx: Use IEC binary prefixes for size constants
+Deleted patch
-From: Stefano Garzarella <sgarzare@redhat.com>
-Using IEC binary prefixes in order to make the code more readable,
-with the exception of DEFAULT_LOG_SIZE because it's passed to
-stringify().
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/vhdx.h     | 10 ++++++----
- block/vhdx-log.c |  2 +-
- block/vhdx.c     |  4 ++--
-files changed, 9 insertions(+), 7 deletions(-)
-diff --git a/block/vhdx.h b/block/vhdx.h
-index XXXXXXX..XXXXXXX 100644
---- a/block/vhdx.h
-+++ b/block/vhdx.h
-@@ -XXX,XX +XXX,XX @@
- #include "qemu/units.h"
- #define DEFAULT_LOG_SIZE 1048576 /* 1MiB */
-+/* Note: can't use 1 * MiB, because it's passed to stringify() */
-+
- /* Structures and fields present in the VHDX file */
- /* The header section has the following blocks,
-@@ -XXX,XX +XXX,XX @@
-  * 0.........64KB...........128KB........192KB..........256KB................1MB
-  */
--#define VHDX_HEADER_BLOCK_SIZE      (64 * 1024)
-+#define VHDX_HEADER_BLOCK_SIZE      (64 * KiB)
- #define VHDX_FILE_ID_OFFSET         0
- #define VHDX_HEADER1_OFFSET         (VHDX_HEADER_BLOCK_SIZE * 1)
-@@ -XXX,XX +XXX,XX @@ typedef struct QEMU_PACKED MSGUID {
- #define guid_eq(a, b) \
-     (memcmp(&(a), &(b), sizeof(MSGUID)) == 0)
--#define VHDX_HEADER_SIZE (4 * 1024)   /* although the vhdx_header struct in disk
-+#define VHDX_HEADER_SIZE (4 * KiB)    /* although the vhdx_header struct in disk
-                                          is only 582 bytes, for purposes of crc
-                                          the header is the first 4KB of the 64KB
-                                          block */
-@@ -XXX,XX +XXX,XX @@ typedef struct QEMU_PACKED VHDXRegionTableEntry {
- /* ---- LOG ENTRY STRUCTURES ---- */
--#define VHDX_LOG_MIN_SIZE (1024 * 1024)
--#define VHDX_LOG_SECTOR_SIZE 4096
-+#define VHDX_LOG_MIN_SIZE (1 * MiB)
-+#define VHDX_LOG_SECTOR_SIZE (4 * KiB)
- #define VHDX_LOG_HDR_SIZE 64
- #define VHDX_LOG_SIGNATURE 0x65676f6c
- typedef struct QEMU_PACKED VHDXLogEntryHeader {
-diff --git a/block/vhdx-log.c b/block/vhdx-log.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vhdx-log.c
-+++ b/block/vhdx-log.c
-@@ -XXX,XX +XXX,XX @@ static int vhdx_log_flush(BlockDriverState *bs, BDRVVHDXState *s,
-         }
-         if (file_length < desc_entries->hdr.last_file_offset) {
-             new_file_size = desc_entries->hdr.last_file_offset;
--            if (new_file_size % (1024*1024)) {
-+            if (new_file_size % (1 * MiB)) {
-                 /* round up to nearest 1MB boundary */
-                 new_file_size = QEMU_ALIGN_UP(new_file_size, MiB);
-                 if (new_file_size > INT64_MAX) {
-diff --git a/block/vhdx.c b/block/vhdx.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vhdx.c
-+++ b/block/vhdx.c
-@@ -XXX,XX +XXX,XX @@ static int vhdx_allocate_block(BlockDriverState *bs, BDRVVHDXState *s,
-     *new_offset = current_len;
-     /* per the spec, the address for a block is in units of 1MB */
--    *new_offset = ROUND_UP(*new_offset, 1024 * 1024);
-+    *new_offset = ROUND_UP(*new_offset, 1 * MiB);
-     if (*new_offset > INT64_MAX) {
-         return -EINVAL;
-     }
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int vhdx_co_writev(BlockDriverState *bs, int64_t sector_num,
-             case PAYLOAD_BLOCK_FULLY_PRESENT:
-                 /* if the file offset address is in the header zone,
-                  * there is a problem */
--                if (sinfo.file_offset < (1024 * 1024)) {
-+                if (sinfo.file_offset < (1 * MiB)) {
-                     ret = -EFAULT;
-                     goto error_bat_restore;
-                 }
---
-.20.1

-[Qemu-devel] [PULL 07/27] cutils: Fix size_to_str() on 32-bit platforms
+Deleted patch
-From: Eric Blake <eblake@redhat.com>
-When extracting a human-readable size formatter, we changed 'uint64_t
-div' pre-patch to 'unsigned long div' post-patch. Which breaks on
--bit platforms, resulting in 'inf' instead of intended values larger
-than 999GB.
-Fixes: 22951aaa
-CC: qemu-stable@nongnu.org
-Reported-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- util/cutils.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/util/cutils.c b/util/cutils.c
-index XXXXXXX..XXXXXXX 100644
---- a/util/cutils.c
-+++ b/util/cutils.c
-@@ -XXX,XX +XXX,XX @@ const char *qemu_ether_ntoa(const MACAddr *mac)
- char *size_to_str(uint64_t val)
- {
-     static const char *suffixes[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei" };
--    unsigned long div;
-+    uint64_t div;
-     int i;
-     /*
---
-.20.1

-[Qemu-devel] [PULL 08/27] qemu-img: Saner printing of large file sizes
+Deleted patch
-From: Eric Blake <eblake@redhat.com>
-Disk sizes close to INT64_MAX cause overflow, for some pretty
-ridiculous output:
-  $ ./nbdkit -U - memory size=$((2**63 - 512)) --run 'qemu-img info $nbd'
-  image: nbd+unix://?socket=/tmp/nbdkitHSAzNz/socket
-  file format: raw
-  virtual size: -8388607T (9223372036854775296 bytes)
-  disk size: unavailable
-But there's no reason to have two separate implementations of integer
-to human-readable abbreviation, where one has overflow and stops at
-'T', while the other avoids overflow and goes all the way to 'E'. With
-this patch, the output now claims 8EiB instead of -8388607T, which
-really is the correct rounding of largest file size supported by qemu
-(we could go 511 bytes larger if we used byte-accurate sizing instead
-of rounding up to the next sector boundary, but that wouldn't change
-the human-readable result).
-Quite a few iotests need updates to expected output to match.
-Reported-by: Richard W.M. Jones <rjones@redhat.com>
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Tested-by: Richard W.M. Jones <rjones@redhat.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Tested-by: Max Reitz <mreitz@redhat.com>
----
- block/qapi.c               | 49 +++++++++-----------------------------
- tests/qemu-iotests/043.out |  6 ++---
- tests/qemu-iotests/053.out |  2 +-
- tests/qemu-iotests/059.out | 10 ++++----
- tests/qemu-iotests/060.out | 10 ++++----
- tests/qemu-iotests/061.out | 12 +++++-----
- tests/qemu-iotests/070.out |  2 +-
- tests/qemu-iotests/082.out | 26 ++++++++++----------
- tests/qemu-iotests/084.out |  8 +++----
- tests/qemu-iotests/089.out |  2 +-
- tests/qemu-iotests/095.out |  4 ++--
- tests/qemu-iotests/104.out |  6 ++---
- tests/qemu-iotests/110.out |  6 ++---
- tests/qemu-iotests/114.out |  2 +-
- tests/qemu-iotests/126.out |  4 ++--
- tests/qemu-iotests/130.out | 10 ++++----
- tests/qemu-iotests/153.out |  2 +-
- tests/qemu-iotests/191.out |  8 +++----
- tests/qemu-iotests/195.out |  4 ++--
- tests/qemu-iotests/198.out |  4 ++--
- tests/qemu-iotests/206.out | 10 ++++----
- tests/qemu-iotests/207.out | 12 +++++-----
- tests/qemu-iotests/210.out |  8 +++----
- tests/qemu-iotests/211.out | 10 ++++----
- tests/qemu-iotests/212.out | 10 ++++----
- tests/qemu-iotests/213.out | 10 ++++----
- tests/qemu-iotests/233.out |  4 ++--
- tests/qemu-iotests/237.out | 22 ++++++++---------
- tests/qemu-iotests/242.out | 10 ++++----
-files changed, 123 insertions(+), 150 deletions(-)
-diff --git a/block/qapi.c b/block/qapi.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qapi.c
-+++ b/block/qapi.c
-@@ -XXX,XX +XXX,XX @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes,
-     return head;
- }
--#define NB_SUFFIXES 4
--
--static char *get_human_readable_size(char *buf, int buf_size, int64_t size)
--{
--    static const char suffixes[NB_SUFFIXES] = {'K', 'M', 'G', 'T'};
--    int64_t base;
--    int i;
--
--    if (size <= 999) {
--        snprintf(buf, buf_size, "%" PRId64, size);
--    } else {
--        base = 1024;
--        for (i = 0; i < NB_SUFFIXES; i++) {
--            if (size < (10 * base)) {
--                snprintf(buf, buf_size, "%0.1f%c",
--                         (double)size / base,
--                         suffixes[i]);
--                break;
--            } else if (size < (1000 * base) || i == (NB_SUFFIXES - 1)) {
--                snprintf(buf, buf_size, "%" PRId64 "%c",
--                         ((size + (base >> 1)) / base),
--                         suffixes[i]);
--                break;
--            }
--            base = base * 1024;
--        }
--    }
--    return buf;
--}
--
- void bdrv_snapshot_dump(QEMUSnapshotInfo *sn)
- {
--    char buf1[128], date_buf[128], clock_buf[128];
-+    char date_buf[128], clock_buf[128];
-     struct tm tm;
-     time_t ti;
-     int64_t secs;
-+    char *sizing = NULL;
-     if (!sn) {
-         qemu_printf("%-10s%-20s%7s%20s%15s",
-@@ -XXX,XX +XXX,XX @@ void bdrv_snapshot_dump(QEMUSnapshotInfo *sn)
-                  (int)((secs / 60) % 60),
-                  (int)(secs % 60),
-                  (int)((sn->vm_clock_nsec / 1000000) % 1000));
-+        sizing = size_to_str(sn->vm_state_size);
-         qemu_printf("%-10s%-20s%7s%20s%15s",
-                     sn->id_str, sn->name,
--                    get_human_readable_size(buf1, sizeof(buf1),
--                                            sn->vm_state_size),
-+                    sizing,
-                     date_buf,
-                     clock_buf);
-     }
-+    g_free(sizing);
- }
- static void dump_qdict(int indentation, QDict *dict);
-@@ -XXX,XX +XXX,XX @@ void bdrv_image_info_specific_dump(ImageInfoSpecific *info_spec)
- void bdrv_image_info_dump(ImageInfo *info)
- {
--    char size_buf[128], dsize_buf[128];
-+    char *size_buf, *dsize_buf;
-     if (!info->has_actual_size) {
--        snprintf(dsize_buf, sizeof(dsize_buf), "unavailable");
-+        dsize_buf = g_strdup("unavailable");
-     } else {
--        get_human_readable_size(dsize_buf, sizeof(dsize_buf),
--                                info->actual_size);
-+        dsize_buf = size_to_str(info->actual_size);
-     }
--    get_human_readable_size(size_buf, sizeof(size_buf), info->virtual_size);
-+    size_buf = size_to_str(info->virtual_size);
-     qemu_printf("image: %s\n"
-                 "file format: %s\n"
-                 "virtual size: %s (%" PRId64 " bytes)\n"
-@@ -XXX,XX +XXX,XX @@ void bdrv_image_info_dump(ImageInfo *info)
-                 info->filename, info->format, size_buf,
-                 info->virtual_size,
-                 dsize_buf);
-+    g_free(size_buf);
-+    g_free(dsize_buf);
-     if (info->has_encrypted && info->encrypted) {
-         qemu_printf("encrypted: yes\n");
-diff --git a/tests/qemu-iotests/043.out b/tests/qemu-iotests/043.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/043.out
-+++ b/tests/qemu-iotests/043.out
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/
- == finite chain of length 3 (human) ==
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 65536
- backing file: TEST_DIR/t.IMGFMT.2.base
- image: TEST_DIR/t.IMGFMT.2.base
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 65536
- backing file: TEST_DIR/t.IMGFMT.1.base
- image: TEST_DIR/t.IMGFMT.1.base
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 65536
- == finite chain of length 3 (json) ==
-diff --git a/tests/qemu-iotests/053.out b/tests/qemu-iotests/053.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/053.out
-+++ b/tests/qemu-iotests/053.out
-@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 0
- No errors were found on the image.
- == Checking compressed image virtual disk size ==
--virtual size: 512 (512 bytes)
-+virtual size: 512 B (512 bytes)
- == Verifying the compressed image ==
- read 512/512 bytes at offset 0
-diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/059.out
-+++ b/tests/qemu-iotests/059.out
-@@ -XXX,XX +XXX,XX @@ can't open device TEST_DIR/t.vmdk: L1 size too big
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 2.0G (2147483648 bytes)
-+virtual size: 2 GiB (2147483648 bytes)
- === Testing monolithicFlat with zeroed_grain ===
- qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicF
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000 subformat=twoGbMaxExtentFlat
- image: TEST_DIR/t.vmdk
- file format: vmdk
--virtual size: 1.0T (1073741824000 bytes)
--disk size: 16K
-+virtual size: 0.977 TiB (1073741824000 bytes)
-+disk size: 16 KiB
- Format specific information:
-     cid: XXXXXXXX
-     parent cid: XXXXXXXX
-@@ -XXX,XX +XXX,XX @@ can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"i
- === Testing version 3 ===
- image: TEST_DIR/iotest-version3.IMGFMT
- file format: IMGFMT
--virtual size: 16G (17179869184 bytes)
-+virtual size: 16 GiB (17179869184 bytes)
- cluster_size: 65536
- read 512/512 bytes at offset 0
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 64931328
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4398046511104 subformat=monolithicFlat
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 4.0T (4398046511104 bytes)
-+virtual size: 4 TiB (4398046511104 bytes)
- wrote 512/512 bytes at offset 966367641600
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- e100000000:  0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a  ................
-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 @@ write failed: Input/output error
- incompatible_features     0x2
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- qcow2: Marking image as corrupt: Refblock at 0xffffff00000000 is not covered by the refcount structures; further corruption events will be suppressed
- qemu-img: Failed to discard unused refblocks: Input/output error
- --- Checking and retrying ---
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- No errors were found on the image.
- Image resized.
--virtual size: 32M (33554432 bytes)
-+virtual size: 32 MiB (33554432 bytes)
- === Discarding a non-covered in-bounds refblock ===
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- qcow2: Marking image as corrupt: Refblock at 0x1000000000 is not covered by the refcount structures; further corruption events will be suppressed
- qemu-img: Failed to discard unused refblocks: Input/output error
- --- Checking and retrying ---
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- No errors were found on the image.
- Image resized.
--virtual size: 32M (33554432 bytes)
-+virtual size: 32 MiB (33554432 bytes)
- === Discarding a refblock covered by an unaligned refblock ===
-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 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 data_file=TEST_DIR/t.IM
- qemu-img: Cannot downgrade an image with a data file
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 data_file=TEST_DIR/t.IM
- qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Could not open 'foo': No such file or directory
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- qemu-img: Could not open 'TEST_DIR/t.IMGFMT': 'data-file' is required for this image
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 data_file=TEST_DIR/t.IMGFMT.data data_file_raw=on
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- No errors were found on the image.
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- qemu-img: data-file-raw cannot be set on existing images
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-diff --git a/tests/qemu-iotests/070.out b/tests/qemu-iotests/070.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/070.out
-+++ b/tests/qemu-iotests/070.out
-@@ -XXX,XX +XXX,XX @@ read 18874368/18874368 bytes at offset 0
- === Verify image created by Disk2VHD can be opened ===
- image: TEST_DIR/test-disk2vhd.IMGFMT
- file format: IMGFMT
--virtual size: 256M (268435456 bytes)
-+virtual size: 256 MiB (268435456 bytes)
- cluster_size: 2097152
- *** done
-diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/082.out
-+++ b/tests/qemu-iotests/082.out
-@@ -XXX,XX +XXX,XX @@ Testing: create -f foo -f qcow2 TEST_DIR/t.qcow2 128M
- Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 65536
- Testing: create -f qcow2 -o cluster_size=4k -o lazy_refcounts=on TEST_DIR/t.qcow2 128M
- Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=4096 lazy_refcounts=on refcount_bits=16
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 4096
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Testing: create -f qcow2 -o cluster_size=4k -o lazy_refcounts=on -o cluster_size
- Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=8192 lazy_refcounts=on refcount_bits=16
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 8192
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Testing: create -f qcow2 -o cluster_size=4k,cluster_size=8k TEST_DIR/t.qcow2 128
- Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=8192 lazy_refcounts=off refcount_bits=16
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 8192
- === create: help for -o ===
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_
- Testing: convert -f foo -f qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- image: TEST_DIR/t.IMGFMT.base
- file format: raw
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- Testing: convert -O foo -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- image: TEST_DIR/t.IMGFMT.base
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 65536
- Testing: convert -O qcow2 -o cluster_size=4k -o lazy_refcounts=on TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- image: TEST_DIR/t.IMGFMT.base
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 4096
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- Testing: convert -O qcow2 -o cluster_size=4k -o lazy_refcounts=on -o cluster_size=8k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- image: TEST_DIR/t.IMGFMT.base
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 8192
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- Testing: convert -O qcow2 -o cluster_size=4k,cluster_size=8k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
- image: TEST_DIR/t.IMGFMT.base
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 8192
- === convert: help for -o ===
-@@ -XXX,XX +XXX,XX @@ qemu-img: Cannot enable copy offloading when -c is used
- Testing: amend -f foo -f qcow2 -o lazy_refcounts=on TEST_DIR/t.qcow2
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- Testing: amend -f qcow2 -o size=130M -o lazy_refcounts=off TEST_DIR/t.qcow2
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 130M (136314880 bytes)
-+virtual size: 130 MiB (136314880 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- Testing: amend -f qcow2 -o size=8M -o lazy_refcounts=on -o size=132M TEST_DIR/t.qcow2
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 132M (138412032 bytes)
-+virtual size: 132 MiB (138412032 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- Testing: amend -f qcow2 -o size=4M,size=148M TEST_DIR/t.qcow2
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 148M (155189248 bytes)
-+virtual size: 148 MiB (155189248 bytes)
- cluster_size: 65536
- === amend: help for -o ===
-diff --git a/tests/qemu-iotests/084.out b/tests/qemu-iotests/084.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/084.out
-+++ b/tests/qemu-iotests/084.out
-@@ -XXX,XX +XXX,XX @@ QA output created by 084
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 1048576
- disk image file size in bytes: 67109888
-@@ -XXX,XX +XXX,XX @@ disk image file size in bytes: 67109888
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 1048576
- disk image file size in bytes: 1024
- Test 1: Maximum size (512 TB - 128 MB):
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 512T (562949819203584 bytes)
-+virtual size: 512 TiB (562949819203584 bytes)
- cluster_size: 1048576
- Test 2: Size too large (512 TB - 128 MB + 64 kB)
-@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': unsupported VDI image (too many bl
- Test 5: Valid Image: 64MB, Blocks In Image 64, Block Size 1MB
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 1048576
- Test 6: Block Size != 1MB; too small test (1MB - 1)
-diff --git a/tests/qemu-iotests/089.out b/tests/qemu-iotests/089.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/089.out
-+++ b/tests/qemu-iotests/089.out
-@@ -XXX,XX +XXX,XX @@ read failed: Input/output error
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- === Testing option merging ===
-diff --git a/tests/qemu-iotests/095.out b/tests/qemu-iotests/095.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/095.out
-+++ b/tests/qemu-iotests/095.out
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=104857600 backing_file=TEST_DIR/
- === Base image info before commit and resize ===
- image: TEST_DIR/t.IMGFMT.base
- file format: IMGFMT
--virtual size: 5.0M (5242880 bytes)
-+virtual size: 5 MiB (5242880 bytes)
- === Running QEMU Live Commit Test ===
-@@ -XXX,XX +XXX,XX @@ virtual size: 5.0M (5242880 bytes)
- === Base image info after commit and resize ===
- image: TEST_DIR/t.IMGFMT.base
- file format: IMGFMT
--virtual size: 100M (104857600 bytes)
-+virtual size: 100 MiB (104857600 bytes)
- *** done
-diff --git a/tests/qemu-iotests/104.out b/tests/qemu-iotests/104.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/104.out
-+++ b/tests/qemu-iotests/104.out
-@@ -XXX,XX +XXX,XX @@ QA output created by 104
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1024
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 1.0K (1024 bytes)
-+virtual size: 1 KiB (1024 bytes)
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1234
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 1.5K (1536 bytes)
--***done
-+virtual size: 1.5 KiB (1536 bytes)
-+*** 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 @@ Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.base
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- 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}}
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
- === Backing name is always relative to the backed image ===
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b
- 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}}
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- backing file: t.IMGFMT.base (cannot determine actual path)
- *** done
-diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/114.out
-+++ b/tests/qemu-iotests/114.out
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- backing file: TEST_DIR/t.IMGFMT.base
- backing file format: foo
-diff --git a/tests/qemu-iotests/126.out b/tests/qemu-iotests/126.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/126.out
-+++ b/tests/qemu-iotests/126.out
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/image:base.IMGFMT', fmt=IMGFMT size=67108864
- Formatting 'TEST_DIR/image:top.IMGFMT', fmt=IMGFMT size=67108864 backing_file=./image:base.IMGFMT
- image: TEST_DIR/image:top.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- backing file: ./image:base.IMGFMT (actual path: TEST_DIR/./image:base.IMGFMT)
- Formatting 'base.IMGFMT', fmt=IMGFMT size=67108864
- Formatting 'file:image:top.IMGFMT', fmt=IMGFMT size=67108864 backing_file=base.IMGFMT
- image: ./image:top.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- backing file: base.IMGFMT (actual path: ./base.IMGFMT)
- *** done
-diff --git a/tests/qemu-iotests/130.out b/tests/qemu-iotests/130.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/130.out
-+++ b/tests/qemu-iotests/130.out
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- === HMP commit ===
-@@ -XXX,XX +XXX,XX @@ QEMU X.Y.Z monitor - type 'help' for more information
- (qemu)
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.orig backing_fmt=raw
- QEMU X.Y.Z monitor - type 'help' for more information
- (qemu) commit testdisk
- (qemu)
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- backing file: TEST_DIR/t.IMGFMT.orig
- backing file format: raw
-@@ -XXX,XX +XXX,XX @@ wrote 4096/4096 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.orig backing_fmt=raw
- wrote 4096/4096 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- backing file: TEST_DIR/t.IMGFMT.orig
- backing file format: raw
- *** done
-diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/153.out
-+++ b/tests/qemu-iotests/153.out
-@@ -XXX,XX +XXX,XX @@ _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
- No conflict:
- image: null-co://
- file format: null-co
--virtual size: 1.0G (1073741824 bytes)
-+virtual size: 1 GiB (1073741824 bytes)
- disk size: unavailable
- Conflict:
-diff --git a/tests/qemu-iotests/191.out b/tests/qemu-iotests/191.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/191.out
-+++ b/tests/qemu-iotests/191.out
-@@ -XXX,XX +XXX,XX @@ wrote 65536/65536 bytes at offset 1048576
- }
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- backing file: TEST_DIR/t.IMGFMT.base
- backing file format: IMGFMT
- image: TEST_DIR/t.IMGFMT.ovl2
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- backing file: TEST_DIR/t.IMGFMT.base
- backing file format: IMGFMT
-@@ -XXX,XX +XXX,XX @@ wrote 65536/65536 bytes at offset 1048576
- }
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- backing file: TEST_DIR/t.IMGFMT.base
- backing file format: IMGFMT
- image: TEST_DIR/t.IMGFMT.ovl2
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- backing file: TEST_DIR/t.IMGFMT.base
- backing file format: IMGFMT
-diff --git a/tests/qemu-iotests/195.out b/tests/qemu-iotests/195.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/195.out
-+++ b/tests/qemu-iotests/195.out
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.IMGFMT,backing.node-name=mid
- image: TEST_DIR/t.IMGFMT.mid
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- backing file: /dev/null
- backing file format: IMGFMT
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.IMGFMT,node-name=top
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- backing file: /dev/null
- backing file format: IMGFMT
-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
- == checking image base ==
- image: json:{"encrypt.key-secret": "sec0", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.base"}}
- file format: IMGFMT
--virtual size: 16M (16777216 bytes)
-+virtual size: 16 MiB (16777216 bytes)
- Format specific information:
-     encrypt:
-         ivgen alg: plain64
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- == checking image layer ==
- image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}}
- file format: IMGFMT
--virtual size: 16M (16777216 bytes)
-+virtual size: 16 MiB (16777216 bytes)
- backing file: TEST_DIR/t.IMGFMT.base
- Format specific information:
-     encrypt:
-diff --git a/tests/qemu-iotests/206.out b/tests/qemu-iotests/206.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/206.out
-+++ b/tests/qemu-iotests/206.out
-@@ -XXX,XX +XXX,XX @@
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 32M (33554432 bytes)
-+virtual size: 32 MiB (33554432 bytes)
- cluster_size: 2097152
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 32M (33554432 bytes)
-+virtual size: 32 MiB (33554432 bytes)
- cluster_size: 512
- backing file: TEST_IMG.base
- backing file format: IMGFMT
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 32M (33554432 bytes)
-+virtual size: 32 MiB (33554432 bytes)
- encrypted: yes
- cluster_size: 65536
- Format specific information:
-diff --git a/tests/qemu-iotests/207.out b/tests/qemu-iotests/207.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/207.out
-+++ b/tests/qemu-iotests/207.out
-@@ -XXX,XX +XXX,XX @@
- image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
- file format: IMGFMT
--virtual size: 4.0M (4194304 bytes)
-+virtual size: 4 MiB (4194304 bytes)
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 4.0M (4194304 bytes)
-+virtual size: 4 MiB (4194304 bytes)
- === Test host-key-check options ===
-@@ -XXX,XX +XXX,XX @@ virtual size: 4.0M (4194304 bytes)
- image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
- file format: IMGFMT
--virtual size: 8.0M (8388608 bytes)
-+virtual size: 8 MiB (8388608 bytes)
- {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"mode": "known_hosts"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 4194304}}}
- {"return": {}}
-@@ -XXX,XX +XXX,XX @@ virtual size: 8.0M (8388608 bytes)
- image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
- file format: IMGFMT
--virtual size: 4.0M (4194304 bytes)
-+virtual size: 4 MiB (4194304 bytes)
- {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"hash": "wrong", "mode": "hash", "type": "md5"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 2097152}}}
- {"return": {}}
-@@ -XXX,XX +XXX,XX @@ Job failed: remote host key does not match host_key_check 'wrong'
- image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
- file format: IMGFMT
--virtual size: 8.0M (8388608 bytes)
-+virtual size: 8 MiB (8388608 bytes)
- {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"hash": "wrong", "mode": "hash", "type": "sha1"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 2097152}}}
- {"return": {}}
-@@ -XXX,XX +XXX,XX @@ Job failed: remote host key does not match host_key_check 'wrong'
- image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
- file format: IMGFMT
--virtual size: 4.0M (4194304 bytes)
-+virtual size: 4 MiB (4194304 bytes)
- === Invalid path and user ===
-diff --git a/tests/qemu-iotests/210.out b/tests/qemu-iotests/210.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/210.out
-+++ b/tests/qemu-iotests/210.out
-@@ -XXX,XX +XXX,XX @@
- image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- encrypted: yes
- Format specific information:
-     ivgen alg: plain64
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- encrypted: yes
- Format specific information:
-     ivgen alg: plain64
-@@ -XXX,XX +XXX,XX @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi
- image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
- file format: IMGFMT
--virtual size: 0 (0 bytes)
-+virtual size: 0 B (0 bytes)
- encrypted: yes
- Format specific information:
-     ivgen alg: plain64
-@@ -XXX,XX +XXX,XX @@ Job failed: The requested file size is too large
- {"error": {"class": "GenericError", "desc": "Parameter 'size' expects a >0 size"}}
- image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
- file format: IMGFMT
--virtual size: 0 (0 bytes)
-+virtual size: 0 B (0 bytes)
- encrypted: yes
- Format specific information:
-     ivgen alg: plain64
-diff --git a/tests/qemu-iotests/211.out b/tests/qemu-iotests/211.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/211.out
-+++ b/tests/qemu-iotests/211.out
-@@ -XXX,XX +XXX,XX @@
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 1048576
- [{ "start": 0, "length": 134217728, "depth": 0, "zero": true, "data": false}]
-@@ -XXX,XX +XXX,XX @@ cluster_size: 1048576
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 1048576
- [{ "start": 0, "length": 67108864, "depth": 0, "zero": true, "data": false}]
-@@ -XXX,XX +XXX,XX @@ cluster_size: 1048576
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 32M (33554432 bytes)
-+virtual size: 32 MiB (33554432 bytes)
- cluster_size: 1048576
- [{ "start": 0, "length": 3072, "depth": 0, "zero": false, "data": true, "offset": 1024},
-@@ -XXX,XX +XXX,XX @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 0 (0 bytes)
-+virtual size: 0 B (0 bytes)
- cluster_size: 1048576
- === Maximum size ===
-@@ -XXX,XX +XXX,XX @@ cluster_size: 1048576
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 512T (562949819203584 bytes)
-+virtual size: 512 TiB (562949819203584 bytes)
- cluster_size: 1048576
- === Invalid sizes ===
-diff --git a/tests/qemu-iotests/212.out b/tests/qemu-iotests/212.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/212.out
-+++ b/tests/qemu-iotests/212.out
-@@ -XXX,XX +XXX,XX @@
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- === Successful image creation (explicit defaults) ===
-@@ -XXX,XX +XXX,XX @@ virtual size: 128M (134217728 bytes)
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- === Successful image creation (with non-default options) ===
-@@ -XXX,XX +XXX,XX @@ virtual size: 64M (67108864 bytes)
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 32M (33554432 bytes)
-+virtual size: 32 MiB (33554432 bytes)
- === Invalid BlockdevRef ===
-@@ -XXX,XX +XXX,XX @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 0 (0 bytes)
-+virtual size: 0 B (0 bytes)
- === Maximum size ===
-@@ -XXX,XX +XXX,XX @@ virtual size: 0 (0 bytes)
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 4096T (4503599627369984 bytes)
-+virtual size: 4 PiB (4503599627369984 bytes)
- === Invalid sizes ===
-diff --git a/tests/qemu-iotests/213.out b/tests/qemu-iotests/213.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/213.out
-+++ b/tests/qemu-iotests/213.out
-@@ -XXX,XX +XXX,XX @@
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 128M (134217728 bytes)
-+virtual size: 128 MiB (134217728 bytes)
- cluster_size: 8388608
- === Successful image creation (explicit defaults) ===
-@@ -XXX,XX +XXX,XX @@ cluster_size: 8388608
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 8388608
- === Successful image creation (with non-default options) ===
-@@ -XXX,XX +XXX,XX @@ cluster_size: 8388608
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 32M (33554432 bytes)
-+virtual size: 32 MiB (33554432 bytes)
- cluster_size: 268435456
- === Invalid BlockdevRef ===
-@@ -XXX,XX +XXX,XX @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 0 (0 bytes)
-+virtual size: 0 B (0 bytes)
- cluster_size: 8388608
- === Maximum size ===
-@@ -XXX,XX +XXX,XX @@ cluster_size: 8388608
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 64T (70368744177664 bytes)
-+virtual size: 64 TiB (70368744177664 bytes)
- cluster_size: 67108864
- === Invalid sizes ===
-diff --git a/tests/qemu-iotests/233.out b/tests/qemu-iotests/233.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/233.out
-+++ b/tests/qemu-iotests/233.out
-@@ -XXX,XX +XXX,XX @@ server reported: Option 0x8 not permitted before TLS
- == check TLS works ==
- image: nbd://127.0.0.1:PORT
- file format: nbd
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- disk size: unavailable
- image: nbd://127.0.0.1:PORT
- file format: nbd
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- disk size: unavailable
- exports available: 1
-  export: ''
-diff --git a/tests/qemu-iotests/237.out b/tests/qemu-iotests/237.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/237.out
-+++ b/tests/qemu-iotests/237.out
-@@ -XXX,XX +XXX,XX @@
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 5.0G (5368709120 bytes)
-+virtual size: 5 GiB (5368709120 bytes)
- cluster_size: 65536
- Format specific information:
-     cid: XXXXXXXXXX
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 64M (67108864 bytes)
-+virtual size: 64 MiB (67108864 bytes)
- cluster_size: 65536
- Format specific information:
-     cid: XXXXXXXXXX
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 32M (33554432 bytes)
-+virtual size: 32 MiB (33554432 bytes)
- cluster_size: 65536
- Format specific information:
-     cid: XXXXXXXXXX
-@@ -XXX,XX +XXX,XX @@ Job failed: List of extents contains unused extents
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 512 (512 bytes)
-+virtual size: 512 B (512 bytes)
- Format specific information:
-     cid: XXXXXXXXXX
-     parent cid: XXXXXXXXXX
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 512 (512 bytes)
-+virtual size: 512 B (512 bytes)
- cluster_size: 65536
- Format specific information:
-     cid: XXXXXXXXXX
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 1.0G (1073741824 bytes)
-+virtual size: 1 GiB (1073741824 bytes)
- Format specific information:
-     cid: XXXXXXXXXX
-     parent cid: XXXXXXXXXX
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 1.0G (1073741824 bytes)
-+virtual size: 1 GiB (1073741824 bytes)
- cluster_size: 65536
- Format specific information:
-     cid: XXXXXXXXXX
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 2.0G (2147483648 bytes)
-+virtual size: 2 GiB (2147483648 bytes)
- Format specific information:
-     cid: XXXXXXXXXX
-     parent cid: XXXXXXXXXX
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 2.0G (2147483648 bytes)
-+virtual size: 2 GiB (2147483648 bytes)
- cluster_size: 65536
- Format specific information:
-     cid: XXXXXXXXXX
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 5.0G (5368709120 bytes)
-+virtual size: 5 GiB (5368709120 bytes)
- Format specific information:
-     cid: XXXXXXXXXX
-     parent cid: XXXXXXXXXX
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 5.0G (5368709120 bytes)
-+virtual size: 5 GiB (5368709120 bytes)
- cluster_size: 65536
- Format specific information:
-     cid: XXXXXXXXXX
-diff --git a/tests/qemu-iotests/242.out b/tests/qemu-iotests/242.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/242.out
-+++ b/tests/qemu-iotests/242.out
-@@ -XXX,XX +XXX,XX @@ qemu-img info dump:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 1.0M (1048576 bytes)
-+virtual size: 1 MiB (1048576 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ qemu-img info dump:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 1.0M (1048576 bytes)
-+virtual size: 1 MiB (1048576 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ qemu-img info dump:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 1.0M (1048576 bytes)
-+virtual size: 1 MiB (1048576 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ qemu-img info dump:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 1.0M (1048576 bytes)
-+virtual size: 1 MiB (1048576 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
-@@ -XXX,XX +XXX,XX @@ Unset the unknown bitmap flag '0x4' in the bitmap directory entry:
- image: TEST_IMG
- file format: IMGFMT
--virtual size: 1.0M (1048576 bytes)
-+virtual size: 1 MiB (1048576 bytes)
- cluster_size: 65536
- Format specific information:
-     compat: 1.1
---
-.20.1

-[Qemu-devel] [PULL 09/27] qcow2: Avoid COW during metadata preallocation
+Deleted patch
-Limiting the allocation to INT_MAX bytes isn't particularly clever
-because it means that the final cluster will be a partial cluster which
-will be completed through a COW operation. This results in unnecessary
-data read and write requests which lead to an unwanted non-sparse
-filesystem block for metadata preallocation.
-Align the maximum allocation size down to the cluster size to avoid this
-situation.
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- block/qcow2.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
-     bytes = new_length - offset;
-     while (bytes) {
--        cur_bytes = MIN(bytes, INT_MAX);
-+        cur_bytes = MIN(bytes, QEMU_ALIGN_DOWN(INT_MAX, s->cluster_size));
-         ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,
-                                          &host_offset, &meta);
-         if (ret < 0) {
---
-.20.1

-[Qemu-devel] [PULL 10/27] qcow2: Add errp to preallocate_co()
+Deleted patch
-We'll add a bdrv_co_truncate() call in the next patch which can return
-an Error that we don't want to discard. So add an errp parameter to
-preallocate_co().
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- block/qcow2.c | 11 ++++++-----
-file changed, 6 insertions(+), 5 deletions(-)
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static int qcow2_set_up_encryption(BlockDriverState *bs,
-  * Returns: 0 on success, -errno on failure.
-  */
- static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
--                                       uint64_t new_length)
-+                                       uint64_t new_length, Error **errp)
- {
-     BDRVQcow2State *s = bs->opaque;
-     uint64_t bytes;
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
-         ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,
-                                          &host_offset, &meta);
-         if (ret < 0) {
-+            error_setg_errno(errp, -ret, "Allocating clusters failed");
-             return ret;
-         }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
-             ret = qcow2_alloc_cluster_link_l2(bs, meta);
-             if (ret < 0) {
-+                error_setg_errno(errp, -ret, "Mapping clusters failed");
-                 qcow2_free_any_clusters(bs, meta->alloc_offset,
-                                         meta->nb_clusters, QCOW2_DISCARD_NEVER);
-                 return ret;
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
-         ret = bdrv_pwrite(s->data_file, (host_offset + cur_bytes) - 1,
-                           &data, 1);
-         if (ret < 0) {
-+            error_setg_errno(errp, -ret, "Writing to EOF failed");
-             return ret;
-         }
-     }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
-         break;
-     case PREALLOC_MODE_METADATA:
--        ret = preallocate_co(bs, old_length, offset);
-+        ret = preallocate_co(bs, old_length, offset, errp);
-         if (ret < 0) {
--            error_setg_errno(errp, -ret, "Preallocation failed");
-             goto fail;
-         }
-         break;
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
-         /* With a data file, preallocation means just allocating the metadata
-          * and forwarding the truncate request to the data file */
-         if (has_data_file(bs)) {
--            ret = preallocate_co(bs, old_length, offset);
-+            ret = preallocate_co(bs, old_length, offset, errp);
-             if (ret < 0) {
--                error_setg_errno(errp, -ret, "Preallocation failed");
-                 goto fail;
-             }
-             break;
---
-.20.1

-[Qemu-devel] [PULL 11/27] qcow2: Fix full preallocation with external data file
+Deleted patch
-preallocate_co() already gave the data file the full size without
-forwarding the requested preallocation mode to the protocol. When
-bdrv_co_truncate() was called later with the preallocation mode, the
-file didn't actually grow any more, so the data file stayed unallocated
-even if full preallocation was requested.
-Pass the right preallocation mode to preallocate_co() and remove the
-second bdrv_co_truncate() to fix this. As a side effect, the ugly
-one-byte write in preallocate_co() is replaced with a truncate call,
-now leaving the last block unallocated on the protocol level as it
-should be.
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- block/qcow2.c | 41 +++++++++++++++++++++++------------------
-file changed, 23 insertions(+), 18 deletions(-)
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static int qcow2_set_up_encryption(BlockDriverState *bs,
-  * Returns: 0 on success, -errno on failure.
-  */
- static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
--                                       uint64_t new_length, Error **errp)
-+                                       uint64_t new_length, PreallocMode mode,
-+                                       Error **errp)
- {
-     BDRVQcow2State *s = bs->opaque;
-     uint64_t bytes;
-     uint64_t host_offset = 0;
-+    int64_t file_length;
-     unsigned int cur_bytes;
-     int ret;
-     QCowL2Meta *meta;
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
-      * all of the allocated clusters (otherwise we get failing reads after
-      * EOF). Extend the image to the last allocated sector.
-      */
--    if (host_offset != 0) {
--        uint8_t data = 0;
--        ret = bdrv_pwrite(s->data_file, (host_offset + cur_bytes) - 1,
--                          &data, 1);
-+    file_length = bdrv_getlength(s->data_file->bs);
-+    if (file_length < 0) {
-+        error_setg_errno(errp, -file_length, "Could not get file size");
-+        return file_length;
-+    }
-+
-+    if (host_offset + cur_bytes > file_length) {
-+        if (mode == PREALLOC_MODE_METADATA) {
-+            mode = PREALLOC_MODE_OFF;
-+        }
-+        ret = bdrv_co_truncate(s->data_file, host_offset + cur_bytes, mode,
-+                               errp);
-         if (ret < 0) {
--            error_setg_errno(errp, -ret, "Writing to EOF failed");
-             return ret;
-         }
-     }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
-     switch (prealloc) {
-     case PREALLOC_MODE_OFF:
-+        if (has_data_file(bs)) {
-+            ret = bdrv_co_truncate(s->data_file, offset, prealloc, errp);
-+            if (ret < 0) {
-+                goto fail;
-+            }
-+        }
-         break;
-     case PREALLOC_MODE_METADATA:
--        ret = preallocate_co(bs, old_length, offset, errp);
-+        ret = preallocate_co(bs, old_length, offset, prealloc, errp);
-         if (ret < 0) {
-             goto fail;
-         }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
-         /* With a data file, preallocation means just allocating the metadata
-          * and forwarding the truncate request to the data file */
-         if (has_data_file(bs)) {
--            ret = preallocate_co(bs, old_length, offset, errp);
-+            ret = preallocate_co(bs, old_length, offset, prealloc, errp);
-             if (ret < 0) {
-                 goto fail;
-             }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
-     bs->total_sectors = offset / BDRV_SECTOR_SIZE;
--    if (has_data_file(bs)) {
--        if (prealloc == PREALLOC_MODE_METADATA) {
--            prealloc = PREALLOC_MODE_OFF;
--        }
--        ret = bdrv_co_truncate(s->data_file, offset, prealloc, errp);
--        if (ret < 0) {
--            goto fail;
--        }
--    }
--
-     /* write updated header.size */
-     offset = cpu_to_be64(offset);
-     ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, size),
---
-.20.1

-[Qemu-devel] [PULL 13/27] qemu-img: Make create hint at protocol options
+[PULL 01/15] block/vhdx: add check for truncated image files
-From: Max Reitz <mreitz@redhat.com>
+From: Peter Lieven <pl@kamp.de>
-qemu-img create allows giving just a format and "-o help" to get a list
+qemu is currently not able to detect truncated vhdx image files.
-of the options supported by that format.  Users may not realize that the
+Add a basic check if all allocated blocks are reachable at open and
-protocol level may offer even more options, which they only get to see
+report all errors during bdrv_co_check.
 by specifying a filename.
-This patch adds a note to hint at that fact.
+Signed-off-by: Peter Lieven <pl@kamp.de>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- qemu-img.c                 | 13 ++++++++++++-
+ block/vhdx.c | 120 +++++++++++++++++++++++++++++++++++++++++++--------
- tests/qemu-iotests/082.out | 20 ++++++++++++++++----
+file changed, 103 insertions(+), 17 deletions(-)
 files changed, 28 insertions(+), 5 deletions(-)
-diff --git a/qemu-img.c b/qemu-img.c
+diff --git a/block/vhdx.c b/block/vhdx.c
 index XXXXXXX..XXXXXXX 100644
---- a/qemu-img.c
+--- a/block/vhdx.c
-+++ b/qemu-img.c
++++ b/block/vhdx.c
-@@ -XXX,XX +XXX,XX @@ static int print_block_option_help(const char *filename, const char *fmt)
+@@ -XXX,XX +XXX,XX @@
-         create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
+ #include "qemu/option.h"
  #include "qemu/crc32c.h"
  #include "qemu/bswap.h"
 +#include "qemu/error-report.h"
  #include "vhdx.h"
  #include "migration/blocker.h"
  #include "qemu/uuid.h"
@@ -XXX,XX +XXX,XX @@ static int vhdx_region_check(BDRVVHDXState *s, uint64_t start, uint64_t length)
      end = start + length;
      QLIST_FOREACH(r, &s->regions, entries) {
          if (!((start >= r->end) || (end <= r->start))) {
 +            error_report("VHDX region %" PRIu64 "-%" PRIu64 " overlaps with "
 +                         "region %" PRIu64 "-%." PRIu64, start, end, r->start,
 +                         r->end);
              ret = -EINVAL;
              goto exit;
          }
@@ -XXX,XX +XXX,XX @@ static void vhdx_calc_bat_entries(BDRVVHDXState *s)
  }
 +static int vhdx_check_bat_entries(BlockDriverState *bs, int *errcnt)
 +{
 +    BDRVVHDXState *s = bs->opaque;
 +    int64_t image_file_size = bdrv_getlength(bs->file->bs);
 +    uint64_t payblocks = s->chunk_ratio;
 +    uint64_t i;
 +    int ret = 0;
 +
 +    if (image_file_size < 0) {
 +        error_report("Could not determinate VHDX image file size.");
 +        return image_file_size;
 +    }
 +
 +    for (i = 0; i < s->bat_entries; i++) {
 +        if ((s->bat[i] & VHDX_BAT_STATE_BIT_MASK) ==
 +            PAYLOAD_BLOCK_FULLY_PRESENT) {
 +            uint64_t offset = s->bat[i] & VHDX_BAT_FILE_OFF_MASK;
 +            /*
 +             * Allow that the last block exists only partially. The VHDX spec
 +             * states that the image file can only grow in blocksize increments,
 +             * but QEMU created images with partial last blocks in the past.
 +             */
 +            uint32_t block_length = MIN(s->block_size,
 +                bs->total_sectors * BDRV_SECTOR_SIZE - i * s->block_size);
 +            /*
 +             * Check for BAT entry overflow.
 +             */
 +            if (offset > INT64_MAX - s->block_size) {
 +                error_report("VHDX BAT entry %" PRIu64 " offset overflow.", i);
 +                ret = -EINVAL;
 +                if (!errcnt) {
 +                    break;
 +                }
 +                (*errcnt)++;
 +            }
 +            /*
 +             * Check if fully allocated BAT entries do not reside after
 +             * end of the image file.
 +             */
 +            if (offset >= image_file_size) {
 +                error_report("VHDX BAT entry %" PRIu64 " start offset %" PRIu64
 +                             " points after end of file (%" PRIi64 "). Image"
 +                             " has probably been truncated.",
 +                             i, offset, image_file_size);
 +                ret = -EINVAL;
 +                if (!errcnt) {
 +                    break;
 +                }
 +                (*errcnt)++;
 +            } else if (offset + block_length > image_file_size) {
 +                error_report("VHDX BAT entry %" PRIu64 " end offset %" PRIu64
 +                             " points after end of file (%" PRIi64 "). Image"
 +                             " has probably been truncated.",
 +                             i, offset + block_length - 1, image_file_size);
 +                ret = -EINVAL;
 +                if (!errcnt) {
 +                    break;
 +                }
 +                (*errcnt)++;
 +            }
 +
 +            /*
 +             * verify populated BAT field file offsets against
 +             * region table and log entries
 +             */
 +            if (payblocks--) {
 +                /* payload bat entries */
 +                int ret2;
 +                ret2 = vhdx_region_check(s, offset, s->block_size);
 +                if (ret2 < 0) {
 +                    ret = -EINVAL;
 +                    if (!errcnt) {
 +                        break;
 +                    }
 +                    (*errcnt)++;
 +                }
 +            } else {
 +                payblocks = s->chunk_ratio;
 +                /*
 +                 * Once differencing files are supported, verify sector bitmap
 +                 * blocks here
 +                 */
 +            }
 +        }
 +    }
 +
 +    return ret;
 +}
 +
  static void vhdx_close(BlockDriverState *bs)
  {
      BDRVVHDXState *s = bs->opaque;
@@ -XXX,XX +XXX,XX @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags,
          goto fail;
      }
--    printf("Supported options:\n");
+-    uint64_t payblocks = s->chunk_ratio;
-+    if (filename) {
+-    /* endian convert, and verify populated BAT field file offsets against
-+        printf("Supported options:\n");
+-     * region table and log entries */
-+    } else {
++    /* endian convert populated BAT field entires */
-+        printf("Supported %s options:\n", fmt);
+     for (i = 0; i < s->bat_entries; i++) {
          s->bat[i] = le64_to_cpu(s->bat[i]);
 -        if (payblocks--) {
 -            /* payload bat entries */
 -            if ((s->bat[i] & VHDX_BAT_STATE_BIT_MASK) ==
 -                    PAYLOAD_BLOCK_FULLY_PRESENT) {
 -                ret = vhdx_region_check(s, s->bat[i] & VHDX_BAT_FILE_OFF_MASK,
 -                                        s->block_size);
 -                if (ret < 0) {
 -                    goto fail;
 -                }
 -            }
 -        } else {
 -            payblocks = s->chunk_ratio;
 -            /* Once differencing files are supported, verify sector bitmap
 -             * blocks here */
 +    }
-     qemu_opts_print_help(create_opts, false);
-     qemu_opts_free(create_opts);
 +
-+    if (!filename) {
++    if (!(flags & BDRV_O_CHECK)) {
-+        printf("\n"
++        ret = vhdx_check_bat_entries(bs, NULL);
-+               "The protocol level may support further options.\n"
++        if (ret < 0) {
-+               "Specify the target filename to include those options.\n");
++            goto fail;
-+    }
+         }
      }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vhdx_co_check(BlockDriverState *bs,
      if (s->log_replayed_on_open) {
          result->corruptions_fixed++;
      }
 +
 +    vhdx_check_bat_entries(bs, &result->corruptions);
 +
      return 0;
  }
-diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/082.out
-+++ b/tests/qemu-iotests/082.out
-@@ -XXX,XX +XXX,XX @@ Testing: create -f qcow2 -o backing_file=TEST_DIR/t.qcow2 -o ,, -o help TEST_DIR
- qemu-img: Invalid option list: ,,
- Testing: create -f qcow2 -o help
--Supported options:
-+Supported qcow2 options:
-   backing_file=<str>     - File name of a base image
-   backing_fmt=<str>      - Image format of the base image
-   cluster_size=<size>    - qcow2 cluster size
-@@ -XXX,XX +XXX,XX @@ Supported options:
-   refcount_bits=<num>    - Width of a reference count entry in bits
-   size=<size>            - Virtual disk size
-+The protocol level may support further options.
-+Specify the target filename to include those options.
-+
- Testing: create -o help
--Supported options:
-+Supported raw options:
-   size=<size>            - Virtual disk size
-+The protocol level may support further options.
-+Specify the target filename to include those options.
-+
- Testing: create -f bochs -o help
- qemu-img: Format driver 'bochs' does not support image creation
-@@ -XXX,XX +XXX,XX @@ Testing: convert -O qcow2 -o backing_file=TEST_DIR/t.qcow2 -o ,, -o help TEST_DI
- qemu-img: Invalid option list: ,,
- Testing: convert -O qcow2 -o help
--Supported options:
-+Supported qcow2 options:
-   backing_file=<str>     - File name of a base image
-   backing_fmt=<str>      - Image format of the base image
-   cluster_size=<size>    - qcow2 cluster size
-@@ -XXX,XX +XXX,XX @@ Supported options:
-   refcount_bits=<num>    - Width of a reference count entry in bits
-   size=<size>            - Virtual disk size
-+The protocol level may support further options.
-+Specify the target filename to include those options.
-+
- Testing: convert -o help
--Supported options:
-+Supported raw options:
-   size=<size>            - Virtual disk size
-+The protocol level may support further options.
-+Specify the target filename to include those options.
-+
- Testing: convert -O bochs -o help
- qemu-img: Format driver 'bochs' does not support image creation
 --
 .20.1

-[Qemu-devel] [PULL 27/27] block/qed: add missed coroutine_fn markers
+[PULL 02/15] block: implement bdrv_snapshot_goto for blkreplay
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+From: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
-qed_read_table and qed_write_table use coroutine-only interfaces but
+This patch enables making snapshots with blkreplay used in
-are not marked coroutine_fn. Happily, they are called only from
+block devices.
-coroutine context, so we only need to add missed markers.
+This function is required to make bdrv_snapshot_goto without
 calling .bdrv_open which is not implemented.
-Reported-by: Kevin Wolf <kwolf@redhat.com>
+Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Acked-by: Kevin Wolf <kwolf@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- block/qed.h       | 28 ++++++++++++++++------------
+ block/blkreplay.c | 8 ++++++++
- block/qed-check.c |  4 ++--
+file changed, 8 insertions(+)
  block/qed-table.c | 33 ++++++++++++++++++++-------------
  block/qed.c       |  5 +++--
 files changed, 41 insertions(+), 29 deletions(-)
-diff --git a/block/qed.h b/block/qed.h
+diff --git a/block/blkreplay.c b/block/blkreplay.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/qed.h
+--- a/block/blkreplay.c
-+++ b/block/qed.h
++++ b/block/blkreplay.c
-@@ -XXX,XX +XXX,XX @@ void qed_commit_l2_cache_entry(L2TableCache *l2_cache, CachedL2Table *l2_table);
+@@ -XXX,XX +XXX,XX @@ static int coroutine_fn blkreplay_co_flush(BlockDriverState *bs)
  /**
   * Table I/O functions
   */
 -int qed_read_l1_table_sync(BDRVQEDState *s);
 -int qed_write_l1_table(BDRVQEDState *s, unsigned int index, unsigned int n);
 -int qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
 -                            unsigned int n);
 -int qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
 -                           uint64_t offset);
 -int qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset);
 -int qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
 -                       unsigned int index, unsigned int n, bool flush);
 -int qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
 -                            unsigned int index, unsigned int n, bool flush);
 +int coroutine_fn qed_read_l1_table_sync(BDRVQEDState *s);
 +int coroutine_fn qed_write_l1_table(BDRVQEDState *s, unsigned int index,
 +                                    unsigned int n);
 +int coroutine_fn qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
 +                                         unsigned int n);
 +int coroutine_fn qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
 +                                        uint64_t offset);
 +int coroutine_fn qed_read_l2_table(BDRVQEDState *s, QEDRequest *request,
 +                                   uint64_t offset);
 +int coroutine_fn qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
 +                                    unsigned int index, unsigned int n,
 +                                    bool flush);
 +int coroutine_fn qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
 +                                         unsigned int index, unsigned int n,
 +                                         bool flush);
  /**
   * Cluster functions
@@ -XXX,XX +XXX,XX @@ int coroutine_fn qed_find_cluster(BDRVQEDState *s, QEDRequest *request,
  /**
   * Consistency check
   */
 -int qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix);
 +int coroutine_fn qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix);
  QEDTable *qed_alloc_table(BDRVQEDState *s);
 diff --git a/block/qed-check.c b/block/qed-check.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/qed-check.c
 +++ b/block/qed-check.c
@@ -XXX,XX +XXX,XX @@ static unsigned int qed_check_l2_table(QEDCheck *check, QEDTable *table)
  /**
   * Descend tables and check each cluster is referenced once only
   */
 -static int qed_check_l1_table(QEDCheck *check, QEDTable *table)
 +static int coroutine_fn qed_check_l1_table(QEDCheck *check, QEDTable *table)
  {
      BDRVQEDState *s = check->s;
      unsigned int i, num_invalid_l1 = 0;
@@ -XXX,XX +XXX,XX @@ static void qed_check_mark_clean(BDRVQEDState *s, BdrvCheckResult *result)
  }
  /* Called with table_lock held.  */
 -int qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix)
 +int coroutine_fn qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix)
  {
      QEDCheck check = {
          .s = s,
 diff --git a/block/qed-table.c b/block/qed-table.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/qed-table.c
 +++ b/block/qed-table.c
@@ -XXX,XX +XXX,XX @@
  #include "qemu/bswap.h"
  /* Called with table_lock held.  */
 -static int qed_read_table(BDRVQEDState *s, uint64_t offset, QEDTable *table)
 +static int coroutine_fn qed_read_table(BDRVQEDState *s, uint64_t offset,
 +                                       QEDTable *table)
  {
      unsigned int bytes = s->header.cluster_size * s->header.table_size;
@@ -XXX,XX +XXX,XX @@ out:
   *
   * Called with table_lock held.
   */
 -static int qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
 -                           unsigned int index, unsigned int n, bool flush)
 +static int coroutine_fn qed_write_table(BDRVQEDState *s, uint64_t offset,
 +                                        QEDTable *table, unsigned int index,
 +                                        unsigned int n, bool flush)
  {
      unsigned int sector_mask = BDRV_SECTOR_SIZE / sizeof(uint64_t) - 1;
      unsigned int start, end, i;
@@ -XXX,XX +XXX,XX @@ out:
      return ret;
  }
--int qed_read_l1_table_sync(BDRVQEDState *s)
++static int blkreplay_snapshot_goto(BlockDriverState *bs,
-+int coroutine_fn qed_read_l1_table_sync(BDRVQEDState *s)
++                                   const char *snapshot_id)
- {
++{
-     return qed_read_table(s, s->header.l1_table_offset, s->l1_table);
++    return bdrv_snapshot_goto(bs->file->bs, snapshot_id, NULL);
- }
++}
++
- /* Called with table_lock held.  */
+ static BlockDriver bdrv_blkreplay = {
--int qed_write_l1_table(BDRVQEDState *s, unsigned int index, unsigned int n)
+     .format_name            = "blkreplay",
-+int coroutine_fn qed_write_l1_table(BDRVQEDState *s, unsigned int index,
+     .instance_size          = 0,
-+                                    unsigned int n)
+@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_blkreplay = {
- {
+     .bdrv_co_pwrite_zeroes  = blkreplay_co_pwrite_zeroes,
-     BLKDBG_EVENT(s->bs->file, BLKDBG_L1_UPDATE);
+     .bdrv_co_pdiscard       = blkreplay_co_pdiscard,
-     return qed_write_table(s, s->header.l1_table_offset,
+     .bdrv_co_flush          = blkreplay_co_flush,
-                            s->l1_table, index, n, false);
++
- }
++    .bdrv_snapshot_goto     = blkreplay_snapshot_goto,
+ };
--int qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
--                            unsigned int n)
+ static void bdrv_blkreplay_init(void)
 +int coroutine_fn qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
 +                                         unsigned int n)
  {
      return qed_write_l1_table(s, index, n);
  }
  /* Called with table_lock held.  */
 -int qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset)
 +int coroutine_fn qed_read_l2_table(BDRVQEDState *s, QEDRequest *request,
 +                                   uint64_t offset)
  {
      int ret;
@@ -XXX,XX +XXX,XX @@ int qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset)
      return ret;
  }
 -int qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request, uint64_t offset)
 +int coroutine_fn qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
 +                                        uint64_t offset)
  {
      return qed_read_l2_table(s, request, offset);
  }
  /* Called with table_lock held.  */
 -int qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
 -                       unsigned int index, unsigned int n, bool flush)
 +int coroutine_fn qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
 +                                    unsigned int index, unsigned int n,
 +                                    bool flush)
  {
      BLKDBG_EVENT(s->bs->file, BLKDBG_L2_UPDATE);
      return qed_write_table(s, request->l2_table->offset,
                             request->l2_table->table, index, n, flush);
  }
 -int qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
 -                            unsigned int index, unsigned int n, bool flush)
 +int coroutine_fn qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
 +                                         unsigned int index, unsigned int n,
 +                                         bool flush)
  {
      return qed_write_l2_table(s, request, index, n, flush);
  }
 diff --git a/block/qed.c b/block/qed.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/qed.c
 +++ b/block/qed.c
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn bdrv_qed_co_invalidate_cache(BlockDriverState *bs,
      }
  }
 -static int bdrv_qed_co_check(BlockDriverState *bs, BdrvCheckResult *result,
 -                             BdrvCheckMode fix)
 +static int coroutine_fn bdrv_qed_co_check(BlockDriverState *bs,
 +                                          BdrvCheckResult *result,
 +                                          BdrvCheckMode fix)
  {
      BDRVQEDState *s = bs->opaque;
      int ret;
 --
 .20.1

-[Qemu-devel] [PULL 25/27] commit: Make base read-only if there is an early failure
+[PULL 03/15] replay: disable default snapshot for record/replay
-From: Alberto Garcia <berto@igalia.com>
+From: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
-You can reproduce this by passing an invalid filter-node-name (like
+This patch disables setting '-snapshot' option on by default
-"1234") to block-commit. In this case the base image is put in
+in record/replay mode. This is needed for creating vmstates in record
-read-write mode but is never reset back to read-only.
+and replay modes.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
+Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
+Acked-by: Kevin Wolf <kwolf@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- block/commit.c | 3 +++
+ vl.c | 10 ++++++++--
-file changed, 3 insertions(+)
+file changed, 8 insertions(+), 2 deletions(-)
-diff --git a/block/commit.c b/block/commit.c
+diff --git a/vl.c b/vl.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/commit.c
+--- a/vl.c
-+++ b/block/commit.c
++++ b/vl.c
-@@ -XXX,XX +XXX,XX @@ fail:
+@@ -XXX,XX +XXX,XX @@ static void configure_blockdev(BlockdevOptionsQueue *bdo_queue,
-     if (s->top) {
+         qapi_free_BlockdevOptions(bdo->bdo);
-         blk_unref(s->top);
+         g_free(bdo);
      }
-+    if (s->base_read_only) {
+-    if (snapshot || replay_mode != REPLAY_MODE_NONE) {
-+        bdrv_reopen_set_read_only(base, true, NULL);
++    if (snapshot) {
-+    }
+         qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot,
-     job_early_fail(&s->common.job);
+                           NULL, NULL);
-     /* commit_top_bs has to be replaced after deleting the block job,
+     }
-      * otherwise this would fail because of lack of permissions. */
+@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp)
                  drive_add(IF_PFLASH, -1, optarg, PFLASH_OPTS);
                  break;
              case QEMU_OPTION_snapshot:
 -                snapshot = 1;
 +                {
 +                    Error *blocker = NULL;
 +                    snapshot = 1;
 +                    error_setg(&blocker, QERR_REPLAY_NOT_SUPPORTED,
 +                               "-snapshot");
 +                    replay_add_blocker(blocker);
 +                }
                  break;
              case QEMU_OPTION_numa:
                  opts = qemu_opts_parse_noisily(qemu_find_opts("numa"),
 --
 .20.1

-[Qemu-devel] [PULL 24/27] qemu-img: use buffer-based io
+[PULL 04/15] replay: update docs for record/replay with block devices
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+This patch updates the description of the command lines for using
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+record/replay with attached block devices.
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
 Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- qemu-img.c | 13 ++++---------
+ docs/replay.txt | 12 +++++++++---
-file changed, 4 insertions(+), 9 deletions(-)
+file changed, 9 insertions(+), 3 deletions(-)
-diff --git a/qemu-img.c b/qemu-img.c
+diff --git a/docs/replay.txt b/docs/replay.txt
 index XXXXXXX..XXXXXXX 100644
---- a/qemu-img.c
+--- a/docs/replay.txt
-+++ b/qemu-img.c
++++ b/docs/replay.txt
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_read(ImgConvertState *s, int64_t sector_num,
+@@ -XXX,XX +XXX,XX @@ Usage of the record/replay:
-                                         int nb_sectors, uint8_t *buf)
+  * First, record the execution with the following command line:
- {
+     qemu-system-i386 \
-     int n, ret;
+      -icount shift=7,rr=record,rrfile=replay.bin \
--    QEMUIOVector qiov;
+-     -drive file=disk.qcow2,if=none,id=img-direct \
++     -drive file=disk.qcow2,if=none,snapshot,id=img-direct \
-     assert(nb_sectors <= s->buf_sectors);
+      -drive driver=blkreplay,if=none,image=img-direct,id=img-blkreplay \
-     while (nb_sectors > 0) {
+      -device ide-hd,drive=img-blkreplay \
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_read(ImgConvertState *s, int64_t sector_num,
+      -netdev user,id=net1 -device rtl8139,netdev=net1 \
-         bs_sectors = s->src_sectors[src_cur];
+@@ -XXX,XX +XXX,XX @@ Usage of the record/replay:
+  * After recording, you can replay it by using another command line:
-         n = MIN(nb_sectors, bs_sectors - (sector_num - src_cur_offset));
+     qemu-system-i386 \
--        qemu_iovec_init_buf(&qiov, buf, n << BDRV_SECTOR_BITS);
+      -icount shift=7,rr=replay,rrfile=replay.bin \
+-     -drive file=disk.qcow2,if=none,id=img-direct \
--        ret = blk_co_preadv(
++     -drive file=disk.qcow2,if=none,snapshot,id=img-direct \
-+        ret = blk_co_pread(
+      -drive driver=blkreplay,if=none,image=img-direct,id=img-blkreplay \
-                 blk, (sector_num - src_cur_offset) << BDRV_SECTOR_BITS,
+      -device ide-hd,drive=img-blkreplay \
--                n << BDRV_SECTOR_BITS, &qiov, 0);
+      -netdev user,id=net1 -device rtl8139,netdev=net1 \
-+                n << BDRV_SECTOR_BITS, buf, 0);
+@@ -XXX,XX +XXX,XX @@ Block devices record/replay module intercepts calls of
-         if (ret < 0) {
+ bdrv coroutine functions at the top of block drivers stack.
-             return ret;
+ To record and replay block operations the drive must be configured
-         }
+ as following:
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_write(ImgConvertState *s, int64_t sector_num,
+- -drive file=disk.qcow2,if=none,id=img-direct
-                                          enum ImgConvertBlockStatus status)
++ -drive file=disk.qcow2,if=none,snapshot,id=img-direct
- {
+  -drive driver=blkreplay,if=none,image=img-direct,id=img-blkreplay
-     int ret;
+  -device ide-hd,drive=img-blkreplay
--    QEMUIOVector qiov;
+@@ -XXX,XX +XXX,XX @@ This snapshot is created at start of recording and restored at start
-     while (nb_sectors > 0) {
+ of replaying. It also can be loaded while replaying to roll back
-         int n = nb_sectors;
+ the execution.
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_write(ImgConvertState *s, int64_t sector_num,
-                 (s->compressed &&
++'snapshot' flag of the disk image must be removed to save the snapshots
-                  !buffer_is_zero(buf, n * BDRV_SECTOR_SIZE)))
++in the overlay (or original image) instead of using the temporary overlay.
-             {
++ -drive file=disk.ovl,if=none,id=img-direct
--                qemu_iovec_init_buf(&qiov, buf, n << BDRV_SECTOR_BITS);
++ -drive driver=blkreplay,if=none,image=img-direct,id=img-blkreplay
--
++ -device ide-hd,drive=img-blkreplay
--                ret = blk_co_pwritev(s->target, sector_num << BDRV_SECTOR_BITS,
++
--                                     n << BDRV_SECTOR_BITS, &qiov, flags);
+ Use QEMU monitor to create additional snapshots. 'savevm <name>' command
-+                ret = blk_co_pwrite(s->target, sector_num << BDRV_SECTOR_BITS,
+ created the snapshot and 'loadvm <name>' restores it. To prevent corruption
-+                                    n << BDRV_SECTOR_BITS, buf, flags);
+ of the original disk image, use overlay files linked to the original images.
                  if (ret < 0) {
                      return ret;
                  }
 --
 .20.1

-[Qemu-devel] [PULL 15/27] qcow2: Fix error handling in the compression code
+[PULL 05/15] replay: don't drain/flush bdrv queue while RR is working
-From: Alberto Garcia <berto@igalia.com>
+From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
-This patch fixes a few things in the way error codes are handled in
+In record/replay mode bdrv queue is controlled by replay mechanism.
-the qcow2 compression code:
+It does not allow saving or loading the snapshots
 when bdrv queue is not empty. Stopping the VM is not blocked by nonempty
 queue, but flushing the queue is still impossible there,
 because it may cause deadlocks in replay mode.
 This patch disables bdrv_drain_all and bdrv_flush_all in
 record/replay mode.
-a) qcow2_co_pwritev_compressed() expects qcow2_co_compress() to only
+Stopping the machine when the IO requests are not finished is needed
-   return -1 or -2 on failure, but this is not correct. Since the
+for the debugging. E.g., breakpoint may be set at the specified step,
-   change from qcow2_compress() to qcow2_co_compress() in commit
+and forcing the IO requests to finish may break the determinism
-   ceb029cd6feccf9f7607 the new code can also return -EINVAL (although
+of the execution.
    there does not seem to exist any code path that would cause that
    error in the current implementation).
-b) -1 and -2 are ad-hoc error codes defined in qcow2_compress().
+Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
-   This patch replaces them with standard constants from errno.h.
+Acked-by: Kevin Wolf <kwolf@redhat.com>
 c) Both qcow2_compress() and qcow2_co_do_compress() return a negative
    value on failure, but qcow2_co_pwritev_compressed() stores the
    value in an unsigned data type.
 Signed-off-by: Alberto Garcia <berto@igalia.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- block/qcow2.c | 18 +++++++++---------
+ block/io.c | 28 ++++++++++++++++++++++++++++
-file changed, 9 insertions(+), 9 deletions(-)
+ cpus.c     |  2 --
 files changed, 28 insertions(+), 2 deletions(-)
-diff --git a/block/qcow2.c b/block/qcow2.c
+diff --git a/block/io.c b/block/io.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
+--- a/block/io.c
-+++ b/block/qcow2.c
++++ b/block/io.c
-@@ -XXX,XX +XXX,XX @@ fail:
+@@ -XXX,XX +XXX,XX @@
-  * @src - source buffer, @src_size bytes
+ #include "qapi/error.h"
-  *
+ #include "qemu/error-report.h"
-  * Returns: compressed size on success
+ #include "qemu/main-loop.h"
-- *          -1 destination buffer is not enough to store compressed data
++#include "sysemu/replay.h"
-- *          -2 on any other error
-+ *          -ENOMEM destination buffer is not enough to store compressed data
+ #define NOT_DONE 0x7fffffff /* used while emulated sync operation in progress */
-+ *          -EIO    on any other error
-  */
+@@ -XXX,XX +XXX,XX @@ void bdrv_drain_all_begin(void)
- static ssize_t qcow2_compress(void *dest, size_t dest_size,
+         return;
                                const void *src, size_t src_size)
@@ -XXX,XX +XXX,XX @@ static ssize_t qcow2_compress(void *dest, size_t dest_size,
      ret = deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED,
                         -12, 9, Z_DEFAULT_STRATEGY);
      if (ret != Z_OK) {
 -        return -2;
 +        return -EIO;
      }
-     /* strm.next_in is not const in old zlib versions, such as those used on
++    /*
-@@ -XXX,XX +XXX,XX @@ static ssize_t qcow2_compress(void *dest, size_t dest_size,
++     * bdrv queue is managed by record/replay,
-     if (ret == Z_STREAM_END) {
++     * waiting for finishing the I/O requests may
-         ret = dest_size - strm.avail_out;
++     * be infinite
-     } else {
++     */
--        ret = (ret == Z_OK ? -1 : -2);
++    if (replay_events_enabled()) {
-+        ret = (ret == Z_OK ? -ENOMEM : -EIO);
++        return;
 +    }
 +
      /* AIO_WAIT_WHILE() with a NULL context can only be called from the main
       * loop AioContext, so make sure we're in the main context. */
      assert(qemu_get_current_aio_context() == qemu_get_aio_context());
@@ -XXX,XX +XXX,XX @@ void bdrv_drain_all_end(void)
      BlockDriverState *bs = NULL;
      int drained_end_counter = 0;
 +    /*
 +     * bdrv queue is managed by record/replay,
 +     * waiting for finishing the I/O requests may
 +     * be endless
 +     */
 +    if (replay_events_enabled()) {
 +        return;
 +    }
 +
      while ((bs = bdrv_next_all_states(bs))) {
          AioContext *aio_context = bdrv_get_aio_context(bs);
@@ -XXX,XX +XXX,XX @@ int bdrv_flush_all(void)
      BlockDriverState *bs = NULL;
      int result = 0;
 +    /*
 +     * bdrv queue is managed by record/replay,
 +     * creating new flush request for stopping
 +     * the VM may break the determinism
 +     */
 +    if (replay_events_enabled()) {
 +        return result;
 +    }
 +
      for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
          AioContext *aio_context = bdrv_get_aio_context(bs);
          int ret;
 diff --git a/cpus.c b/cpus.c
 index XXXXXXX..XXXXXXX 100644
 --- a/cpus.c
 +++ b/cpus.c
@@ -XXX,XX +XXX,XX @@ static int do_vm_stop(RunState state, bool send_stop)
      }
-     deflateEnd(&strm);
+     bdrv_drain_all();
-@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
+-    replay_disable_events();
-     BDRVQcow2State *s = bs->opaque;
+     ret = bdrv_flush_all();
-     QEMUIOVector hd_qiov;
-     int ret;
+     return ret;
--    size_t out_len;
+@@ -XXX,XX +XXX,XX @@ int vm_prepare_start(void)
-+    ssize_t out_len;
+     /* We are sending this now, but the CPUs will be resumed shortly later */
-     uint8_t *buf, *out_buf;
+     qapi_event_send_resume();
-     uint64_t cluster_offset;
+-    replay_enable_events();
-@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
+     cpu_enable_ticks();
+     runstate_set(RUN_STATE_RUNNING);
-     out_len = qcow2_co_compress(bs, out_buf, s->cluster_size - 1,
+     vm_state_notify(1, RUN_STATE_RUNNING);
                                  buf, s->cluster_size);
 -    if (out_len == -2) {
 -        ret = -EINVAL;
 -        goto fail;
 -    } else if (out_len == -1) {
 +    if (out_len == -ENOMEM) {
          /* could not compress: write normal cluster */
          ret = qcow2_co_pwritev(bs, offset, bytes, qiov, 0);
          if (ret < 0) {
              goto fail;
          }
          goto success;
 +    } else if (out_len < 0) {
 +        ret = -EINVAL;
 +        goto fail;
      }
      qemu_co_mutex_lock(&s->lock);
 --
 .20.1

-[Qemu-devel] [PULL 23/27] block/stream: use buffer-based io
+[PULL 06/15] replay: finish record/replay before closing the disks
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+After recent updates block devices cannot be closed on qemu exit.
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+This happens due to the block request polling when replay is not finished.
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
+Therefore now we stop execution recording before closing the block devices.
 Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- block/stream.c | 4 +---
+ replay/replay.c | 2 ++
-file changed, 1 insertion(+), 3 deletions(-)
+ vl.c            | 1 +
 files changed, 3 insertions(+)
-diff --git a/block/stream.c b/block/stream.c
+diff --git a/replay/replay.c b/replay/replay.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/stream.c
+--- a/replay/replay.c
-+++ b/block/stream.c
++++ b/replay/replay.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn stream_populate(BlockBackend *blk,
+@@ -XXX,XX +XXX,XX @@ void replay_finish(void)
-                                         int64_t offset, uint64_t bytes,
+     g_free(replay_snapshot);
-                                         void *buf)
+     replay_snapshot = NULL;
- {
--    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
++    replay_mode = REPLAY_MODE_NONE;
--
++
-     assert(bytes < SIZE_MAX);
+     replay_finish_events();
      /* Copy-on-read the unallocated clusters */
 -    return blk_co_preadv(blk, offset, qiov.size, &qiov, BDRV_REQ_COPY_ON_READ);
 +    return blk_co_pread(blk, offset, bytes, buf, BDRV_REQ_COPY_ON_READ);
  }
- static void stream_abort(Job *job)
+diff --git a/vl.c b/vl.c
 index XXXXXXX..XXXXXXX 100644
 --- a/vl.c
 +++ b/vl.c
@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp)
      /* No more vcpu or device emulation activity beyond this point */
      vm_shutdown();
 +    replay_finish();
      job_cancel_sync_all();
      bdrv_close_all();
 --
 .20.1

-[Qemu-devel] [PULL 16/27] block: introduce byte-based io helpers
+[PULL 07/15] replay: add BH oneshot event for block layer
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Replay is capable of recording normal BH events, but sometimes
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+there are single use callbacks scheduled with aio_bh_schedule_oneshot
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
+function. This patch enables recording and replaying such callbacks.
 Block layer uses these events for calling the completion function.
 Replaying these calls makes the execution deterministic.
 Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
 Acked-by: Kevin Wolf <kwolf@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- include/block/block_int.h      | 16 ++++++++++++++++
+ include/sysemu/replay.h  |  4 ++++
- include/sysemu/block-backend.h | 19 +++++++++++++++++++
+ replay/replay-internal.h |  1 +
-files changed, 35 insertions(+)
+ block/block-backend.c    |  9 ++++++---
+ block/io.c               |  4 ++--
-diff --git a/include/block/block_int.h b/include/block/block_int.h
+ block/iscsi.c            |  5 +++--
-index XXXXXXX..XXXXXXX 100644
+ block/nfs.c              |  6 ++++--
---- a/include/block/block_int.h
+ block/null.c             |  4 +++-
-+++ b/include/block/block_int.h
+ block/nvme.c             |  6 ++++--
-@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child,
+ block/rbd.c              |  5 +++--
-     int64_t offset, unsigned int bytes, QEMUIOVector *qiov,
+ block/vxhs.c             |  5 +++--
-     BdrvRequestFlags flags);
+ replay/replay-events.c   | 16 ++++++++++++++++
+ stubs/replay-user.c      |  9 +++++++++
-+static inline int coroutine_fn bdrv_co_pread(BdrvChild *child,
+ stubs/Makefile.objs      |  1 +
-+    int64_t offset, unsigned int bytes, void *buf, BdrvRequestFlags flags)
+files changed, 59 insertions(+), 16 deletions(-)
  create mode 100644 stubs/replay-user.c
 diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/sysemu/replay.h
 +++ b/include/sysemu/replay.h
@@ -XXX,XX +XXX,XX @@
  #include "qapi/qapi-types-misc.h"
  #include "qapi/qapi-types-run-state.h"
  #include "qapi/qapi-types-ui.h"
 +#include "block/aio.h"
  /* replay clock kinds */
  enum ReplayClockKind {
@@ -XXX,XX +XXX,XX @@ void replay_enable_events(void);
  bool replay_events_enabled(void);
  /*! Adds bottom half event to the queue */
  void replay_bh_schedule_event(QEMUBH *bh);
 +/* Adds oneshot bottom half event to the queue */
 +void replay_bh_schedule_oneshot_event(AioContext *ctx,
 +    QEMUBHFunc *cb, void *opaque);
  /*! Adds input event to the queue */
  void replay_input_event(QemuConsole *src, InputEvent *evt);
  /*! Adds input sync event to the queue */
 diff --git a/replay/replay-internal.h b/replay/replay-internal.h
 index XXXXXXX..XXXXXXX 100644
 --- a/replay/replay-internal.h
 +++ b/replay/replay-internal.h
@@ -XXX,XX +XXX,XX @@ enum ReplayEvents {
  enum ReplayAsyncEventKind {
      REPLAY_ASYNC_EVENT_BH,
 +    REPLAY_ASYNC_EVENT_BH_ONESHOT,
      REPLAY_ASYNC_EVENT_INPUT,
      REPLAY_ASYNC_EVENT_INPUT_SYNC,
      REPLAY_ASYNC_EVENT_CHAR_READ,
 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 @@
  #include "hw/qdev-core.h"
  #include "sysemu/blockdev.h"
  #include "sysemu/runstate.h"
 +#include "sysemu/sysemu.h"
 +#include "sysemu/replay.h"
  #include "qapi/error.h"
  #include "qapi/qapi-events-block.h"
  #include "qemu/id.h"
@@ -XXX,XX +XXX,XX @@ BlockAIOCB *blk_abort_aio_request(BlockBackend *blk,
      acb->blk = blk;
      acb->ret = ret;
 -    aio_bh_schedule_oneshot(blk_get_aio_context(blk), error_callback_bh, acb);
 +    replay_bh_schedule_oneshot_event(blk_get_aio_context(blk),
 +                                     error_callback_bh, acb);
      return &acb->common;
  }
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *blk_aio_prwv(BlockBackend *blk, int64_t offset, int bytes,
      acb->has_returned = true;
      if (acb->rwco.ret != NOT_DONE) {
 -        aio_bh_schedule_oneshot(blk_get_aio_context(blk),
 -                                blk_aio_complete_bh, acb);
 +        replay_bh_schedule_oneshot_event(blk_get_aio_context(blk),
 +                                         blk_aio_complete_bh, acb);
      }
      return &acb->common;
 diff --git a/block/io.c b/block/io.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/io.c
 +++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn bdrv_co_yield_to_drain(BlockDriverState *bs,
      if (bs) {
          bdrv_inc_in_flight(bs);
      }
 -    aio_bh_schedule_oneshot(bdrv_get_aio_context(bs),
 -                            bdrv_co_drain_bh_cb, &data);
 +    replay_bh_schedule_oneshot_event(bdrv_get_aio_context(bs),
 +                                     bdrv_co_drain_bh_cb, &data);
      qemu_coroutine_yield();
      /* If we are resumed from some other event (such as an aio completion or a
 diff --git a/block/iscsi.c b/block/iscsi.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/iscsi.c
 +++ b/block/iscsi.c
@@ -XXX,XX +XXX,XX @@
  #include "qemu/module.h"
  #include "qemu/option.h"
  #include "qemu/uuid.h"
 +#include "sysemu/replay.h"
  #include "qapi/error.h"
  #include "qapi/qapi-commands-misc.h"
  #include "qapi/qmp/qdict.h"
@@ -XXX,XX +XXX,XX @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status,
      }
      if (iTask->co) {
 -        aio_bh_schedule_oneshot(iTask->iscsilun->aio_context,
 -                                 iscsi_co_generic_bh_cb, iTask);
 +        replay_bh_schedule_oneshot_event(iTask->iscsilun->aio_context,
 +                                         iscsi_co_generic_bh_cb, iTask);
      } else {
          iTask->complete = 1;
      }
 diff --git a/block/nfs.c b/block/nfs.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/nfs.c
 +++ b/block/nfs.c
@@ -XXX,XX +XXX,XX @@
  #include "qemu/option.h"
  #include "qemu/uri.h"
  #include "qemu/cutils.h"
 +#include "sysemu/sysemu.h"
 +#include "sysemu/replay.h"
  #include "qapi/qapi-visit-block-core.h"
  #include "qapi/qmp/qdict.h"
  #include "qapi/qmp/qstring.h"
@@ -XXX,XX +XXX,XX @@ nfs_co_generic_cb(int ret, struct nfs_context *nfs, void *data,
      if (task->ret < 0) {
          error_report("NFS Error: %s", nfs_get_error(nfs));
      }
 -    aio_bh_schedule_oneshot(task->client->aio_context,
 -                            nfs_co_generic_bh_cb, task);
 +    replay_bh_schedule_oneshot_event(task->client->aio_context,
 +                                     nfs_co_generic_bh_cb, task);
  }
  static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, uint64_t offset,
 diff --git a/block/null.c b/block/null.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/null.c
 +++ b/block/null.c
@@ -XXX,XX +XXX,XX @@
  #include "qemu/module.h"
  #include "qemu/option.h"
  #include "block/block_int.h"
 +#include "sysemu/replay.h"
  #define NULL_OPT_LATENCY "latency-ns"
  #define NULL_OPT_ZEROES  "read-zeroes"
@@ -XXX,XX +XXX,XX @@ static inline BlockAIOCB *null_aio_common(BlockDriverState *bs,
          timer_mod_ns(&acb->timer,
                       qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + s->latency_ns);
      } else {
 -        aio_bh_schedule_oneshot(bdrv_get_aio_context(bs), null_bh_cb, acb);
 +        replay_bh_schedule_oneshot_event(bdrv_get_aio_context(bs),
 +                                         null_bh_cb, acb);
      }
      return &acb->common;
  }
 diff --git a/block/nvme.c b/block/nvme.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/nvme.c
 +++ b/block/nvme.c
@@ -XXX,XX +XXX,XX @@
  #include "qemu/option.h"
  #include "qemu/vfio-helpers.h"
  #include "block/block_int.h"
 +#include "sysemu/replay.h"
  #include "trace.h"
  #include "block/nvme.h"
@@ -XXX,XX +XXX,XX @@ static bool nvme_process_completion(BDRVNVMeState *s, NVMeQueuePair *q)
          smp_mb_release();
          *q->cq.doorbell = cpu_to_le32(q->cq.head);
          if (!qemu_co_queue_empty(&q->free_req_queue)) {
 -            aio_bh_schedule_oneshot(s->aio_context, nvme_free_req_queue_cb, q);
 +            replay_bh_schedule_oneshot_event(s->aio_context,
 +                                             nvme_free_req_queue_cb, q);
          }
      }
      q->busy = false;
@@ -XXX,XX +XXX,XX @@ static void nvme_rw_cb(void *opaque, int ret)
          /* The rw coroutine hasn't yielded, don't try to enter. */
          return;
      }
 -    aio_bh_schedule_oneshot(data->ctx, nvme_rw_cb_bh, data);
 +    replay_bh_schedule_oneshot_event(data->ctx, nvme_rw_cb_bh, data);
  }
  static coroutine_fn int nvme_co_prw_aligned(BlockDriverState *bs,
 diff --git a/block/rbd.c b/block/rbd.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/rbd.c
 +++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@
  #include "block/qdict.h"
  #include "crypto/secret.h"
  #include "qemu/cutils.h"
 +#include "sysemu/replay.h"
  #include "qapi/qmp/qstring.h"
  #include "qapi/qmp/qdict.h"
  #include "qapi/qmp/qjson.h"
@@ -XXX,XX +XXX,XX @@ static void rbd_finish_aiocb(rbd_completion_t c, RADOSCB *rcb)
      rcb->ret = rbd_aio_get_return_value(c);
      rbd_aio_release(c);
 -    aio_bh_schedule_oneshot(bdrv_get_aio_context(acb->common.bs),
 -                            rbd_finish_bh, rcb);
 +    replay_bh_schedule_oneshot_event(bdrv_get_aio_context(acb->common.bs),
 +                                     rbd_finish_bh, rcb);
  }
  static int rbd_aio_discard_wrapper(rbd_image_t image,
 diff --git a/block/vxhs.c b/block/vxhs.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/vxhs.c
 +++ b/block/vxhs.c
@@ -XXX,XX +XXX,XX @@
  #include "qapi/error.h"
  #include "qemu/uuid.h"
  #include "crypto/tlscredsx509.h"
 +#include "sysemu/replay.h"
  #define VXHS_OPT_FILENAME           "filename"
  #define VXHS_OPT_VDISK_ID           "vdisk-id"
@@ -XXX,XX +XXX,XX @@ static void vxhs_iio_callback(void *ctx, uint32_t opcode, uint32_t error)
              trace_vxhs_iio_callback(error);
          }
 -        aio_bh_schedule_oneshot(bdrv_get_aio_context(acb->common.bs),
 -                                vxhs_complete_aio_bh, acb);
 +        replay_bh_schedule_oneshot_event(bdrv_get_aio_context(acb->common.bs),
 +                                         vxhs_complete_aio_bh, acb);
          break;
      default:
 diff --git a/replay/replay-events.c b/replay/replay-events.c
 index XXXXXXX..XXXXXXX 100644
 --- a/replay/replay-events.c
 +++ b/replay/replay-events.c
@@ -XXX,XX +XXX,XX @@ static void replay_run_event(Event *event)
      case REPLAY_ASYNC_EVENT_BH:
          aio_bh_call(event->opaque);
          break;
 +    case REPLAY_ASYNC_EVENT_BH_ONESHOT:
 +        ((QEMUBHFunc *)event->opaque)(event->opaque2);
 +        break;
      case REPLAY_ASYNC_EVENT_INPUT:
          qemu_input_event_send_impl(NULL, (InputEvent *)event->opaque);
          qapi_free_InputEvent((InputEvent *)event->opaque);
@@ -XXX,XX +XXX,XX @@ void replay_bh_schedule_event(QEMUBH *bh)
      }
  }
 +void replay_bh_schedule_oneshot_event(AioContext *ctx,
 +    QEMUBHFunc *cb, void *opaque)
 +{
-+    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
++    if (events_enabled) {
-+
++        uint64_t id = replay_get_current_icount();
-+    return bdrv_co_preadv(child, offset, bytes, &qiov, flags);
++        replay_add_event(REPLAY_ASYNC_EVENT_BH_ONESHOT, cb, opaque, id);
 +    } else {
 +        aio_bh_schedule_oneshot(ctx, cb, opaque);
 +    }
 +}
 +
-+static inline int coroutine_fn bdrv_co_pwrite(BdrvChild *child,
+ void replay_add_input_event(struct InputEvent *event)
-+    int64_t offset, unsigned int bytes, void *buf, BdrvRequestFlags flags)
+ {
      replay_add_event(REPLAY_ASYNC_EVENT_INPUT, event, NULL, 0);
@@ -XXX,XX +XXX,XX @@ static void replay_save_event(Event *event, int checkpoint)
          /* save event-specific data */
          switch (event->event_kind) {
          case REPLAY_ASYNC_EVENT_BH:
 +        case REPLAY_ASYNC_EVENT_BH_ONESHOT:
              replay_put_qword(event->id);
              break;
          case REPLAY_ASYNC_EVENT_INPUT:
@@ -XXX,XX +XXX,XX @@ static Event *replay_read_event(int checkpoint)
      /* Events that has not to be in the queue */
      switch (replay_state.read_event_kind) {
      case REPLAY_ASYNC_EVENT_BH:
 +    case REPLAY_ASYNC_EVENT_BH_ONESHOT:
          if (replay_state.read_event_id == -1) {
              replay_state.read_event_id = replay_get_qword();
          }
 diff --git a/stubs/replay-user.c b/stubs/replay-user.c
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/stubs/replay-user.c
@@ -XXX,XX +XXX,XX @@
 +#include "qemu/osdep.h"
 +#include "sysemu/replay.h"
 +#include "sysemu/sysemu.h"
 +
 +void replay_bh_schedule_oneshot_event(AioContext *ctx,
 +    QEMUBHFunc *cb, void *opaque)
 +{
-+    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
++    aio_bh_schedule_oneshot(ctx, cb, opaque);
 +
 +    return bdrv_co_pwritev(child, offset, bytes, &qiov, flags);
 +}
-+
+diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
- extern unsigned int bdrv_drain_all_count;
+index XXXXXXX..XXXXXXX 100644
- void bdrv_apply_subtree_drain(BdrvChild *child, BlockDriverState *new_parent);
+--- a/stubs/Makefile.objs
- void bdrv_unapply_subtree_drain(BdrvChild *child, BlockDriverState *old_parent);
++++ b/stubs/Makefile.objs
-diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
+@@ -XXX,XX +XXX,XX @@ stub-obj-y += monitor.o
-index XXXXXXX..XXXXXXX 100644
+ stub-obj-y += notify-event.o
---- a/include/sysemu/block-backend.h
+ stub-obj-y += qtest.o
-+++ b/include/sysemu/block-backend.h
+ stub-obj-y += replay.o
-@@ -XXX,XX +XXX,XX @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
++stub-obj-y += replay-user.o
- int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,
+ stub-obj-y += runstate-check.o
-                                unsigned int bytes, QEMUIOVector *qiov,
+ stub-obj-y += set-fd-handler.o
-                                BdrvRequestFlags flags);
+ stub-obj-y += sysbus.o
 +
 +static inline int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset,
 +                                            unsigned int bytes, void *buf,
 +                                            BdrvRequestFlags flags)
 +{
 +    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
 +
 +    return blk_co_preadv(blk, offset, bytes, &qiov, flags);
 +}
 +
 +static inline int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset,
 +                                             unsigned int bytes, void *buf,
 +                                             BdrvRequestFlags flags)
 +{
 +    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
 +
 +    return blk_co_pwritev(blk, offset, bytes, &qiov, flags);
 +}
 +
  int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
                        int bytes, BdrvRequestFlags flags);
  BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset,
 --
 .20.1

-[Qemu-devel] [PULL 26/27] iotests: Check that images are in read-only mode after block-commit
+[PULL 08/15] block: Reject misaligned write requests with BDRV_REQ_NO_FALLBACK
 From: Alberto Garcia <berto@igalia.com>
-This tests the fix from the previous patch.
+The BDRV_REQ_NO_FALLBACK flag means that an operation should only be
 performed if it can be offloaded or otherwise performed efficiently.
 However a misaligned write request requires a RMW so we should return
 an error and let the caller decide how to proceed.
 This hits an assertion since commit c8bb23cbdb if the required
 alignment is larger than the cluster size:
 qemu-img create -f qcow2 -o cluster_size=2k img.qcow2 4G
 qemu-io -c "open -o driver=qcow2,file.align=4k blkdebug::img.qcow2" \
         -c 'write 0 512'
 qemu-io: block/io.c:1127: bdrv_driver_pwritev: Assertion `!(flags & BDRV_REQ_NO_FALLBACK)' failed.
 Aborted
 The reason is that when writing to an unallocated cluster we try to
 skip the copy-on-write part and zeroize it using BDRV_REQ_NO_FALLBACK
 instead, resulting in a write request that is too small (2KB cluster
 size vs 4KB required alignment).
 Signed-off-by: Alberto Garcia <berto@igalia.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- tests/qemu-iotests/249     | 115 +++++++++++++++++++++++++++++++++++++
+ block/io.c                 |  7 +++++
- tests/qemu-iotests/249.out |  35 +++++++++++
+ tests/qemu-iotests/268     | 55 ++++++++++++++++++++++++++++++++++++++
- tests/qemu-iotests/group   |   1 +
+ tests/qemu-iotests/268.out |  7 +++++
-files changed, 151 insertions(+)
+ tests/qemu-iotests/group   |  1 +
- create mode 100755 tests/qemu-iotests/249
+files changed, 70 insertions(+)
- create mode 100644 tests/qemu-iotests/249.out
+ create mode 100755 tests/qemu-iotests/268
  create mode 100644 tests/qemu-iotests/268.out
-diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249
+diff --git a/block/io.c b/block/io.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/io.c
 +++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child,
          return ret;
      }
 +    /* If the request is misaligned then we can't make it efficient */
 +    if ((flags & BDRV_REQ_NO_FALLBACK) &&
 +        !QEMU_IS_ALIGNED(offset | bytes, align))
 +    {
 +        return -ENOTSUP;
 +    }
 +
      bdrv_inc_in_flight(bs);
      /*
       * Align write if necessary by performing a read-modify-write cycle.
 diff --git a/tests/qemu-iotests/268 b/tests/qemu-iotests/268
 new file mode 100755
 index XXXXXXX..XXXXXXX
 --- /dev/null
-+++ b/tests/qemu-iotests/249
++++ b/tests/qemu-iotests/268
 @@ -XXX,XX +XXX,XX @@
 +#!/usr/bin/env bash
 +#
-+# Test that a backing image is put back in read-only mode after
++# Test write request with required alignment larger than the cluster size
 +# block-commit (both when it fails and when it succeeds).
 +#
 +# Copyright (C) 2019 Igalia, S.L.
++# Author: Alberto Garcia <berto@igalia.com>
 +#
 +# 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.
 ...
 +#
 +
 +# creator
 +owner=berto@igalia.com
 +
-+seq="$(basename $0)"
++seq=`basename $0`
 +echo "QA output created by $seq"
 +
 +status=1    # failure is the default!
 +
 +_cleanup()
 +{
 +    _cleanup_test_img
-+    rm -f "$TEST_IMG.base"
-+    rm -f "$TEST_IMG.int"
 +}
 +trap "_cleanup; exit \$status" 0 1 2 3 15
 +
 +# get standard environment, filters and checks
 +. ./common.rc
 +. ./common.filter
-+. ./common.qemu
 +
-+# Any format implementing BlockDriver.bdrv_change_backing_file
++_supported_fmt qcow2
 +_supported_fmt qcow2 qed
 +_supported_proto file
-+_supported_os Linux
-+
-+IMG_SIZE=1M
-+
-+# Create the images: base <- int <- active
-+TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE | _filter_imgfmt
-+TEST_IMG="$TEST_IMG.int" _make_test_img -b "$TEST_IMG.base" | _filter_imgfmt
-+_make_test_img -b "$TEST_IMG.int" | _filter_imgfmt
-+
-+# Launch QEMU with these two drives:
-+# none0: base (read-only)
-+# none1: base <- int <- active
-+_launch_qemu -drive if=none,file="${TEST_IMG}.base",node-name=base,read-only=on \
-+             -drive if=none,file="${TEST_IMG}",backing.node-name=int,backing.backing=base
-+
-+_send_qemu_cmd $QEMU_HANDLE \
-+    "{ 'execute': 'qmp_capabilities' }" \
-+    'return'
 +
 +echo
-+echo '=== Send a write command to a drive opened in read-only mode (1)'
++echo "== Required alignment larger than cluster size =="
 +echo
 +_send_qemu_cmd $QEMU_HANDLE \
 +    "{ 'execute': 'human-monitor-command',
 +       'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
 +    'return'
 +
-+echo
++CLUSTER_SIZE=2k _make_test_img 1M
-+echo '=== Run block-commit on base using an invalid filter node name'
++# Since commit c8bb23cbdb writing to an unallocated cluster fills the
-+echo
++# empty COW areas with bdrv_write_zeroes(flags=BDRV_REQ_NO_FALLBACK)
-+_send_qemu_cmd $QEMU_HANDLE \
++$QEMU_IO -c "open -o driver=$IMGFMT,file.align=4k blkdebug::$TEST_IMG" \
-+    "{ 'execute': 'block-commit',
++         -c "write 0 512" | _filter_qemu_io
 +       'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int',
 +                     'filter-node-name': '1234'}}" \
 +    'error'
 +
 +echo
 +echo '=== Send a write command to a drive opened in read-only mode (2)'
 +echo
 +_send_qemu_cmd $QEMU_HANDLE \
 +    "{ 'execute': 'human-monitor-command',
 +       'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
 +    'return'
 +
 +echo
 +echo '=== Run block-commit on base using the default filter node name'
 +echo
 +_send_qemu_cmd $QEMU_HANDLE \
 +    "{ 'execute': 'block-commit',
 +       'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int'}}" \
 +    'return'
 +
 +# Wait for block-commit to finish
 +_send_qemu_cmd $QEMU_HANDLE '' \
 +    '"status": "null"'
 +
 +echo
 +echo '=== Send a write command to a drive opened in read-only mode (3)'
 +echo
 +_send_qemu_cmd $QEMU_HANDLE \
 +    "{ 'execute': 'human-monitor-command',
 +       'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
 +    'return'
 +
 +_cleanup_qemu
 +
 +# success, all done
 +echo "*** done"
 +rm -f $seq.full
 +status=0
-diff --git a/tests/qemu-iotests/249.out b/tests/qemu-iotests/249.out
+diff --git a/tests/qemu-iotests/268.out b/tests/qemu-iotests/268.out
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
-+++ b/tests/qemu-iotests/249.out
++++ b/tests/qemu-iotests/268.out
 @@ -XXX,XX +XXX,XX @@
-+QA output created by 249
++QA output created by 268
 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=1048576
 +Formatting 'TEST_DIR/t.IMGFMT.int', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.base
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.int
 +{"return": {}}
 +
-+=== Send a write command to a drive opened in read-only mode (1)
++== Required alignment larger than cluster size ==
-+
++Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
-+{"return": "Block node is read-onlyrn"}
++wrote 512/512 bytes at offset 0
-+
++512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 +=== Run block-commit on base using an invalid filter node name
 +
 +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
 +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
 +{"error": {"class": "GenericError", "desc": "Invalid node name"}}
 +
 +=== Send a write command to a drive opened in read-only mode (2)
 +
 +{"return": "Block node is read-onlyrn"}
 +
 +=== Run block-commit on base using the default filter node name
 +
 +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
 +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
 +{"return": {}}
 +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}
 +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}
 +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 1048576, "offset": 1048576, "speed": 0, "type": "commit"}}
 +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
 +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
 +
 +=== Send a write command to a drive opened in read-only mode (3)
 +
 +{"return": "Block node is read-onlyrn"}
 +*** done
 diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/group
 +++ b/tests/qemu-iotests/group
 @@ -XXX,XX +XXX,XX @@
 rw auto quick
-rw auto quick
+rw quick
-rw auto quick
+rw auto quick snapshot
-+249 rw auto quick
++268 rw auto quick
 --
 .20.1

-[Qemu-devel] [PULL 12/27] iotests: Perform the correct test in 082
+[PULL 09/15] iotests/028: Fix for long $TEST_DIRs
 From: Max Reitz <mreitz@redhat.com>
-In the "amend" section of 082, we perform a single "convert" test
+For long test image paths, the order of the "Formatting" line and the
-(namely "convert -o help").  That does not make sense, especially
+"(qemu)" prompt after a drive_backup HMP command may be reversed.  In
-because we have done exactly that "convert" test earlier in 082 already.
+fact, the interaction between the prompt and the line may lead to the
 "Formatting" to being greppable at all after "read"-ing it (if the
 prompt injects an IFS character into the "Formatting" string).
-Replacing "convert" by "amend" yields an error, which is correct because
+So just wait until we get a prompt.  At that point, the block job must
-there is no point in "amend" having a default format.  The user has to
+have been started, so "info block-jobs" will only return "No active
-either specify the format, or give a file for qemu-img to probe.
+jobs" once it is done.
+Reported-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- tests/qemu-iotests/082     | 5 ++++-
+ tests/qemu-iotests/028     | 11 ++++++++---
- tests/qemu-iotests/082.out | 5 ++---
+ tests/qemu-iotests/028.out |  1 -
-files changed, 6 insertions(+), 4 deletions(-)
+files changed, 8 insertions(+), 4 deletions(-)
-diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
+diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
 index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/082
+--- a/tests/qemu-iotests/028
-+++ b/tests/qemu-iotests/082
++++ b/tests/qemu-iotests/028
-@@ -XXX,XX +XXX,XX @@ run_qemu_img amend -f $IMGFMT -o backing_file="$TEST_IMG" -o ,, -o help "$TEST_I
+@@ -XXX,XX +XXX,XX @@ fi
+ # Silence output since it contains the disk image path and QEMU's readline
- # Leave out everything that isn't needed
+ # character echoing makes it very hard to filter the output. Plus, there
- run_qemu_img amend -f $IMGFMT -o help
+ # is no telling how many times the command will repeat before succeeding.
--run_qemu_img convert -o help
+-_send_qemu_cmd $h "drive_backup disk ${TEST_IMG}.copy" "(qemu)" >/dev/null
-+
+-_send_qemu_cmd $h "" "Formatting" | _filter_img_create
-+# amend requires specifying either a format explicitly, or a file
+-qemu_cmd_repeat=20 _send_qemu_cmd $h "info block-jobs" "No active jobs" >/dev/null
-+# which it can probe
++# (Note that creating the image results in a "Formatting..." message over
-+run_qemu_img amend -o help
++# stdout, which is the same channel the monitor uses.  We cannot reliably
++# wait for it because the monitor output may interact with it in such a
- # Try help option for a format that does not support amendment
++# way that _timed_wait_for cannot read it.  However, once the block job is
- run_qemu_img amend -f bochs -o help
++# done, we know that the "Formatting..." message must have appeared
-diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
++# already, so the output is still deterministic.)
 +silent=y _send_qemu_cmd $h "drive_backup disk ${TEST_IMG}.copy" "(qemu)"
 +silent=y qemu_cmd_repeat=20 _send_qemu_cmd $h "info block-jobs" "No active jobs"
  _send_qemu_cmd $h "info block-jobs" "No active jobs"
  _send_qemu_cmd $h 'quit' ""
 diff --git a/tests/qemu-iotests/028.out b/tests/qemu-iotests/028.out
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/082.out
+--- a/tests/qemu-iotests/028.out
-+++ b/tests/qemu-iotests/082.out
++++ b/tests/qemu-iotests/028.out
-@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
- Note that not all of these options may be amendable.
+ block-backup
--Testing: convert -o help
+-Formatting 'TEST_DIR/t.IMGFMT.copy', fmt=IMGFMT size=4294968832 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT
--Supported options:
+ (qemu) info block-jobs
--  size=<size>            - Virtual disk size
+ No active jobs
-+Testing: amend -o help
+ === IO: pattern 195
 +qemu-img: Expecting one image file name
  Testing: amend -f bochs -o help
  qemu-img: Format driver 'bochs' does not support option amendment
 --
 .20.1

-[Qemu-devel] [PULL 14/27] qcow2: Fix qcow2_make_empty() with external data file
+Deleted patch
-make_completely_empty() is an optimisated path for bdrv_make_empty()
-where completely new metadata is created inside the image file instead
-of going through all clusters and discarding them. For an external data
-file, however, we actually need to do discard operations on the data
-file; just overwriting the qcow2 file doesn't get rid of the data.
-The necessary slow path with an explicit discard operation already
-exists for other cases. Use it for external data files, too.
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- block/qcow2.c | 7 +++++--
-file changed, 5 insertions(+), 2 deletions(-)
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static int qcow2_make_empty(BlockDriverState *bs)
-     if (s->qcow_version >= 3 && !s->snapshots && !s->nb_bitmaps &&
-+ l1_clusters <= s->refcount_block_size &&
--        s->crypt_method_header != QCOW_CRYPT_LUKS) {
-+        s->crypt_method_header != QCOW_CRYPT_LUKS &&
-+        !has_data_file(bs)) {
-         /* The following function only works for qcow2 v3 images (it
-          * requires the dirty flag) and only as long as there are no
-          * features that reserve extra clusters (such as snapshots,
-          * LUKS header, or persistent bitmaps), because it completely
-          * empties the image.  Furthermore, the L1 table and three
-          * additional clusters (image header, refcount table, one
--         * refcount block) have to fit inside one refcount block. */
-+         * refcount block) have to fit inside one refcount block. It
-+         * only resets the image file, i.e. does not work with an
-+         * external data file. */
-         return make_completely_empty(bs);
-     }
---
-.20.1

-[Qemu-devel] [PULL 17/27] block/qcow2: use buffer-based io
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow2.c | 9 ++-------
-file changed, 2 insertions(+), 7 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 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
-                             uint64_t bytes, QEMUIOVector *qiov)
- {
-     BDRVQcow2State *s = bs->opaque;
--    QEMUIOVector hd_qiov;
-     int ret;
-     ssize_t out_len;
-     uint8_t *buf, *out_buf;
-@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
-         goto fail;
-     }
--    qemu_iovec_init_buf(&hd_qiov, out_buf, out_len);
--
-     BLKDBG_EVENT(s->data_file, BLKDBG_WRITE_COMPRESSED);
--    ret = bdrv_co_pwritev(s->data_file, cluster_offset, out_len, &hd_qiov, 0);
-+    ret = bdrv_co_pwrite(s->data_file, cluster_offset, out_len, out_buf, 0);
-     if (ret < 0) {
-         goto fail;
-     }
-@@ -XXX,XX +XXX,XX @@ qcow2_co_preadv_compressed(BlockDriverState *bs,
-     int ret = 0, csize, nb_csectors;
-     uint64_t coffset;
-     uint8_t *buf, *out_buf;
--    QEMUIOVector local_qiov;
-     int offset_in_cluster = offset_into_cluster(s, offset);
-     coffset = file_cluster_offset & s->cluster_offset_mask;
-@@ -XXX,XX +XXX,XX @@ qcow2_co_preadv_compressed(BlockDriverState *bs,
-     if (!buf) {
-         return -ENOMEM;
-     }
--    qemu_iovec_init_buf(&local_qiov, buf, csize);
-     out_buf = qemu_blockalign(bs, s->cluster_size);
-     BLKDBG_EVENT(bs->file, BLKDBG_READ_COMPRESSED);
--    ret = bdrv_co_preadv(bs->file, coffset, csize, &local_qiov, 0);
-+    ret = bdrv_co_pread(bs->file, coffset, csize, buf, 0);
-     if (ret < 0) {
-         goto fail;
-     }
---
-.20.1

-[Qemu-devel] [PULL 18/27] block/qcow: use buffer-based io
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow.c | 19 ++++++-------------
-file changed, 6 insertions(+), 13 deletions(-)
-diff --git a/block/qcow.c b/block/qcow.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow.c
-+++ b/block/qcow.c
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_preadv(BlockDriverState *bs, uint64_t offset,
-     int offset_in_cluster;
-     int ret = 0, n;
-     uint64_t cluster_offset;
--    QEMUIOVector hd_qiov;
-     uint8_t *buf;
-     void *orig_buf;
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_preadv(BlockDriverState *bs, uint64_t offset,
-         if (!cluster_offset) {
-             if (bs->backing) {
-                 /* read from the base image */
--                qemu_iovec_init_buf(&hd_qiov, buf, n);
-                 qemu_co_mutex_unlock(&s->lock);
-                 /* qcow2 emits this on bs->file instead of bs->backing */
-                 BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
--                ret = bdrv_co_preadv(bs->backing, offset, n, &hd_qiov, 0);
-+                ret = bdrv_co_pread(bs->backing, offset, n, buf, 0);
-                 qemu_co_mutex_lock(&s->lock);
-                 if (ret < 0) {
-                     break;
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_preadv(BlockDriverState *bs, uint64_t offset,
-                 ret = -EIO;
-                 break;
-             }
--            qemu_iovec_init_buf(&hd_qiov, buf, n);
-             qemu_co_mutex_unlock(&s->lock);
-             BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
--            ret = bdrv_co_preadv(bs->file, cluster_offset + offset_in_cluster,
--                                 n, &hd_qiov, 0);
-+            ret = bdrv_co_pread(bs->file, cluster_offset + offset_in_cluster,
-+                                n, buf, 0);
-             qemu_co_mutex_lock(&s->lock);
-             if (ret < 0) {
-                 break;
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_pwritev(BlockDriverState *bs, uint64_t offset,
-     int offset_in_cluster;
-     uint64_t cluster_offset;
-     int ret = 0, n;
--    QEMUIOVector hd_qiov;
-     uint8_t *buf;
-     void *orig_buf;
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_pwritev(BlockDriverState *bs, uint64_t offset,
-             }
-         }
--        qemu_iovec_init_buf(&hd_qiov, buf, n);
-         qemu_co_mutex_unlock(&s->lock);
-         BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
--        ret = bdrv_co_pwritev(bs->file, cluster_offset + offset_in_cluster,
--                              n, &hd_qiov, 0);
-+        ret = bdrv_co_pwrite(bs->file, cluster_offset + offset_in_cluster,
-+                             n, buf, 0);
-         qemu_co_mutex_lock(&s->lock);
-         if (ret < 0) {
-             break;
-@@ -XXX,XX +XXX,XX @@ qcow_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
-                            uint64_t bytes, QEMUIOVector *qiov)
- {
-     BDRVQcowState *s = bs->opaque;
--    QEMUIOVector hd_qiov;
-     z_stream strm;
-     int ret, out_len;
-     uint8_t *buf, *out_buf;
-@@ -XXX,XX +XXX,XX @@ qcow_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
-     }
-     cluster_offset &= s->cluster_offset_mask;
--    qemu_iovec_init_buf(&hd_qiov, out_buf, out_len);
-     BLKDBG_EVENT(bs->file, BLKDBG_WRITE_COMPRESSED);
--    ret = bdrv_co_pwritev(bs->file, cluster_offset, out_len, &hd_qiov, 0);
-+    ret = bdrv_co_pwrite(bs->file, cluster_offset, out_len, out_buf, 0);
-     if (ret < 0) {
-         goto fail;
-     }
---
-.20.1

-[Qemu-devel] [PULL 19/27] block/qed: use buffer-based io
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Move to _co_ versions of io functions qed_read_table() and
-qed_write_table(), as we use qemu_co_mutex_unlock()
-anyway.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qed-table.c | 12 +++++-------
- block/qed.c       |  6 ++----
-files changed, 7 insertions(+), 11 deletions(-)
-diff --git a/block/qed-table.c b/block/qed-table.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qed-table.c
-+++ b/block/qed-table.c
-@@ -XXX,XX +XXX,XX @@
- /* Called with table_lock held.  */
- static int qed_read_table(BDRVQEDState *s, uint64_t offset, QEDTable *table)
- {
--    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(
--        qiov, table->offsets, s->header.cluster_size * s->header.table_size);
-+    unsigned int bytes = s->header.cluster_size * s->header.table_size;
-+
-     int noffsets;
-     int i, ret;
-     trace_qed_read_table(s, offset, table);
-     qemu_co_mutex_unlock(&s->table_lock);
--    ret = bdrv_preadv(s->bs->file, offset, &qiov);
-+    ret = bdrv_co_pread(s->bs->file, offset, bytes, table->offsets, 0);
-     qemu_co_mutex_lock(&s->table_lock);
-     if (ret < 0) {
-         goto out;
-     }
-     /* Byteswap offsets */
--    noffsets = qiov.size / sizeof(uint64_t);
-+    noffsets = bytes / sizeof(uint64_t);
-     for (i = 0; i < noffsets; i++) {
-         table->offsets[i] = le64_to_cpu(table->offsets[i]);
-     }
-@@ -XXX,XX +XXX,XX @@ static int qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
-     unsigned int sector_mask = BDRV_SECTOR_SIZE / sizeof(uint64_t) - 1;
-     unsigned int start, end, i;
-     QEDTable *new_table;
--    QEMUIOVector qiov;
-     size_t len_bytes;
-     int ret;
-@@ -XXX,XX +XXX,XX @@ static int qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
-     len_bytes = (end - start) * sizeof(uint64_t);
-     new_table = qemu_blockalign(s->bs, len_bytes);
--    qemu_iovec_init_buf(&qiov, new_table->offsets, len_bytes);
-     /* Byteswap table */
-     for (i = start; i < end; i++) {
-@@ -XXX,XX +XXX,XX @@ static int qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
-     offset += start * sizeof(uint64_t);
-     qemu_co_mutex_unlock(&s->table_lock);
--    ret = bdrv_pwritev(s->bs->file, offset, &qiov);
-+    ret = bdrv_co_pwrite(s->bs->file, offset, len_bytes, new_table->offsets, 0);
-     qemu_co_mutex_lock(&s->table_lock);
-     trace_qed_write_table_cb(s, table, flush, ret);
-     if (ret < 0) {
-diff --git a/block/qed.c b/block/qed.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qed.c
-+++ b/block/qed.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qed_write_header(BDRVQEDState *s)
-     int nsectors = DIV_ROUND_UP(sizeof(QEDHeader), BDRV_SECTOR_SIZE);
-     size_t len = nsectors * BDRV_SECTOR_SIZE;
-     uint8_t *buf;
--    QEMUIOVector qiov;
-     int ret;
-     assert(s->allocating_acb || s->allocating_write_reqs_plugged);
-     buf = qemu_blockalign(s->bs, len);
--    qemu_iovec_init_buf(&qiov, buf, len);
--    ret = bdrv_co_preadv(s->bs->file, 0, qiov.size, &qiov, 0);
-+    ret = bdrv_co_pread(s->bs->file, 0, len, buf, 0);
-     if (ret < 0) {
-         goto out;
-     }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qed_write_header(BDRVQEDState *s)
-     /* Update header */
-     qed_header_cpu_to_le(&s->header, (QEDHeader *) buf);
--    ret = bdrv_co_pwritev(s->bs->file, 0, qiov.size,  &qiov, 0);
-+    ret = bdrv_co_pwrite(s->bs->file, 0, len,  buf, 0);
-     if (ret < 0) {
-         goto out;
-     }
---
-.20.1

-[Qemu-devel] [PULL 20/27] block/parallels: use buffer-based io
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/parallels.c | 14 ++++++--------
-file changed, 6 insertions(+), 8 deletions(-)
-diff --git a/block/parallels.c b/block/parallels.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/parallels.c
-+++ b/block/parallels.c
-@@ -XXX,XX +XXX,XX @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num,
-     if (bs->backing) {
-         int64_t nb_cow_sectors = to_allocate * s->tracks;
-         int64_t nb_cow_bytes = nb_cow_sectors << BDRV_SECTOR_BITS;
--        QEMUIOVector qiov =
--            QEMU_IOVEC_INIT_BUF(qiov, qemu_blockalign(bs, nb_cow_bytes),
--                                nb_cow_bytes);
-+        void *buf = qemu_blockalign(bs, nb_cow_bytes);
--        ret = bdrv_co_preadv(bs->backing, idx * s->tracks * BDRV_SECTOR_SIZE,
--                             nb_cow_bytes, &qiov, 0);
-+        ret = bdrv_co_pread(bs->backing, idx * s->tracks * BDRV_SECTOR_SIZE,
-+                            nb_cow_bytes, buf, 0);
-         if (ret < 0) {
--            qemu_vfree(qemu_iovec_buf(&qiov));
-+            qemu_vfree(buf);
-             return ret;
-         }
-         ret = bdrv_co_pwritev(bs->file, s->data_end * BDRV_SECTOR_SIZE,
--                              nb_cow_bytes, &qiov, 0);
--        qemu_vfree(qemu_iovec_buf(&qiov));
-+                              nb_cow_bytes, buf, 0);
-+        qemu_vfree(buf);
-         if (ret < 0) {
-             return ret;
-         }
---
-.20.1

-[Qemu-devel] [PULL 21/27] block/backup: use buffer-based io
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/backup.c | 14 ++++++--------
-file changed, 6 insertions(+), 8 deletions(-)
-diff --git a/block/backup.c b/block/backup.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/backup.c
-+++ b/block/backup.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
-                                                       void **bounce_buffer)
- {
-     int ret;
--    QEMUIOVector qiov;
-     BlockBackend *blk = job->common.blk;
-     int nbytes;
-     int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
-     if (!*bounce_buffer) {
-         *bounce_buffer = blk_blockalign(blk, job->cluster_size);
-     }
--    qemu_iovec_init_buf(&qiov, *bounce_buffer, nbytes);
--    ret = blk_co_preadv(blk, start, qiov.size, &qiov, read_flags);
-+    ret = blk_co_pread(blk, start, nbytes, *bounce_buffer, read_flags);
-     if (ret < 0) {
-         trace_backup_do_cow_read_fail(job, start, ret);
-         if (error_is_read) {
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
-         goto fail;
-     }
--    if (qemu_iovec_is_zero(&qiov)) {
-+    if (buffer_is_zero(*bounce_buffer, nbytes)) {
-         ret = blk_co_pwrite_zeroes(job->target, start,
--                                   qiov.size, write_flags | BDRV_REQ_MAY_UNMAP);
-+                                   nbytes, write_flags | BDRV_REQ_MAY_UNMAP);
-     } else {
--        ret = blk_co_pwritev(job->target, start,
--                             qiov.size, &qiov, write_flags |
--                             (job->compress ? BDRV_REQ_WRITE_COMPRESSED : 0));
-+        ret = blk_co_pwrite(job->target, start,
-+                            nbytes, *bounce_buffer, write_flags |
-+                            (job->compress ? BDRV_REQ_WRITE_COMPRESSED : 0));
-     }
-     if (ret < 0) {
-         trace_backup_do_cow_write_fail(job, start, ret);
---
-.20.1

-[Qemu-devel] [PULL 22/27] block/commit: use buffer-based io
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/commit.c | 5 ++---
-file changed, 2 insertions(+), 3 deletions(-)
-diff --git a/block/commit.c b/block/commit.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/commit.c
-+++ b/block/commit.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn commit_populate(BlockBackend *bs, BlockBackend *base,
-                                         void *buf)
- {
-     int ret = 0;
--    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
-     assert(bytes < SIZE_MAX);
--    ret = blk_co_preadv(bs, offset, qiov.size, &qiov, 0);
-+    ret = blk_co_pread(bs, offset, bytes, buf, 0);
-     if (ret < 0) {
-         return ret;
-     }
--    ret = blk_co_pwritev(base, offset, qiov.size, &qiov, 0);
-+    ret = blk_co_pwrite(base, offset, bytes, buf, 0);
-     if (ret < 0) {
-         return ret;
-     }
---
-.20.1

The following changes since commit 22d96eac64877c4d96f9928babb6f2fcc68faacf:

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2019-04-29 19:11:15 +0100)

are available in the Git repository at:

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

for you to fetch changes up to 54277a2aab876aba7b55c7e88e2b372691849741:

block/qed: add missed coroutine_fn markers (2019-04-30 15:29:00 +0200)

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

- iotests: Fix output of qemu-io related tests
- Don't ignore bdrv_set_aio_context() for nodes with bs->drv = NUL
- vmdk: Set vmdk parent backing_format to vmdk
- qcow2: Preallocation fixes (especially for external data files)
- Add linear-buffer-based APIs (as wrappers around qiov-based ones)
- Various code cleanups and small corner case fixes

----------------------------------------------------------------
Alberto Garcia (3):
      qcow2: Fix error handling in the compression code
      commit: Make base read-only if there is an early failure
      iotests: Check that images are in read-only mode after block-commit

Eric Blake (2):
      cutils: Fix size_to_str() on 32-bit platforms
      qemu-img: Saner printing of large file sizes

Kevin Wolf (5):
      block: Fix AioContext switch for bs->drv == NULL
      qcow2: Avoid COW during metadata preallocation
      qcow2: Add errp to preallocate_co()
      qcow2: Fix full preallocation with external data file
      qcow2: Fix qcow2_make_empty() with external data file

Max Reitz (2):
      iotests: Perform the correct test in 082
      qemu-img: Make create hint at protocol options

Sam Eiderman (1):
      vmdk: Set vmdk parent backing_format to vmdk

Stefano Garzarella (2):
      block/vhdx: Remove redundant IEC binary prefixes definition
      block/vhdx: Use IEC binary prefixes for size constants

Thomas Huth (1):
      tests/qemu-iotests: Fix output of qemu-io related tests

Vladimir Sementsov-Ogievskiy (10):
      block: introduce byte-based io helpers
      block/qcow2: use buffer-based io
      block/qcow: use buffer-based io
      block/qed: use buffer-based io
      block/parallels: use buffer-based io
      block/backup: use buffer-based io
      block/commit: use buffer-based io
      block/stream: use buffer-based io
      qemu-img: use buffer-based io
      block/qed: add missed coroutine_fn markers

Zhengui li (1):
      vpc: unlock Coroutine lock to make IO submit Concurrently

From: Thomas Huth <thuth@redhat.com>

One of the recent commits changed the way qemu-io prints out its
errors and warnings - they are now prefixed with the program name.
We've got to adapt the iotests accordingly to prevent that they
are failing.

Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/026.out | 168 ++++++++++++++++++-------------------
 tests/qemu-iotests/060.out |   6 +-
 tests/qemu-iotests/069.out |   2 +-
 tests/qemu-iotests/070.out |   2 +-
 tests/qemu-iotests/075.out |  14 ++--
 tests/qemu-iotests/076.out |   6 +-
 tests/qemu-iotests/078.out |  12 +--
 tests/qemu-iotests/080.out |  40 ++++-----
 tests/qemu-iotests/081.out |   2 +-
 tests/qemu-iotests/088.out |  12 +--
 tests/qemu-iotests/103.out |  14 ++--
 tests/qemu-iotests/114.out |   2 +-
 tests/qemu-iotests/116.out |  14 ++--
 tests/qemu-iotests/131.out |   2 +-
 tests/qemu-iotests/133.out |  30 +++----
 tests/qemu-iotests/137.out |  28 +++----
 tests/qemu-iotests/140.out |   2 +-
 tests/qemu-iotests/143.out |   2 +-
 tests/qemu-iotests/153.out |  30 +++----
 tests/qemu-iotests/187.out |   6 +-
 tests/qemu-iotests/188.out |   2 +-
 tests/qemu-iotests/197.out |   2 +-
 tests/qemu-iotests/205     |   2 +-
 tests/qemu-iotests/215.out |   2 +-
 tests/qemu-iotests/226.out |  16 ++--
 tests/qemu-iotests/244.out |  10 +--
 26 files changed, 214 insertions(+), 214 deletions(-)

diff --git a/tests/qemu-iotests/026.out b/tests/qemu-iotests/026.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/026.out
+++ b/tests/qemu-iotests/026.out
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l1_update; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 
 1 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l1_update; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 
 1 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l1_update; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 1 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l1_update; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 1 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l2_update; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 
 127 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l2_update; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 
 127 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l2_update; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 127 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l2_update; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 127 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l2_alloc_write; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 
 1 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l2_alloc_write; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 1 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: write_aio; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: write_aio; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: write_aio; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: write_aio; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_load; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_load; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_load; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_load; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_update_part; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_update_part; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_update_part; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_update_part; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 55 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 251 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc_write; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc_write; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 10 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 23 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 10 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 23 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 10 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 23 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l1_grow_write_table; errno: 5; imm: off; once: off
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l1_grow_write_table; errno: 28; imm: off; once: off
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l1_grow_activate_table; errno: 5; imm: off; once: off
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 
 96 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l1_grow_activate_table; errno: 28; imm: off; once: off
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 96 leaked clusters were found on the image.
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 @@ Format specific information:
     lazy refcounts: false
     refcount bits: 16
     corrupt: true
-can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
+qemu-io: can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
 no file open, try 'help open'
 read 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 === Testing zero refcount table size ===
 
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
 ERROR cluster 0 refcount=0 reference=1
 ERROR cluster 3 refcount=0 reference=1
 Rebuilding refcount structure
@@ -XXX,XX +XXX,XX @@ Can't get refcount for cluster 2: Input/output error
 Can't get refcount for cluster 3: Input/output error
 Rebuilding refcount structure
 Repairing cluster 1 refcount=1 reference=0
-can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
 --- Repairing ---
 Leaked cluster 1 refcount=1 reference=0
 Repairing cluster 1 refcount=1 reference=0
diff --git a/tests/qemu-iotests/069.out b/tests/qemu-iotests/069.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/069.out
+++ b/tests/qemu-iotests/069.out
@@ -XXX,XX +XXX,XX @@ QA output created by 069
 
 Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file=TEST_DIR/t.IMGFMT.base
-can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
 *** done
diff --git a/tests/qemu-iotests/070.out b/tests/qemu-iotests/070.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/070.out
+++ b/tests/qemu-iotests/070.out
@@ -XXX,XX +XXX,XX @@
 QA output created by 070
 
 === Verify open image read-only fails, due to dirty log ===
-can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
+qemu-io: can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
 To replay the log, run:
 qemu-img check -r all 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx'
 === Verify open image replays log  ===
diff --git a/tests/qemu-iotests/075.out b/tests/qemu-iotests/075.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/075.out
+++ b/tests/qemu-iotests/075.out
@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 1048064
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 == block_size must be a multiple of 512 ==
-can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
 
 == block_size cannot be zero ==
-can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
 
 == huge block_size ===
-can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
 
 == offsets_size overflow ===
-can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
 
 == refuse images that require too many offsets ===
-can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
 
 == refuse images with non-monotonically increasing offsets ==
-can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
 
 == refuse images with invalid compressed block size ==
-can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
 *** done
diff --git a/tests/qemu-iotests/076.out b/tests/qemu-iotests/076.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/076.out
+++ b/tests/qemu-iotests/076.out
@@ -XXX,XX +XXX,XX @@ read 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 == Negative catalog size ==
-can't open device TEST_DIR/parallels-v1: Catalog too large
+qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
 
 == Overflow in catalog allocation ==
-can't open device TEST_DIR/parallels-v1: Catalog too large
+qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
 
 == Zero sectors per track ==
-can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
+qemu-io: can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
 
 == Read from a valid v2 image ==
 read 65536/65536 bytes at offset 0
diff --git a/tests/qemu-iotests/078.out b/tests/qemu-iotests/078.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/078.out
+++ b/tests/qemu-iotests/078.out
@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 == Negative catalog size ==
-can't open device TEST_DIR/empty.bochs: Catalog size is too large
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
 
 == Overflow for catalog size * sizeof(uint32_t) ==
-can't open device TEST_DIR/empty.bochs: Catalog size is too large
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
 
 == Too small catalog bitmap for image size ==
-can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
-can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
 
 == Negative extent size ==
-can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
+qemu-io: can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
 
 == Zero extent size ==
-can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
+qemu-io: can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
 *** done
diff --git a/tests/qemu-iotests/080.out b/tests/qemu-iotests/080.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/080.out
+++ b/tests/qemu-iotests/080.out
@@ -XXX,XX +XXX,XX @@ QA output created by 080
 
 == Huge header size ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
-can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
+qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
+qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
 
 == Huge unknown header extension ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Invalid backing file offset
-can't open device TEST_DIR/t.qcow2: Header extension too large
-can't open device TEST_DIR/t.qcow2: Header extension too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Invalid backing file offset
+qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
 
 == Huge refcount table size ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Reference count table too large
-can't open device TEST_DIR/t.qcow2: Reference count table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
 
 == Misaligned refcount table ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
 
 == Huge refcount offset ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
 
 == Invalid snapshot table ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Snapshot table too large
-can't open device TEST_DIR/t.qcow2: Snapshot table too large
-can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
-can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
 
 == Hitting snapshot table size limit ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 0
 
 == Invalid L1 table ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Active L1 table too large
-can't open device TEST_DIR/t.qcow2: Active L1 table too large
-can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
-can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
 
 == Invalid L1 table (with internal snapshot in the image) ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': L1 table is too small
 
 == Invalid backing file size ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Backing file name too long
+qemu-io: can't open device TEST_DIR/t.qcow2: Backing file name too long
 
 == Invalid L2 entry (huge physical offset) ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 0
 qemu-img: Failed to load snapshot: Snapshot L1 table offset invalid
 qemu-img: Snapshot L1 table offset invalid
 qemu-img: Failed to turn zero into data clusters: Invalid argument
-Failed to flush the refcount block cache: Invalid argument
+qemu-io: Failed to flush the refcount block cache: Invalid argument
 write failed: Invalid argument
 qemu-img: Snapshot L1 table offset invalid
 qemu-img: Could not apply snapshot 'test': Failed to load snapshot: Invalid argument
@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 0
 qemu-img: Failed to load snapshot: Snapshot L1 table too large
 qemu-img: Snapshot L1 table too large
 qemu-img: Failed to turn zero into data clusters: File too large
-Failed to flush the refcount block cache: File too large
+qemu-io: Failed to flush the refcount block cache: File too large
 write failed: File too large
 qemu-img: Snapshot L1 table too large
 qemu-img: Could not apply snapshot 'test': Failed to load snapshot: File too large
diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/081.out
+++ b/tests/qemu-iotests/081.out
@@ -XXX,XX +XXX,XX @@ read 10485760/10485760 bytes at offset 0
 10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 == checking the blkverify mode with invalid settings ==
-can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
+qemu-io: can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
 
 == dynamically adding a child to a quorum ==
 Testing:
diff --git a/tests/qemu-iotests/088.out b/tests/qemu-iotests/088.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/088.out
+++ b/tests/qemu-iotests/088.out
@@ -XXX,XX +XXX,XX @@ QA output created by 088
 
 == Invalid block size ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.vpc: Invalid block size 0
-can't open device TEST_DIR/t.vpc: Invalid block size 0
-can't open device TEST_DIR/t.vpc: Invalid block size 128
-can't open device TEST_DIR/t.vpc: Invalid block size 128
-can't open device TEST_DIR/t.vpc: Invalid block size 305419896
-can't open device TEST_DIR/t.vpc: Invalid block size 305419896
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
 *** done
diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/103.out
+++ b/tests/qemu-iotests/103.out
@@ -XXX,XX +XXX,XX @@ wrote 65536/65536 bytes at offset 0
 
 === Testing invalid option combinations ===
 
-can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
-can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
-can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
-can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
-can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
+qemu-io: can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
+qemu-io: can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
+qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
 
 === Testing valid option combinations ===
 
diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/114.out
+++ b/tests/qemu-iotests/114.out
@@ -XXX,XX +XXX,XX @@ virtual size: 64M (67108864 bytes)
 cluster_size: 65536
 backing file: TEST_DIR/t.IMGFMT.base
 backing file format: foo
-can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
 no file open, try 'help open'
 read 4096/4096 bytes at offset 0
 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
diff --git a/tests/qemu-iotests/116.out b/tests/qemu-iotests/116.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/116.out
+++ b/tests/qemu-iotests/116.out
@@ -XXX,XX +XXX,XX @@ QA output created by 116
 
 == truncated header cluster ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
 
 == invalid header magic ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Image not in QED format
+qemu-io: can't open device TEST_DIR/t.qed: Image not in QED format
 
 == invalid cluster size ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
 
 == invalid table size ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
 
 == invalid header size ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
 
 == invalid L1 table offset ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
 
 == invalid image size ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
 *** done
diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/131.out
+++ b/tests/qemu-iotests/131.out
@@ -XXX,XX +XXX,XX @@ read 32768/32768 bytes at offset 163840
 read 32768/32768 bytes at offset 0
 32 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 == Corrupt image ==
-can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
+qemu-io: can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
 ERROR image was not closed correctly
 
 1 errors were found on the image.
diff --git a/tests/qemu-iotests/133.out b/tests/qemu-iotests/133.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/133.out
+++ b/tests/qemu-iotests/133.out
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t
 
 === Check that node-name can't be changed ===
 
-Cannot change the option 'node-name'
-Cannot change the option 'node-name'
-Cannot change the option 'node-name'
+qemu-io: Cannot change the option 'node-name'
+qemu-io: Cannot change the option 'node-name'
+qemu-io: Cannot change the option 'node-name'
 
 === Check that unchanged node-name is okay ===
 
 
 === Check that driver can't be changed ===
 
-Cannot change the option 'driver'
-Cannot change the option 'driver'
-Cannot change the option 'driver'
+qemu-io: Cannot change the option 'driver'
+qemu-io: Cannot change the option 'driver'
+qemu-io: Cannot change the option 'driver'
 
 === Check that unchanged driver is okay ===
 
@@ -XXX,XX +XXX,XX @@ format name: null-co
 
 === Check that mixing -c/-r/-w and their corresponding options is forbidden ===
 
-Cannot set both -r/-w and 'read-only'
-Cannot set both -r/-w and 'read-only'
-Cannot set both -c and the cache options
-Cannot set both -c and the cache options
-Cannot set both -c and the cache options
+qemu-io: Cannot set both -r/-w and 'read-only'
+qemu-io: Cannot set both -r/-w and 'read-only'
+qemu-io: Cannot set both -c and the cache options
+qemu-io: Cannot set both -c and the cache options
+qemu-io: Cannot set both -c and the cache options
 
 === Check that invalid options are handled correctly ===
 
-Parameter 'read-only' expects 'on' or 'off'
-Parameter 'cache.no-flush' expects 'on' or 'off'
-Parameter 'cache.direct' expects 'on' or 'off'
-Parameter 'auto-read-only' expects 'on' or 'off'
+qemu-io: Parameter 'read-only' expects 'on' or 'off'
+qemu-io: Parameter 'cache.no-flush' expects 'on' or 'off'
+qemu-io: Parameter 'cache.direct' expects 'on' or 'off'
+qemu-io: Parameter 'auto-read-only' expects 'on' or 'off'
 *** done
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 @@ read 33554432/33554432 bytes at offset 0
 
 === Try setting some invalid values ===
 
-Parameter 'lazy-refcounts' expects 'on' or 'off'
-cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
-l2-cache-size may not exceed cache-size
-refcount-cache-size may not exceed cache-size
-L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-Refcount cache size too big
-Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
-Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
-Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
-Cache clean interval too big
+qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
+qemu-io: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
+qemu-io: l2-cache-size may not exceed cache-size
+qemu-io: refcount-cache-size may not exceed cache-size
+qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: Refcount cache size too big
+qemu-io: Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
+qemu-io: Cache clean interval too big
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=36028797018963968
-L2 cache size too big
+qemu-io: L2 cache size too big
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 
 === Test transaction semantics ===
 
-Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
 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                  ( if [ "${VALGRIND_QEMU}" == "y" ]; then
@@ -XXX,XX +XXX,XX @@ incompatible_features     0x0
 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)
-Parameter 'lazy-refcounts' expects 'on' or 'off'
+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
 write failed: Input/output error
 *** done
diff --git a/tests/qemu-iotests/140.out b/tests/qemu-iotests/140.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/140.out
+++ b/tests/qemu-iotests/140.out
@@ -XXX,XX +XXX,XX @@ wrote 65536/65536 bytes at offset 0
 read 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 {"return": {}}
-can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
+qemu-io: can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
 server reported: export 'drv' not present
 {"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
diff --git a/tests/qemu-iotests/143.out b/tests/qemu-iotests/143.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/143.out
+++ b/tests/qemu-iotests/143.out
@@ -XXX,XX +XXX,XX @@
 QA output created by 143
 {"return": {}}
 {"return": {}}
-can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
+qemu-io: can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
 server reported: export 'no_such_export' not present
 {"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/153.out
+++ b/tests/qemu-iotests/153.out
@@ -XXX,XX +XXX,XX @@ Is another process using the image [TEST_DIR/t.qcow2]?
 == Running utility commands  ==
 
 _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
 Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
 Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_io_wrapper -c open  TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
 Is another process using the image [TEST_DIR/t.qcow2]?
 no file open, try 'help open'
 
 _qemu_io_wrapper -c open -r  TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
 Is another process using the image [TEST_DIR/t.qcow2]?
 no file open, try 'help open'
 
@@ -XXX,XX +XXX,XX @@ file format: IMGFMT
 == Running utility commands -U ==
 
 _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
 
 _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
 
 _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
 no file open, try 'help open'
 
 _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
@@ -XXX,XX +XXX,XX @@ Is another process using the image [TEST_DIR/t.qcow2]?
 == Running utility commands  ==
 
 _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
 Is another process using the image [TEST_DIR/t.qcow2]?
 
 _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
 
 _qemu_io_wrapper -c open  TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
 Is another process using the image [TEST_DIR/t.qcow2]?
 no file open, try 'help open'
 
@@ -XXX,XX +XXX,XX @@ file format: IMGFMT
 == Running utility commands -U ==
 
 _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
 
 _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
 
 _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
 no file open, try 'help open'
 
 _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
@@ -XXX,XX +XXX,XX @@ file format: IMGFMT
 == Running utility commands -U ==
 
 _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
 
 _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
 
 _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
 no file open, try 'help open'
 
 _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
@@ -XXX,XX +XXX,XX @@ Adding drive
 {"return": "OKrn"}
 
 _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
 Is another process using the image [TEST_DIR/t.qcow2]?
 Creating overlay with qemu-img when the guest is running should be allowed
 
@@ -XXX,XX +XXX,XX @@ _qemu_img_wrapper info TEST_DIR/t.qcow2
 {"return": ""}
 
 _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
 Is another process using the image [TEST_DIR/t.qcow2]?
 Closing the other
 {"return": ""}
@@ -XXX,XX +XXX,XX @@ qemu-img: --force-share/-U conflicts with image options
 No conflict:
 
 Conflict:
--U conflicts with image options
+qemu-io: -U conflicts with image options
 *** done
diff --git a/tests/qemu-iotests/187.out b/tests/qemu-iotests/187.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/187.out
+++ b/tests/qemu-iotests/187.out
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 
 Start from read-only
 
-Block node is read-only
+qemu-io: Block node is read-only
 wrote 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-Block node is read-only
+qemu-io: Block node is read-only
 
 Start from read-write
 
 wrote 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-Block node is read-only
+qemu-io: Block node is read-only
 wrote 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 *** done
diff --git a/tests/qemu-iotests/188.out b/tests/qemu-iotests/188.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/188.out
+++ b/tests/qemu-iotests/188.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)
 
 == verify open failure with wrong password ==
-can't open: Invalid password, cannot unlock any keyslot
+qemu-io: can't open: Invalid password, cannot unlock any keyslot
 *** done
diff --git a/tests/qemu-iotests/197.out b/tests/qemu-iotests/197.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/197.out
+++ b/tests/qemu-iotests/197.out
@@ -XXX,XX +XXX,XX @@ read 2147483136/2147483136 bytes at offset 1024
 2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 read 1024/1024 bytes at offset 3221226496
 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
+qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
 2 GiB (0x80010000) bytes     allocated at offset 0 bytes (0x0)
 1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
 64 KiB (0x10000) bytes     allocated at offset 3 GiB (0xc0000000)
diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/205
+++ b/tests/qemu-iotests/205
@@ -XXX,XX +XXX,XX @@ class TestNbdServerRemove(iotests.QMPTestCase):
 
     def assertConnectFailed(self, qemu_io_output):
         self.assertEqual(filter_qemu_io(qemu_io_output).strip(),
-                         "can't open device " + nbd_uri +
+                         "qemu-io: can't open device " + nbd_uri +
                          ": Requested export not available\n"
                          "server reported: export 'exp' not present")
 
diff --git a/tests/qemu-iotests/215.out b/tests/qemu-iotests/215.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/215.out
+++ b/tests/qemu-iotests/215.out
@@ -XXX,XX +XXX,XX @@ read 2147483136/2147483136 bytes at offset 1024
 2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 read 1024/1024 bytes at offset 3221226496
 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
+qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
 2 GiB (0x80010000) bytes     allocated at offset 0 bytes (0x0)
 1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
 64 KiB (0x10000) bytes     allocated at offset 3 GiB (0xc0000000)
diff --git a/tests/qemu-iotests/226.out b/tests/qemu-iotests/226.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/226.out
+++ b/tests/qemu-iotests/226.out
@@ -XXX,XX +XXX,XX @@ QA output created by 226
 === Testing with driver:file ===
 
 == Testing RO ==
-can't open: A regular file was expected by the 'file' driver, but something else was given
-warning: Opening a character device as a file using the 'file' driver is deprecated
+qemu-io: can't open: A regular file was expected by the 'file' driver, but something else was given
+qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
 == Testing RW ==
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
-warning: Opening a character device as a file using the 'file' driver is deprecated
+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
+qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
 
 === Testing with driver:host_device ===
 
 == Testing RO ==
-can't open: 'host_device' driver expects either a character or block device
+qemu-io: can't open: 'host_device' driver expects either a character or block device
 == Testing RW ==
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
 
 === Testing with driver:host_cdrom ===
 
 == Testing RO ==
-can't open: 'host_cdrom' driver expects either a character or block device
+qemu-io: can't open: 'host_cdrom' driver expects either a character or block device
 == Testing RW ==
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
 
 *** done
diff --git a/tests/qemu-iotests/244.out b/tests/qemu-iotests/244.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/244.out
+++ b/tests/qemu-iotests/244.out
@@ -XXX,XX +XXX,XX @@ read 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 read 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
 no file open, try 'help open'
 
 Data file required, but without data file name in the image:
-can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
+qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
 no file open, try 'help open'
 read 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
 no file open, try 'help open'
 
 Setting data-file for an image with internal data:
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
+qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
 no file open, try 'help open'
-can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
 no file open, try 'help open'
 
 === Conflicting features ===
-- 
2.20.1

Even for block nodes with bs->drv == NULL, we can't just ignore a
bdrv_set_aio_context() call. Leaving the node in its old context can
mean that it's still in an iothread context in bdrv_close_all() during
shutdown, resulting in an attempted unlock of the AioContext lock which
we don't hold.

This is an example stack trace of a related crash:

#0  0x00007ffff59da57f in raise () at /lib64/libc.so.6
 #1  0x00007ffff59c4895 in abort () at /lib64/libc.so.6
 #2  0x0000555555b97b1e in error_exit (err=<optimized out>, msg=msg@entry=0x555555d386d0 <__func__.19059> "qemu_mutex_unlock_impl") at util/qemu-thread-posix.c:36
 #3  0x0000555555b97f7f in qemu_mutex_unlock_impl (mutex=mutex@entry=0x5555568002f0, file=file@entry=0x555555d378df "util/async.c", line=line@entry=507) at util/qemu-thread-posix.c:97
 #4  0x0000555555b92f55 in aio_context_release (ctx=ctx@entry=0x555556800290) at util/async.c:507
 #5  0x0000555555b05cf8 in bdrv_prwv_co (child=child@entry=0x7fffc80012f0, offset=offset@entry=131072, qiov=qiov@entry=0x7fffffffd4f0, is_write=is_write@entry=true, flags=flags@entry=0)
         at block/io.c:833
 #6  0x0000555555b060a9 in bdrv_pwritev (qiov=0x7fffffffd4f0, offset=131072, child=0x7fffc80012f0) at block/io.c:990
 #7  0x0000555555b060a9 in bdrv_pwrite (child=0x7fffc80012f0, offset=131072, buf=<optimized out>, bytes=<optimized out>) at block/io.c:990
 #8  0x0000555555ae172b in qcow2_cache_entry_flush (bs=bs@entry=0x555556810680, c=c@entry=0x5555568cc740, i=i@entry=0) at block/qcow2-cache.c:51
 #9  0x0000555555ae18dd in qcow2_cache_write (bs=bs@entry=0x555556810680, c=0x5555568cc740) at block/qcow2-cache.c:248
 #10 0x0000555555ae15de in qcow2_cache_flush (bs=0x555556810680, c=<optimized out>) at block/qcow2-cache.c:259
 #11 0x0000555555ae16b1 in qcow2_cache_flush_dependency (c=0x5555568a1700, c=0x5555568a1700, bs=0x555556810680) at block/qcow2-cache.c:194
 #12 0x0000555555ae16b1 in qcow2_cache_entry_flush (bs=bs@entry=0x555556810680, c=c@entry=0x5555568a1700, i=i@entry=0) at block/qcow2-cache.c:194
 #13 0x0000555555ae18dd in qcow2_cache_write (bs=bs@entry=0x555556810680, c=0x5555568a1700) at block/qcow2-cache.c:248
 #14 0x0000555555ae15de in qcow2_cache_flush (bs=bs@entry=0x555556810680, c=<optimized out>) at block/qcow2-cache.c:259
 #15 0x0000555555ad242c in qcow2_inactivate (bs=bs@entry=0x555556810680) at block/qcow2.c:2124
 #16 0x0000555555ad2590 in qcow2_close (bs=0x555556810680) at block/qcow2.c:2153
 #17 0x0000555555ab0c62 in bdrv_close (bs=0x555556810680) at block.c:3358
 #18 0x0000555555ab0c62 in bdrv_delete (bs=0x555556810680) at block.c:3542
 #19 0x0000555555ab0c62 in bdrv_unref (bs=0x555556810680) at block.c:4598
 #20 0x0000555555af4d72 in blk_remove_bs (blk=blk@entry=0x5555568103d0) at block/block-backend.c:785
 #21 0x0000555555af4dbb in blk_remove_all_bs () at block/block-backend.c:483
 #22 0x0000555555aae02f in bdrv_close_all () at block.c:3412
 #23 0x00005555557f9796 in main (argc=<optimized out>, argv=<optimized out>, envp=<optimized out>) at vl.c:4776

The reproducer I used is a qcow2 image on gluster volume, where the
virtual disk size (4 GB) is larger than the gluster volume size (64M),
so we can easily trigger an ENOSPC. This backend is assigned to a
virtio-blk device using an iothread, and then from the guest a
'dd if=/dev/zero of=/dev/vda bs=1G count=1' causes the VM to stop
because of an I/O error. qemu_gluster_co_flush_to_disk() sets
bs->drv = NULL on error, so when virtio-blk stops the dataplane, the
block nodes stay in the iothread AioContext. A 'quit' monitor command
issued from this paused state crashes the process.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1631227
Cc: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
---
 block.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void bdrv_detach_aio_context(BlockDriverState *bs)
     BdrvAioNotifier *baf, *baf_tmp;
     BdrvChild *child;
 
-    if (!bs->drv) {
-        return;
-    }
-
     assert(!bs->walking_aio_notifiers);
     bs->walking_aio_notifiers = true;
     QLIST_FOREACH_SAFE(baf, &bs->aio_notifiers, list, baf_tmp) {
@@ -XXX,XX +XXX,XX @@ void bdrv_detach_aio_context(BlockDriverState *bs)
      */
     bs->walking_aio_notifiers = false;
 
-    if (bs->drv->bdrv_detach_aio_context) {
+    if (bs->drv && bs->drv->bdrv_detach_aio_context) {
         bs->drv->bdrv_detach_aio_context(bs);
     }
     QLIST_FOREACH(child, &bs->children, next) {
@@ -XXX,XX +XXX,XX @@ void bdrv_attach_aio_context(BlockDriverState *bs,
     BdrvAioNotifier *ban, *ban_tmp;
     BdrvChild *child;
 
-    if (!bs->drv) {
-        return;
-    }
-
     if (bs->quiesce_counter) {
         aio_disable_external(new_context);
     }
@@ -XXX,XX +XXX,XX @@ void bdrv_attach_aio_context(BlockDriverState *bs,
     QLIST_FOREACH(child, &bs->children, next) {
         bdrv_attach_aio_context(child->bs, new_context);
     }
-    if (bs->drv->bdrv_attach_aio_context) {
+    if (bs->drv && bs->drv->bdrv_attach_aio_context) {
         bs->drv->bdrv_attach_aio_context(bs, new_context);
     }
 
-- 
2.20.1

From: Zhengui li <lizhengui@huawei.com>

Concurrent IO becomes serial IO because of the qemu Coroutine lock,
which reduce IO performance severely.

So unlock Coroutine lock before bdrv_co_pwritev and
bdrv_co_preadv to fix it.

Signed-off-by: Zhengui li <lizhengui@huawei.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/vpc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/block/vpc.c b/block/vpc.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -XXX,XX +XXX,XX @@ vpc_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
             qemu_iovec_reset(&local_qiov);
             qemu_iovec_concat(&local_qiov, qiov, bytes_done, n_bytes);
 
+            qemu_co_mutex_unlock(&s->lock);
             ret = bdrv_co_preadv(bs->file, image_offset, n_bytes,
                                  &local_qiov, 0);
+            qemu_co_mutex_lock(&s->lock);
             if (ret < 0) {
                 goto fail;
             }
@@ -XXX,XX +XXX,XX @@ vpc_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
         qemu_iovec_reset(&local_qiov);
         qemu_iovec_concat(&local_qiov, qiov, bytes_done, n_bytes);
 
+        qemu_co_mutex_unlock(&s->lock);
         ret = bdrv_co_pwritev(bs->file, image_offset, n_bytes,
                               &local_qiov, 0);
+        qemu_co_mutex_lock(&s->lock);
         if (ret < 0) {
             goto fail;
         }
-- 
2.20.1

From: Sam Eiderman <shmuel.eiderman@oracle.com>

Commit b69864e5a ("vmdk: Support version=3 in VMDK descriptor files")
fixed the probe function to correctly guess vmdk descriptors with
version=3.

This solves the issue where vmdk snapshot with parent vmdk descriptor
containing "version=3" would be treated as raw instead vmdk.

In the future case where a new vmdk version is introduced, we will again
experience this issue, even if the user will provide "-f vmdk" it will
only apply to the tip image and not to the underlying "misprobed" parent
image.

The code in vmdk.c already assumes that the backing file of vmdk must be
vmdk (see vmdk_is_cid_valid which returns 0 if backing file is not
vmdk).

So let's make it official by supplying the backing_format as vmdk.

Reviewed-by: Mark Kanda <mark.kanda@oracle.com>
Reviewed-By: Liran Alon <liran.alon@oracle.com>
Reviewed-by: Arbel Moshe <arbel.moshe@oracle.com>
Signed-off-by: Shmuel Eiderman <shmuel.eiderman@oracle.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Fam Zheng <fam@euphon.net>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/vmdk.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/block/vmdk.c b/block/vmdk.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -XXX,XX +XXX,XX @@ static int vmdk_parent_open(BlockDriverState *bs)
         pstrcpy(bs->auto_backing_file, end_name - p_name + 1, p_name);
         pstrcpy(bs->backing_file, sizeof(bs->backing_file),
                 bs->auto_backing_file);
+        pstrcpy(bs->backing_format, sizeof(bs->backing_format),
+                "vmdk");
     }
 
 out:
-- 
2.20.1

From: Stefano Garzarella <sgarzare@redhat.com>

IEC binary prefixes are already defined in "qemu/units.h",
so we can remove redundant definitions in "block/vhdx.h".

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/vhdx.h | 6 +-----
 block/vhdx.c | 3 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/block/vhdx.h b/block/vhdx.h
index XXXXXXX..XXXXXXX 100644
--- a/block/vhdx.h
+++ b/block/vhdx.h
@@ -XXX,XX +XXX,XX @@
 
 #ifndef BLOCK_VHDX_H
 #define BLOCK_VHDX_H
-
-#define KiB              (1 * 1024)
-#define MiB            (KiB * 1024)
-#define GiB            (MiB * 1024)
-#define TiB ((uint64_t) GiB * 1024)
+#include "qemu/units.h"
 
 #define DEFAULT_LOG_SIZE 1048576 /* 1MiB */
 /* Structures and fields present in the VHDX file */
diff --git a/block/vhdx.c b/block/vhdx.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts,
         return -EINVAL;
     }
     if (block_size > VHDX_BLOCK_SIZE_MAX) {
-        error_setg(errp, "Block size must not exceed %d", VHDX_BLOCK_SIZE_MAX);
+        error_setg(errp, "Block size must not exceed %" PRId64,
+                   VHDX_BLOCK_SIZE_MAX);
         return -EINVAL;
     }
 
-- 
2.20.1

From: Stefano Garzarella <sgarzare@redhat.com>

Using IEC binary prefixes in order to make the code more readable,
with the exception of DEFAULT_LOG_SIZE because it's passed to
stringify().

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/vhdx.h     | 10 ++++++----
 block/vhdx-log.c |  2 +-
 block/vhdx.c     |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/block/vhdx.h b/block/vhdx.h
index XXXXXXX..XXXXXXX 100644
--- a/block/vhdx.h
+++ b/block/vhdx.h
@@ -XXX,XX +XXX,XX @@
 #include "qemu/units.h"
 
 #define DEFAULT_LOG_SIZE 1048576 /* 1MiB */
+/* Note: can't use 1 * MiB, because it's passed to stringify() */
+
 /* Structures and fields present in the VHDX file */
 
 /* The header section has the following blocks,
@@ -XXX,XX +XXX,XX @@
  * 0.........64KB...........128KB........192KB..........256KB................1MB
  */
 
-#define VHDX_HEADER_BLOCK_SIZE      (64 * 1024)
+#define VHDX_HEADER_BLOCK_SIZE      (64 * KiB)
 
 #define VHDX_FILE_ID_OFFSET         0
 #define VHDX_HEADER1_OFFSET         (VHDX_HEADER_BLOCK_SIZE * 1)
@@ -XXX,XX +XXX,XX @@ typedef struct QEMU_PACKED MSGUID {
 #define guid_eq(a, b) \
     (memcmp(&(a), &(b), sizeof(MSGUID)) == 0)
 
-#define VHDX_HEADER_SIZE (4 * 1024)   /* although the vhdx_header struct in disk
+#define VHDX_HEADER_SIZE (4 * KiB)    /* although the vhdx_header struct in disk
                                          is only 582 bytes, for purposes of crc
                                          the header is the first 4KB of the 64KB
                                          block */
@@ -XXX,XX +XXX,XX @@ typedef struct QEMU_PACKED VHDXRegionTableEntry {
 
 
 /* ---- LOG ENTRY STRUCTURES ---- */
-#define VHDX_LOG_MIN_SIZE (1024 * 1024)
-#define VHDX_LOG_SECTOR_SIZE 4096
+#define VHDX_LOG_MIN_SIZE (1 * MiB)
+#define VHDX_LOG_SECTOR_SIZE (4 * KiB)
 #define VHDX_LOG_HDR_SIZE 64
 #define VHDX_LOG_SIGNATURE 0x65676f6c
 typedef struct QEMU_PACKED VHDXLogEntryHeader {
diff --git a/block/vhdx-log.c b/block/vhdx-log.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vhdx-log.c
+++ b/block/vhdx-log.c
@@ -XXX,XX +XXX,XX @@ static int vhdx_log_flush(BlockDriverState *bs, BDRVVHDXState *s,
         }
         if (file_length < desc_entries->hdr.last_file_offset) {
             new_file_size = desc_entries->hdr.last_file_offset;
-            if (new_file_size % (1024*1024)) {
+            if (new_file_size % (1 * MiB)) {
                 /* round up to nearest 1MB boundary */
                 new_file_size = QEMU_ALIGN_UP(new_file_size, MiB);
                 if (new_file_size > INT64_MAX) {
diff --git a/block/vhdx.c b/block/vhdx.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -XXX,XX +XXX,XX @@ static int vhdx_allocate_block(BlockDriverState *bs, BDRVVHDXState *s,
     *new_offset = current_len;
 
     /* per the spec, the address for a block is in units of 1MB */
-    *new_offset = ROUND_UP(*new_offset, 1024 * 1024);
+    *new_offset = ROUND_UP(*new_offset, 1 * MiB);
     if (*new_offset > INT64_MAX) {
         return -EINVAL;
     }
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int vhdx_co_writev(BlockDriverState *bs, int64_t sector_num,
             case PAYLOAD_BLOCK_FULLY_PRESENT:
                 /* if the file offset address is in the header zone,
                  * there is a problem */
-                if (sinfo.file_offset < (1024 * 1024)) {
+                if (sinfo.file_offset < (1 * MiB)) {
                     ret = -EFAULT;
                     goto error_bat_restore;
                 }
-- 
2.20.1

From: Eric Blake <eblake@redhat.com>

Disk sizes close to INT64_MAX cause overflow, for some pretty
ridiculous output:

$ ./nbdkit -U - memory size=$((2**63 - 512)) --run 'qemu-img info $nbd'
  image: nbd+unix://?socket=/tmp/nbdkitHSAzNz/socket
  file format: raw
  virtual size: -8388607T (9223372036854775296 bytes)
  disk size: unavailable

But there's no reason to have two separate implementations of integer
to human-readable abbreviation, where one has overflow and stops at
'T', while the other avoids overflow and goes all the way to 'E'. With
this patch, the output now claims 8EiB instead of -8388607T, which
really is the correct rounding of largest file size supported by qemu
(we could go 511 bytes larger if we used byte-accurate sizing instead
of rounding up to the next sector boundary, but that wouldn't change
the human-readable result).

Quite a few iotests need updates to expected output to match.

Reported-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Tested-by: Richard W.M. Jones <rjones@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Tested-by: Max Reitz <mreitz@redhat.com>
---
 block/qapi.c               | 49 +++++++++-----------------------------
 tests/qemu-iotests/043.out |  6 ++---
 tests/qemu-iotests/053.out |  2 +-
 tests/qemu-iotests/059.out | 10 ++++----
 tests/qemu-iotests/060.out | 10 ++++----
 tests/qemu-iotests/061.out | 12 +++++-----
 tests/qemu-iotests/070.out |  2 +-
 tests/qemu-iotests/082.out | 26 ++++++++++----------
 tests/qemu-iotests/084.out |  8 +++----
 tests/qemu-iotests/089.out |  2 +-
 tests/qemu-iotests/095.out |  4 ++--
 tests/qemu-iotests/104.out |  6 ++---
 tests/qemu-iotests/110.out |  6 ++---
 tests/qemu-iotests/114.out |  2 +-
 tests/qemu-iotests/126.out |  4 ++--
 tests/qemu-iotests/130.out | 10 ++++----
 tests/qemu-iotests/153.out |  2 +-
 tests/qemu-iotests/191.out |  8 +++----
 tests/qemu-iotests/195.out |  4 ++--
 tests/qemu-iotests/198.out |  4 ++--
 tests/qemu-iotests/206.out | 10 ++++----
 tests/qemu-iotests/207.out | 12 +++++-----
 tests/qemu-iotests/210.out |  8 +++----
 tests/qemu-iotests/211.out | 10 ++++----
 tests/qemu-iotests/212.out | 10 ++++----
 tests/qemu-iotests/213.out | 10 ++++----
 tests/qemu-iotests/233.out |  4 ++--
 tests/qemu-iotests/237.out | 22 ++++++++---------
 tests/qemu-iotests/242.out | 10 ++++----
 29 files changed, 123 insertions(+), 150 deletions(-)

diff --git a/block/qapi.c b/block/qapi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -XXX,XX +XXX,XX @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes,
     return head;
 }
 
-#define NB_SUFFIXES 4
-
-static char *get_human_readable_size(char *buf, int buf_size, int64_t size)
-{
-    static const char suffixes[NB_SUFFIXES] = {'K', 'M', 'G', 'T'};
-    int64_t base;
-    int i;
-
-    if (size <= 999) {
-        snprintf(buf, buf_size, "%" PRId64, size);
-    } else {
-        base = 1024;
-        for (i = 0; i < NB_SUFFIXES; i++) {
-            if (size < (10 * base)) {
-                snprintf(buf, buf_size, "%0.1f%c",
-                         (double)size / base,
-                         suffixes[i]);
-                break;
-            } else if (size < (1000 * base) || i == (NB_SUFFIXES - 1)) {
-                snprintf(buf, buf_size, "%" PRId64 "%c",
-                         ((size + (base >> 1)) / base),
-                         suffixes[i]);
-                break;
-            }
-            base = base * 1024;
-        }
-    }
-    return buf;
-}
-
 void bdrv_snapshot_dump(QEMUSnapshotInfo *sn)
 {
-    char buf1[128], date_buf[128], clock_buf[128];
+    char date_buf[128], clock_buf[128];
     struct tm tm;
     time_t ti;
     int64_t secs;
+    char *sizing = NULL;
 
     if (!sn) {
         qemu_printf("%-10s%-20s%7s%20s%15s",
@@ -XXX,XX +XXX,XX @@ void bdrv_snapshot_dump(QEMUSnapshotInfo *sn)
                  (int)((secs / 60) % 60),
                  (int)(secs % 60),
                  (int)((sn->vm_clock_nsec / 1000000) % 1000));
+        sizing = size_to_str(sn->vm_state_size);
         qemu_printf("%-10s%-20s%7s%20s%15s",
                     sn->id_str, sn->name,
-                    get_human_readable_size(buf1, sizeof(buf1),
-                                            sn->vm_state_size),
+                    sizing,
                     date_buf,
                     clock_buf);
     }
+    g_free(sizing);
 }
 
 static void dump_qdict(int indentation, QDict *dict);
@@ -XXX,XX +XXX,XX @@ void bdrv_image_info_specific_dump(ImageInfoSpecific *info_spec)
 
 void bdrv_image_info_dump(ImageInfo *info)
 {
-    char size_buf[128], dsize_buf[128];
+    char *size_buf, *dsize_buf;
     if (!info->has_actual_size) {
-        snprintf(dsize_buf, sizeof(dsize_buf), "unavailable");
+        dsize_buf = g_strdup("unavailable");
     } else {
-        get_human_readable_size(dsize_buf, sizeof(dsize_buf),
-                                info->actual_size);
+        dsize_buf = size_to_str(info->actual_size);
     }
-    get_human_readable_size(size_buf, sizeof(size_buf), info->virtual_size);
+    size_buf = size_to_str(info->virtual_size);
     qemu_printf("image: %s\n"
                 "file format: %s\n"
                 "virtual size: %s (%" PRId64 " bytes)\n"
@@ -XXX,XX +XXX,XX @@ void bdrv_image_info_dump(ImageInfo *info)
                 info->filename, info->format, size_buf,
                 info->virtual_size,
                 dsize_buf);
+    g_free(size_buf);
+    g_free(dsize_buf);
 
     if (info->has_encrypted && info->encrypted) {
         qemu_printf("encrypted: yes\n");
diff --git a/tests/qemu-iotests/043.out b/tests/qemu-iotests/043.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/043.out
+++ b/tests/qemu-iotests/043.out
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/
 == finite chain of length 3 (human) ==
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 65536
 backing file: TEST_DIR/t.IMGFMT.2.base
 
 image: TEST_DIR/t.IMGFMT.2.base
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 65536
 backing file: TEST_DIR/t.IMGFMT.1.base
 
 image: TEST_DIR/t.IMGFMT.1.base
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 65536
 
 == finite chain of length 3 (json) ==
diff --git a/tests/qemu-iotests/053.out b/tests/qemu-iotests/053.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/053.out
+++ b/tests/qemu-iotests/053.out
@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 0
 No errors were found on the image.
 
 == Checking compressed image virtual disk size ==
-virtual size: 512 (512 bytes)
+virtual size: 512 B (512 bytes)
 
 == Verifying the compressed image ==
 read 512/512 bytes at offset 0
diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/059.out
+++ b/tests/qemu-iotests/059.out
@@ -XXX,XX +XXX,XX @@ can't open device TEST_DIR/t.vmdk: L1 size too big
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 2.0G (2147483648 bytes)
+virtual size: 2 GiB (2147483648 bytes)
 
 === Testing monolithicFlat with zeroed_grain ===
 qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicF
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000 subformat=twoGbMaxExtentFlat
 image: TEST_DIR/t.vmdk
 file format: vmdk
-virtual size: 1.0T (1073741824000 bytes)
-disk size: 16K
+virtual size: 0.977 TiB (1073741824000 bytes)
+disk size: 16 KiB
 Format specific information:
     cid: XXXXXXXX
     parent cid: XXXXXXXX
@@ -XXX,XX +XXX,XX @@ can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"i
 === Testing version 3 ===
 image: TEST_DIR/iotest-version3.IMGFMT
 file format: IMGFMT
-virtual size: 16G (17179869184 bytes)
+virtual size: 16 GiB (17179869184 bytes)
 cluster_size: 65536
 read 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 64931328
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4398046511104 subformat=monolithicFlat
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 4.0T (4398046511104 bytes)
+virtual size: 4 TiB (4398046511104 bytes)
 wrote 512/512 bytes at offset 966367641600
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 e100000000:  0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a  ................
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 @@ write failed: Input/output error
 incompatible_features     0x2
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 qcow2: Marking image as corrupt: Refblock at 0xffffff00000000 is not covered by the refcount structures; further corruption events will be suppressed
 qemu-img: Failed to discard unused refblocks: Input/output error
 --- Checking and retrying ---
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 No errors were found on the image.
 Image resized.
-virtual size: 32M (33554432 bytes)
+virtual size: 32 MiB (33554432 bytes)
 
 === Discarding a non-covered in-bounds refblock ===
 
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 qcow2: Marking image as corrupt: Refblock at 0x1000000000 is not covered by the refcount structures; further corruption events will be suppressed
 qemu-img: Failed to discard unused refblocks: Input/output error
 --- Checking and retrying ---
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 No errors were found on the image.
 Image resized.
-virtual size: 32M (33554432 bytes)
+virtual size: 32 MiB (33554432 bytes)
 
 === Discarding a refblock covered by an unaligned refblock ===
 
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 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 data_file=TEST_DIR/t.IM
 qemu-img: Cannot downgrade an image with a data file
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 data_file=TEST_DIR/t.IM
 qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Could not open 'foo': No such file or directory
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Format specific information:
 qemu-img: Could not open 'TEST_DIR/t.IMGFMT': 'data-file' is required for this image
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Format specific information:
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 data_file=TEST_DIR/t.IMGFMT.data data_file_raw=on
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Format specific information:
 No errors were found on the image.
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 qemu-img: data-file-raw cannot be set on existing images
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
diff --git a/tests/qemu-iotests/070.out b/tests/qemu-iotests/070.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/070.out
+++ b/tests/qemu-iotests/070.out
@@ -XXX,XX +XXX,XX @@ read 18874368/18874368 bytes at offset 0
 === Verify image created by Disk2VHD can be opened ===
 image: TEST_DIR/test-disk2vhd.IMGFMT
 file format: IMGFMT
-virtual size: 256M (268435456 bytes)
+virtual size: 256 MiB (268435456 bytes)
 cluster_size: 2097152
 *** done
diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/082.out
+++ b/tests/qemu-iotests/082.out
@@ -XXX,XX +XXX,XX @@ Testing: create -f foo -f qcow2 TEST_DIR/t.qcow2 128M
 Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 65536
 
 Testing: create -f qcow2 -o cluster_size=4k -o lazy_refcounts=on TEST_DIR/t.qcow2 128M
 Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=4096 lazy_refcounts=on refcount_bits=16
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 4096
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Testing: create -f qcow2 -o cluster_size=4k -o lazy_refcounts=on -o cluster_size
 Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=8192 lazy_refcounts=on refcount_bits=16
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 8192
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Testing: create -f qcow2 -o cluster_size=4k,cluster_size=8k TEST_DIR/t.qcow2 128
 Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=8192 lazy_refcounts=off refcount_bits=16
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 8192
 
 === create: help for -o ===
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_
 Testing: convert -f foo -f qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 image: TEST_DIR/t.IMGFMT.base
 file format: raw
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 
 Testing: convert -O foo -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 image: TEST_DIR/t.IMGFMT.base
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 65536
 
 Testing: convert -O qcow2 -o cluster_size=4k -o lazy_refcounts=on TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 image: TEST_DIR/t.IMGFMT.base
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 4096
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Format specific information:
 Testing: convert -O qcow2 -o cluster_size=4k -o lazy_refcounts=on -o cluster_size=8k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 image: TEST_DIR/t.IMGFMT.base
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 8192
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Format specific information:
 Testing: convert -O qcow2 -o cluster_size=4k,cluster_size=8k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
 image: TEST_DIR/t.IMGFMT.base
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 8192
 
 === convert: help for -o ===
@@ -XXX,XX +XXX,XX @@ qemu-img: Cannot enable copy offloading when -c is used
 Testing: amend -f foo -f qcow2 -o lazy_refcounts=on TEST_DIR/t.qcow2
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Format specific information:
 Testing: amend -f qcow2 -o size=130M -o lazy_refcounts=off TEST_DIR/t.qcow2
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 130M (136314880 bytes)
+virtual size: 130 MiB (136314880 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Format specific information:
 Testing: amend -f qcow2 -o size=8M -o lazy_refcounts=on -o size=132M TEST_DIR/t.qcow2
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 132M (138412032 bytes)
+virtual size: 132 MiB (138412032 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Format specific information:
 Testing: amend -f qcow2 -o size=4M,size=148M TEST_DIR/t.qcow2
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 148M (155189248 bytes)
+virtual size: 148 MiB (155189248 bytes)
 cluster_size: 65536
 
 === amend: help for -o ===
diff --git a/tests/qemu-iotests/084.out b/tests/qemu-iotests/084.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/084.out
+++ b/tests/qemu-iotests/084.out
@@ -XXX,XX +XXX,XX @@ QA output created by 084
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 1048576
 disk image file size in bytes: 67109888
 
@@ -XXX,XX +XXX,XX @@ disk image file size in bytes: 67109888
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 1048576
 disk image file size in bytes: 1024
 Test 1: Maximum size (512 TB - 128 MB):
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 512T (562949819203584 bytes)
+virtual size: 512 TiB (562949819203584 bytes)
 cluster_size: 1048576
 
 Test 2: Size too large (512 TB - 128 MB + 64 kB)
@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': unsupported VDI image (too many bl
 Test 5: Valid Image: 64MB, Blocks In Image 64, Block Size 1MB
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 1048576
 
 Test 6: Block Size != 1MB; too small test (1MB - 1)
diff --git a/tests/qemu-iotests/089.out b/tests/qemu-iotests/089.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/089.out
+++ b/tests/qemu-iotests/089.out
@@ -XXX,XX +XXX,XX @@ read failed: Input/output error
 
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 
 === Testing option merging ===
diff --git a/tests/qemu-iotests/095.out b/tests/qemu-iotests/095.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/095.out
+++ b/tests/qemu-iotests/095.out
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=104857600 backing_file=TEST_DIR/
 === Base image info before commit and resize ===
 image: TEST_DIR/t.IMGFMT.base
 file format: IMGFMT
-virtual size: 5.0M (5242880 bytes)
+virtual size: 5 MiB (5242880 bytes)
 
 === Running QEMU Live Commit Test ===
 
@@ -XXX,XX +XXX,XX @@ virtual size: 5.0M (5242880 bytes)
 === Base image info after commit and resize ===
 image: TEST_DIR/t.IMGFMT.base
 file format: IMGFMT
-virtual size: 100M (104857600 bytes)
+virtual size: 100 MiB (104857600 bytes)
 *** done
diff --git a/tests/qemu-iotests/104.out b/tests/qemu-iotests/104.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/104.out
+++ b/tests/qemu-iotests/104.out
@@ -XXX,XX +XXX,XX @@ QA output created by 104
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1024
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 1.0K (1024 bytes)
+virtual size: 1 KiB (1024 bytes)
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1234
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 1.5K (1536 bytes)
-***done
+virtual size: 1.5 KiB (1536 bytes)
+*** 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 @@ Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.base
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 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}}
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
 
 === Backing name is always relative to the backed image ===
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b
 
 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}}
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 backing file: t.IMGFMT.base (cannot determine actual path)
 *** done
diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/114.out
+++ b/tests/qemu-iotests/114.out
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 backing file: TEST_DIR/t.IMGFMT.base
 backing file format: foo
diff --git a/tests/qemu-iotests/126.out b/tests/qemu-iotests/126.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/126.out
+++ b/tests/qemu-iotests/126.out
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/image:base.IMGFMT', fmt=IMGFMT size=67108864
 Formatting 'TEST_DIR/image:top.IMGFMT', fmt=IMGFMT size=67108864 backing_file=./image:base.IMGFMT
 image: TEST_DIR/image:top.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 backing file: ./image:base.IMGFMT (actual path: TEST_DIR/./image:base.IMGFMT)
 
 Formatting 'base.IMGFMT', fmt=IMGFMT size=67108864
 Formatting 'file:image:top.IMGFMT', fmt=IMGFMT size=67108864 backing_file=base.IMGFMT
 image: ./image:top.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 backing file: base.IMGFMT (actual path: ./base.IMGFMT)
 *** done
diff --git a/tests/qemu-iotests/130.out b/tests/qemu-iotests/130.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/130.out
+++ b/tests/qemu-iotests/130.out
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 
 === HMP commit ===
 
@@ -XXX,XX +XXX,XX @@ QEMU X.Y.Z monitor - type 'help' for more information
 (qemu) 
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.orig backing_fmt=raw
 QEMU X.Y.Z monitor - type 'help' for more information
 (qemu) commit testdisk
 (qemu) 
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 backing file: TEST_DIR/t.IMGFMT.orig
 backing file format: raw
 
@@ -XXX,XX +XXX,XX @@ wrote 4096/4096 bytes at offset 0
 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.orig backing_fmt=raw
 wrote 4096/4096 bytes at offset 0
 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 backing file: TEST_DIR/t.IMGFMT.orig
 backing file format: raw
 *** done
diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/153.out
+++ b/tests/qemu-iotests/153.out
@@ -XXX,XX +XXX,XX @@ _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
 No conflict:
 image: null-co://
 file format: null-co
-virtual size: 1.0G (1073741824 bytes)
+virtual size: 1 GiB (1073741824 bytes)
 disk size: unavailable
 
 Conflict:
diff --git a/tests/qemu-iotests/191.out b/tests/qemu-iotests/191.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/191.out
+++ b/tests/qemu-iotests/191.out
@@ -XXX,XX +XXX,XX @@ wrote 65536/65536 bytes at offset 1048576
 }
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 backing file: TEST_DIR/t.IMGFMT.base
 backing file format: IMGFMT
 image: TEST_DIR/t.IMGFMT.ovl2
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 backing file: TEST_DIR/t.IMGFMT.base
 backing file format: IMGFMT
@@ -XXX,XX +XXX,XX @@ wrote 65536/65536 bytes at offset 1048576
 }
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 backing file: TEST_DIR/t.IMGFMT.base
 backing file format: IMGFMT
 image: TEST_DIR/t.IMGFMT.ovl2
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 backing file: TEST_DIR/t.IMGFMT.base
 backing file format: IMGFMT
diff --git a/tests/qemu-iotests/195.out b/tests/qemu-iotests/195.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/195.out
+++ b/tests/qemu-iotests/195.out
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.IMGFMT,backing.node-name=mid
 
 image: TEST_DIR/t.IMGFMT.mid
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 backing file: /dev/null
 backing file format: IMGFMT
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.IMGFMT,node-name=top
 
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 backing file: /dev/null
 backing file format: IMGFMT
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
 == checking image base ==
 image: json:{"encrypt.key-secret": "sec0", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.base"}}
 file format: IMGFMT
-virtual size: 16M (16777216 bytes)
+virtual size: 16 MiB (16777216 bytes)
 Format specific information:
     encrypt:
         ivgen alg: plain64
@@ -XXX,XX +XXX,XX @@ Format specific information:
 == checking image layer ==
 image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}}
 file format: IMGFMT
-virtual size: 16M (16777216 bytes)
+virtual size: 16 MiB (16777216 bytes)
 backing file: TEST_DIR/t.IMGFMT.base
 Format specific information:
     encrypt:
diff --git a/tests/qemu-iotests/206.out b/tests/qemu-iotests/206.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/206.out
+++ b/tests/qemu-iotests/206.out
@@ -XXX,XX +XXX,XX @@
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 32M (33554432 bytes)
+virtual size: 32 MiB (33554432 bytes)
 cluster_size: 2097152
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 32M (33554432 bytes)
+virtual size: 32 MiB (33554432 bytes)
 cluster_size: 512
 backing file: TEST_IMG.base
 backing file format: IMGFMT
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 32M (33554432 bytes)
+virtual size: 32 MiB (33554432 bytes)
 encrypted: yes
 cluster_size: 65536
 Format specific information:
diff --git a/tests/qemu-iotests/207.out b/tests/qemu-iotests/207.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/207.out
+++ b/tests/qemu-iotests/207.out
@@ -XXX,XX +XXX,XX @@
 
 image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
 file format: IMGFMT
-virtual size: 4.0M (4194304 bytes)
+virtual size: 4 MiB (4194304 bytes)
 
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 4.0M (4194304 bytes)
+virtual size: 4 MiB (4194304 bytes)
 
 === Test host-key-check options ===
 
@@ -XXX,XX +XXX,XX @@ virtual size: 4.0M (4194304 bytes)
 
 image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
 file format: IMGFMT
-virtual size: 8.0M (8388608 bytes)
+virtual size: 8 MiB (8388608 bytes)
 
 {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"mode": "known_hosts"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 4194304}}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ virtual size: 8.0M (8388608 bytes)
 
 image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
 file format: IMGFMT
-virtual size: 4.0M (4194304 bytes)
+virtual size: 4 MiB (4194304 bytes)
 
 {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"hash": "wrong", "mode": "hash", "type": "md5"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 2097152}}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ Job failed: remote host key does not match host_key_check 'wrong'
 
 image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
 file format: IMGFMT
-virtual size: 8.0M (8388608 bytes)
+virtual size: 8 MiB (8388608 bytes)
 
 {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"hash": "wrong", "mode": "hash", "type": "sha1"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 2097152}}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ Job failed: remote host key does not match host_key_check 'wrong'
 
 image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
 file format: IMGFMT
-virtual size: 4.0M (4194304 bytes)
+virtual size: 4 MiB (4194304 bytes)
 
 === Invalid path and user ===
 
diff --git a/tests/qemu-iotests/210.out b/tests/qemu-iotests/210.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/210.out
+++ b/tests/qemu-iotests/210.out
@@ -XXX,XX +XXX,XX @@
 
 image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 encrypted: yes
 Format specific information:
     ivgen alg: plain64
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 encrypted: yes
 Format specific information:
     ivgen alg: plain64
@@ -XXX,XX +XXX,XX @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi
 
 image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
 file format: IMGFMT
-virtual size: 0 (0 bytes)
+virtual size: 0 B (0 bytes)
 encrypted: yes
 Format specific information:
     ivgen alg: plain64
@@ -XXX,XX +XXX,XX @@ Job failed: The requested file size is too large
 {"error": {"class": "GenericError", "desc": "Parameter 'size' expects a >0 size"}}
 image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
 file format: IMGFMT
-virtual size: 0 (0 bytes)
+virtual size: 0 B (0 bytes)
 encrypted: yes
 Format specific information:
     ivgen alg: plain64
diff --git a/tests/qemu-iotests/211.out b/tests/qemu-iotests/211.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/211.out
+++ b/tests/qemu-iotests/211.out
@@ -XXX,XX +XXX,XX @@
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 1048576
 
 [{ "start": 0, "length": 134217728, "depth": 0, "zero": true, "data": false}]
@@ -XXX,XX +XXX,XX @@ cluster_size: 1048576
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 1048576
 
 [{ "start": 0, "length": 67108864, "depth": 0, "zero": true, "data": false}]
@@ -XXX,XX +XXX,XX @@ cluster_size: 1048576
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 32M (33554432 bytes)
+virtual size: 32 MiB (33554432 bytes)
 cluster_size: 1048576
 
 [{ "start": 0, "length": 3072, "depth": 0, "zero": false, "data": true, "offset": 1024},
@@ -XXX,XX +XXX,XX @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 0 (0 bytes)
+virtual size: 0 B (0 bytes)
 cluster_size: 1048576
 
 === Maximum size ===
@@ -XXX,XX +XXX,XX @@ cluster_size: 1048576
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 512T (562949819203584 bytes)
+virtual size: 512 TiB (562949819203584 bytes)
 cluster_size: 1048576
 
 === Invalid sizes ===
diff --git a/tests/qemu-iotests/212.out b/tests/qemu-iotests/212.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/212.out
+++ b/tests/qemu-iotests/212.out
@@ -XXX,XX +XXX,XX @@
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 
 === Successful image creation (explicit defaults) ===
 
@@ -XXX,XX +XXX,XX @@ virtual size: 128M (134217728 bytes)
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 
 === Successful image creation (with non-default options) ===
 
@@ -XXX,XX +XXX,XX @@ virtual size: 64M (67108864 bytes)
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 32M (33554432 bytes)
+virtual size: 32 MiB (33554432 bytes)
 
 === Invalid BlockdevRef ===
 
@@ -XXX,XX +XXX,XX @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 0 (0 bytes)
+virtual size: 0 B (0 bytes)
 
 === Maximum size ===
 
@@ -XXX,XX +XXX,XX @@ virtual size: 0 (0 bytes)
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 4096T (4503599627369984 bytes)
+virtual size: 4 PiB (4503599627369984 bytes)
 
 === Invalid sizes ===
 
diff --git a/tests/qemu-iotests/213.out b/tests/qemu-iotests/213.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/213.out
+++ b/tests/qemu-iotests/213.out
@@ -XXX,XX +XXX,XX @@
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 128M (134217728 bytes)
+virtual size: 128 MiB (134217728 bytes)
 cluster_size: 8388608
 
 === Successful image creation (explicit defaults) ===
@@ -XXX,XX +XXX,XX @@ cluster_size: 8388608
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 8388608
 
 === Successful image creation (with non-default options) ===
@@ -XXX,XX +XXX,XX @@ cluster_size: 8388608
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 32M (33554432 bytes)
+virtual size: 32 MiB (33554432 bytes)
 cluster_size: 268435456
 
 === Invalid BlockdevRef ===
@@ -XXX,XX +XXX,XX @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 0 (0 bytes)
+virtual size: 0 B (0 bytes)
 cluster_size: 8388608
 
 === Maximum size ===
@@ -XXX,XX +XXX,XX @@ cluster_size: 8388608
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 64T (70368744177664 bytes)
+virtual size: 64 TiB (70368744177664 bytes)
 cluster_size: 67108864
 
 === Invalid sizes ===
diff --git a/tests/qemu-iotests/233.out b/tests/qemu-iotests/233.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/233.out
+++ b/tests/qemu-iotests/233.out
@@ -XXX,XX +XXX,XX @@ server reported: Option 0x8 not permitted before TLS
 == check TLS works ==
 image: nbd://127.0.0.1:PORT
 file format: nbd
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 disk size: unavailable
 image: nbd://127.0.0.1:PORT
 file format: nbd
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 disk size: unavailable
 exports available: 1
  export: ''
diff --git a/tests/qemu-iotests/237.out b/tests/qemu-iotests/237.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/237.out
+++ b/tests/qemu-iotests/237.out
@@ -XXX,XX +XXX,XX @@
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 5.0G (5368709120 bytes)
+virtual size: 5 GiB (5368709120 bytes)
 cluster_size: 65536
 Format specific information:
     cid: XXXXXXXXXX
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 64M (67108864 bytes)
+virtual size: 64 MiB (67108864 bytes)
 cluster_size: 65536
 Format specific information:
     cid: XXXXXXXXXX
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 32M (33554432 bytes)
+virtual size: 32 MiB (33554432 bytes)
 cluster_size: 65536
 Format specific information:
     cid: XXXXXXXXXX
@@ -XXX,XX +XXX,XX @@ Job failed: List of extents contains unused extents
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 512 (512 bytes)
+virtual size: 512 B (512 bytes)
 Format specific information:
     cid: XXXXXXXXXX
     parent cid: XXXXXXXXXX
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 512 (512 bytes)
+virtual size: 512 B (512 bytes)
 cluster_size: 65536
 Format specific information:
     cid: XXXXXXXXXX
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 1.0G (1073741824 bytes)
+virtual size: 1 GiB (1073741824 bytes)
 Format specific information:
     cid: XXXXXXXXXX
     parent cid: XXXXXXXXXX
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 1.0G (1073741824 bytes)
+virtual size: 1 GiB (1073741824 bytes)
 cluster_size: 65536
 Format specific information:
     cid: XXXXXXXXXX
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 2.0G (2147483648 bytes)
+virtual size: 2 GiB (2147483648 bytes)
 Format specific information:
     cid: XXXXXXXXXX
     parent cid: XXXXXXXXXX
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 2.0G (2147483648 bytes)
+virtual size: 2 GiB (2147483648 bytes)
 cluster_size: 65536
 Format specific information:
     cid: XXXXXXXXXX
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 5.0G (5368709120 bytes)
+virtual size: 5 GiB (5368709120 bytes)
 Format specific information:
     cid: XXXXXXXXXX
     parent cid: XXXXXXXXXX
@@ -XXX,XX +XXX,XX @@ Format specific information:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 5.0G (5368709120 bytes)
+virtual size: 5 GiB (5368709120 bytes)
 cluster_size: 65536
 Format specific information:
     cid: XXXXXXXXXX
diff --git a/tests/qemu-iotests/242.out b/tests/qemu-iotests/242.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/242.out
+++ b/tests/qemu-iotests/242.out
@@ -XXX,XX +XXX,XX @@ qemu-img info dump:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 1.0M (1048576 bytes)
+virtual size: 1 MiB (1048576 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ qemu-img info dump:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 1.0M (1048576 bytes)
+virtual size: 1 MiB (1048576 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ qemu-img info dump:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 1.0M (1048576 bytes)
+virtual size: 1 MiB (1048576 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ qemu-img info dump:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 1.0M (1048576 bytes)
+virtual size: 1 MiB (1048576 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
@@ -XXX,XX +XXX,XX @@ Unset the unknown bitmap flag '0x4' in the bitmap directory entry:
 
 image: TEST_IMG
 file format: IMGFMT
-virtual size: 1.0M (1048576 bytes)
+virtual size: 1 MiB (1048576 bytes)
 cluster_size: 65536
 Format specific information:
     compat: 1.1
-- 
2.20.1

Limiting the allocation to INT_MAX bytes isn't particularly clever
because it means that the final cluster will be a partial cluster which
will be completed through a COW operation. This results in unnecessary
data read and write requests which lead to an unwanted non-sparse
filesystem block for metadata preallocation.

Align the maximum allocation size down to the cluster size to avoid this
situation.

Cc: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 block/qcow2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
     bytes = new_length - offset;
 
     while (bytes) {
-        cur_bytes = MIN(bytes, INT_MAX);
+        cur_bytes = MIN(bytes, QEMU_ALIGN_DOWN(INT_MAX, s->cluster_size));
         ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,
                                          &host_offset, &meta);
         if (ret < 0) {
-- 
2.20.1

We'll add a bdrv_co_truncate() call in the next patch which can return
an Error that we don't want to discard. So add an errp parameter to
preallocate_co().

Cc: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 block/qcow2.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static int qcow2_set_up_encryption(BlockDriverState *bs,
  * Returns: 0 on success, -errno on failure.
  */
 static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
-                                       uint64_t new_length)
+                                       uint64_t new_length, Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
     uint64_t bytes;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
         ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,
                                          &host_offset, &meta);
         if (ret < 0) {
+            error_setg_errno(errp, -ret, "Allocating clusters failed");
             return ret;
         }
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
 
             ret = qcow2_alloc_cluster_link_l2(bs, meta);
             if (ret < 0) {
+                error_setg_errno(errp, -ret, "Mapping clusters failed");
                 qcow2_free_any_clusters(bs, meta->alloc_offset,
                                         meta->nb_clusters, QCOW2_DISCARD_NEVER);
                 return ret;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
         ret = bdrv_pwrite(s->data_file, (host_offset + cur_bytes) - 1,
                           &data, 1);
         if (ret < 0) {
+            error_setg_errno(errp, -ret, "Writing to EOF failed");
             return ret;
         }
     }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
         break;
 
     case PREALLOC_MODE_METADATA:
-        ret = preallocate_co(bs, old_length, offset);
+        ret = preallocate_co(bs, old_length, offset, errp);
         if (ret < 0) {
-            error_setg_errno(errp, -ret, "Preallocation failed");
             goto fail;
         }
         break;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
         /* With a data file, preallocation means just allocating the metadata
          * and forwarding the truncate request to the data file */
         if (has_data_file(bs)) {
-            ret = preallocate_co(bs, old_length, offset);
+            ret = preallocate_co(bs, old_length, offset, errp);
             if (ret < 0) {
-                error_setg_errno(errp, -ret, "Preallocation failed");
                 goto fail;
             }
             break;
-- 
2.20.1

preallocate_co() already gave the data file the full size without
forwarding the requested preallocation mode to the protocol. When
bdrv_co_truncate() was called later with the preallocation mode, the
file didn't actually grow any more, so the data file stayed unallocated
even if full preallocation was requested.

Pass the right preallocation mode to preallocate_co() and remove the
second bdrv_co_truncate() to fix this. As a side effect, the ugly
one-byte write in preallocate_co() is replaced with a truncate call,
now leaving the last block unallocated on the protocol level as it
should be.

Cc: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 block/qcow2.c | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static int qcow2_set_up_encryption(BlockDriverState *bs,
  * Returns: 0 on success, -errno on failure.
  */
 static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
-                                       uint64_t new_length, Error **errp)
+                                       uint64_t new_length, PreallocMode mode,
+                                       Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
     uint64_t bytes;
     uint64_t host_offset = 0;
+    int64_t file_length;
     unsigned int cur_bytes;
     int ret;
     QCowL2Meta *meta;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
      * all of the allocated clusters (otherwise we get failing reads after
      * EOF). Extend the image to the last allocated sector.
      */
-    if (host_offset != 0) {
-        uint8_t data = 0;
-        ret = bdrv_pwrite(s->data_file, (host_offset + cur_bytes) - 1,
-                          &data, 1);
+    file_length = bdrv_getlength(s->data_file->bs);
+    if (file_length < 0) {
+        error_setg_errno(errp, -file_length, "Could not get file size");
+        return file_length;
+    }
+
+    if (host_offset + cur_bytes > file_length) {
+        if (mode == PREALLOC_MODE_METADATA) {
+            mode = PREALLOC_MODE_OFF;
+        }
+        ret = bdrv_co_truncate(s->data_file, host_offset + cur_bytes, mode,
+                               errp);
         if (ret < 0) {
-            error_setg_errno(errp, -ret, "Writing to EOF failed");
             return ret;
         }
     }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
 
     switch (prealloc) {
     case PREALLOC_MODE_OFF:
+        if (has_data_file(bs)) {
+            ret = bdrv_co_truncate(s->data_file, offset, prealloc, errp);
+            if (ret < 0) {
+                goto fail;
+            }
+        }
         break;
 
     case PREALLOC_MODE_METADATA:
-        ret = preallocate_co(bs, old_length, offset, errp);
+        ret = preallocate_co(bs, old_length, offset, prealloc, errp);
         if (ret < 0) {
             goto fail;
         }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
         /* With a data file, preallocation means just allocating the metadata
          * and forwarding the truncate request to the data file */
         if (has_data_file(bs)) {
-            ret = preallocate_co(bs, old_length, offset, errp);
+            ret = preallocate_co(bs, old_length, offset, prealloc, errp);
             if (ret < 0) {
                 goto fail;
             }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
 
     bs->total_sectors = offset / BDRV_SECTOR_SIZE;
 
-    if (has_data_file(bs)) {
-        if (prealloc == PREALLOC_MODE_METADATA) {
-            prealloc = PREALLOC_MODE_OFF;
-        }
-        ret = bdrv_co_truncate(s->data_file, offset, prealloc, errp);
-        if (ret < 0) {
-            goto fail;
-        }
-    }
-
     /* write updated header.size */
     offset = cpu_to_be64(offset);
     ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, size),
-- 
2.20.1

From: Max Reitz <mreitz@redhat.com>

In the "amend" section of 082, we perform a single "convert" test
(namely "convert -o help").  That does not make sense, especially
because we have done exactly that "convert" test earlier in 082 already.

Replacing "convert" by "amend" yields an error, which is correct because
there is no point in "amend" having a default format.  The user has to
either specify the format, or give a file for qemu-img to probe.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/082     | 5 ++++-
 tests/qemu-iotests/082.out | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/082
+++ b/tests/qemu-iotests/082
@@ -XXX,XX +XXX,XX @@ run_qemu_img amend -f $IMGFMT -o backing_file="$TEST_IMG" -o ,, -o help "$TEST_I
 
 # Leave out everything that isn't needed
 run_qemu_img amend -f $IMGFMT -o help
-run_qemu_img convert -o help
+
+# amend requires specifying either a format explicitly, or a file
+# which it can probe
+run_qemu_img amend -o help
 
 # Try help option for a format that does not support amendment
 run_qemu_img amend -f bochs -o help
diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/082.out
+++ b/tests/qemu-iotests/082.out
@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
 
 Note that not all of these options may be amendable.
 
-Testing: convert -o help
-Supported options:
-  size=<size>            - Virtual disk size
+Testing: amend -o help
+qemu-img: Expecting one image file name
 
 Testing: amend -f bochs -o help
 qemu-img: Format driver 'bochs' does not support option amendment
-- 
2.20.1

From: Max Reitz <mreitz@redhat.com>

qemu-img create allows giving just a format and "-o help" to get a list
of the options supported by that format.  Users may not realize that the
protocol level may offer even more options, which they only get to see
by specifying a filename.

This patch adds a note to hint at that fact.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qemu-img.c                 | 13 ++++++++++++-
 tests/qemu-iotests/082.out | 20 ++++++++++++++++----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c
index XXXXXXX..XXXXXXX 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -XXX,XX +XXX,XX @@ static int print_block_option_help(const char *filename, const char *fmt)
         create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
     }
 
-    printf("Supported options:\n");
+    if (filename) {
+        printf("Supported options:\n");
+    } else {
+        printf("Supported %s options:\n", fmt);
+    }
     qemu_opts_print_help(create_opts, false);
     qemu_opts_free(create_opts);
+
+    if (!filename) {
+        printf("\n"
+               "The protocol level may support further options.\n"
+               "Specify the target filename to include those options.\n");
+    }
+
     return 0;
 }
 
diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/082.out
+++ b/tests/qemu-iotests/082.out
@@ -XXX,XX +XXX,XX @@ Testing: create -f qcow2 -o backing_file=TEST_DIR/t.qcow2 -o ,, -o help TEST_DIR
 qemu-img: Invalid option list: ,,
 
 Testing: create -f qcow2 -o help
-Supported options:
+Supported qcow2 options:
   backing_file=<str>     - File name of a base image
   backing_fmt=<str>      - Image format of the base image
   cluster_size=<size>    - qcow2 cluster size
@@ -XXX,XX +XXX,XX @@ Supported options:
   refcount_bits=<num>    - Width of a reference count entry in bits
   size=<size>            - Virtual disk size
 
+The protocol level may support further options.
+Specify the target filename to include those options.
+
 Testing: create -o help
-Supported options:
+Supported raw options:
   size=<size>            - Virtual disk size
 
+The protocol level may support further options.
+Specify the target filename to include those options.
+
 Testing: create -f bochs -o help
 qemu-img: Format driver 'bochs' does not support image creation
 
@@ -XXX,XX +XXX,XX @@ Testing: convert -O qcow2 -o backing_file=TEST_DIR/t.qcow2 -o ,, -o help TEST_DI
 qemu-img: Invalid option list: ,,
 
 Testing: convert -O qcow2 -o help
-Supported options:
+Supported qcow2 options:
   backing_file=<str>     - File name of a base image
   backing_fmt=<str>      - Image format of the base image
   cluster_size=<size>    - qcow2 cluster size
@@ -XXX,XX +XXX,XX @@ Supported options:
   refcount_bits=<num>    - Width of a reference count entry in bits
   size=<size>            - Virtual disk size
 
+The protocol level may support further options.
+Specify the target filename to include those options.
+
 Testing: convert -o help
-Supported options:
+Supported raw options:
   size=<size>            - Virtual disk size
 
+The protocol level may support further options.
+Specify the target filename to include those options.
+
 Testing: convert -O bochs -o help
 qemu-img: Format driver 'bochs' does not support image creation
 
-- 
2.20.1

make_completely_empty() is an optimisated path for bdrv_make_empty()
where completely new metadata is created inside the image file instead
of going through all clusters and discarding them. For an external data
file, however, we actually need to do discard operations on the data
file; just overwriting the qcow2 file doesn't get rid of the data.

The necessary slow path with an explicit discard operation already
exists for other cases. Use it for external data files, too.

Cc: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 block/qcow2.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static int qcow2_make_empty(BlockDriverState *bs)
 
     if (s->qcow_version >= 3 && !s->snapshots && !s->nb_bitmaps &&
         3 + l1_clusters <= s->refcount_block_size &&
-        s->crypt_method_header != QCOW_CRYPT_LUKS) {
+        s->crypt_method_header != QCOW_CRYPT_LUKS &&
+        !has_data_file(bs)) {
         /* The following function only works for qcow2 v3 images (it
          * requires the dirty flag) and only as long as there are no
          * features that reserve extra clusters (such as snapshots,
          * LUKS header, or persistent bitmaps), because it completely
          * empties the image.  Furthermore, the L1 table and three
          * additional clusters (image header, refcount table, one
-         * refcount block) have to fit inside one refcount block. */
+         * refcount block) have to fit inside one refcount block. It
+         * only resets the image file, i.e. does not work with an
+         * external data file. */
         return make_completely_empty(bs);
     }
 
-- 
2.20.1

From: Alberto Garcia <berto@igalia.com>

This patch fixes a few things in the way error codes are handled in
the qcow2 compression code:

a) qcow2_co_pwritev_compressed() expects qcow2_co_compress() to only
   return -1 or -2 on failure, but this is not correct. Since the
   change from qcow2_compress() to qcow2_co_compress() in commit
   ceb029cd6feccf9f7607 the new code can also return -EINVAL (although
   there does not seem to exist any code path that would cause that
   error in the current implementation).

b) -1 and -2 are ad-hoc error codes defined in qcow2_compress().
   This patch replaces them with standard constants from errno.h.

c) Both qcow2_compress() and qcow2_co_do_compress() return a negative
   value on failure, but qcow2_co_pwritev_compressed() stores the
   value in an unsigned data type.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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:
  * @src - source buffer, @src_size bytes
  *
  * Returns: compressed size on success
- *          -1 destination buffer is not enough to store compressed data
- *          -2 on any other error
+ *          -ENOMEM destination buffer is not enough to store compressed data
+ *          -EIO    on any other error
  */
 static ssize_t qcow2_compress(void *dest, size_t dest_size,
                               const void *src, size_t src_size)
@@ -XXX,XX +XXX,XX @@ static ssize_t qcow2_compress(void *dest, size_t dest_size,
     ret = deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED,
                        -12, 9, Z_DEFAULT_STRATEGY);
     if (ret != Z_OK) {
-        return -2;
+        return -EIO;
     }
 
     /* strm.next_in is not const in old zlib versions, such as those used on
@@ -XXX,XX +XXX,XX @@ static ssize_t qcow2_compress(void *dest, size_t dest_size,
     if (ret == Z_STREAM_END) {
         ret = dest_size - strm.avail_out;
     } else {
-        ret = (ret == Z_OK ? -1 : -2);
+        ret = (ret == Z_OK ? -ENOMEM : -EIO);
     }
 
     deflateEnd(&strm);
@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
     BDRVQcow2State *s = bs->opaque;
     QEMUIOVector hd_qiov;
     int ret;
-    size_t out_len;
+    ssize_t out_len;
     uint8_t *buf, *out_buf;
     uint64_t cluster_offset;
 
@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
 
     out_len = qcow2_co_compress(bs, out_buf, s->cluster_size - 1,
                                 buf, s->cluster_size);
-    if (out_len == -2) {
-        ret = -EINVAL;
-        goto fail;
-    } else if (out_len == -1) {
+    if (out_len == -ENOMEM) {
         /* could not compress: write normal cluster */
         ret = qcow2_co_pwritev(bs, offset, bytes, qiov, 0);
         if (ret < 0) {
             goto fail;
         }
         goto success;
+    } else if (out_len < 0) {
+        ret = -EINVAL;
+        goto fail;
     }
 
     qemu_co_mutex_lock(&s->lock);
-- 
2.20.1

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

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block_int.h      | 16 ++++++++++++++++
 include/sysemu/block-backend.h | 19 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/include/block/block_int.h b/include/block/block_int.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child,
     int64_t offset, unsigned int bytes, QEMUIOVector *qiov,
     BdrvRequestFlags flags);
 
+static inline int coroutine_fn bdrv_co_pread(BdrvChild *child,
+    int64_t offset, unsigned int bytes, void *buf, BdrvRequestFlags flags)
+{
+    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
+
+    return bdrv_co_preadv(child, offset, bytes, &qiov, flags);
+}
+
+static inline int coroutine_fn bdrv_co_pwrite(BdrvChild *child,
+    int64_t offset, unsigned int bytes, void *buf, BdrvRequestFlags flags)
+{
+    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
+
+    return bdrv_co_pwritev(child, offset, bytes, &qiov, flags);
+}
+
 extern unsigned int bdrv_drain_all_count;
 void bdrv_apply_subtree_drain(BdrvChild *child, BlockDriverState *new_parent);
 void bdrv_unapply_subtree_drain(BdrvChild *child, BlockDriverState *old_parent);
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index XXXXXXX..XXXXXXX 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -XXX,XX +XXX,XX @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
 int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,
                                unsigned int bytes, QEMUIOVector *qiov,
                                BdrvRequestFlags flags);
+
+static inline int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset,
+                                            unsigned int bytes, void *buf,
+                                            BdrvRequestFlags flags)
+{
+    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
+
+    return blk_co_preadv(blk, offset, bytes, &qiov, flags);
+}
+
+static inline int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset,
+                                             unsigned int bytes, void *buf,
+                                             BdrvRequestFlags flags)
+{
+    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
+
+    return blk_co_pwritev(blk, offset, bytes, &qiov, flags);
+}
+
 int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
                       int bytes, BdrvRequestFlags flags);
 BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset,
-- 
2.20.1

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

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 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 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
                             uint64_t bytes, QEMUIOVector *qiov)
 {
     BDRVQcow2State *s = bs->opaque;
-    QEMUIOVector hd_qiov;
     int ret;
     ssize_t out_len;
     uint8_t *buf, *out_buf;
@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
         goto fail;
     }
 
-    qemu_iovec_init_buf(&hd_qiov, out_buf, out_len);
-
     BLKDBG_EVENT(s->data_file, BLKDBG_WRITE_COMPRESSED);
-    ret = bdrv_co_pwritev(s->data_file, cluster_offset, out_len, &hd_qiov, 0);
+    ret = bdrv_co_pwrite(s->data_file, cluster_offset, out_len, out_buf, 0);
     if (ret < 0) {
         goto fail;
     }
@@ -XXX,XX +XXX,XX @@ qcow2_co_preadv_compressed(BlockDriverState *bs,
     int ret = 0, csize, nb_csectors;
     uint64_t coffset;
     uint8_t *buf, *out_buf;
-    QEMUIOVector local_qiov;
     int offset_in_cluster = offset_into_cluster(s, offset);
 
     coffset = file_cluster_offset & s->cluster_offset_mask;
@@ -XXX,XX +XXX,XX @@ qcow2_co_preadv_compressed(BlockDriverState *bs,
     if (!buf) {
         return -ENOMEM;
     }
-    qemu_iovec_init_buf(&local_qiov, buf, csize);
 
     out_buf = qemu_blockalign(bs, s->cluster_size);
 
     BLKDBG_EVENT(bs->file, BLKDBG_READ_COMPRESSED);
-    ret = bdrv_co_preadv(bs->file, coffset, csize, &local_qiov, 0);
+    ret = bdrv_co_pread(bs->file, coffset, csize, buf, 0);
     if (ret < 0) {
         goto fail;
     }
-- 
2.20.1

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

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/block/qcow.c b/block/qcow.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_preadv(BlockDriverState *bs, uint64_t offset,
     int offset_in_cluster;
     int ret = 0, n;
     uint64_t cluster_offset;
-    QEMUIOVector hd_qiov;
     uint8_t *buf;
     void *orig_buf;
 
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_preadv(BlockDriverState *bs, uint64_t offset,
         if (!cluster_offset) {
             if (bs->backing) {
                 /* read from the base image */
-                qemu_iovec_init_buf(&hd_qiov, buf, n);
                 qemu_co_mutex_unlock(&s->lock);
                 /* qcow2 emits this on bs->file instead of bs->backing */
                 BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
-                ret = bdrv_co_preadv(bs->backing, offset, n, &hd_qiov, 0);
+                ret = bdrv_co_pread(bs->backing, offset, n, buf, 0);
                 qemu_co_mutex_lock(&s->lock);
                 if (ret < 0) {
                     break;
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_preadv(BlockDriverState *bs, uint64_t offset,
                 ret = -EIO;
                 break;
             }
-            qemu_iovec_init_buf(&hd_qiov, buf, n);
             qemu_co_mutex_unlock(&s->lock);
             BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
-            ret = bdrv_co_preadv(bs->file, cluster_offset + offset_in_cluster,
-                                 n, &hd_qiov, 0);
+            ret = bdrv_co_pread(bs->file, cluster_offset + offset_in_cluster,
+                                n, buf, 0);
             qemu_co_mutex_lock(&s->lock);
             if (ret < 0) {
                 break;
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_pwritev(BlockDriverState *bs, uint64_t offset,
     int offset_in_cluster;
     uint64_t cluster_offset;
     int ret = 0, n;
-    QEMUIOVector hd_qiov;
     uint8_t *buf;
     void *orig_buf;
 
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_pwritev(BlockDriverState *bs, uint64_t offset,
             }
         }
 
-        qemu_iovec_init_buf(&hd_qiov, buf, n);
         qemu_co_mutex_unlock(&s->lock);
         BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
-        ret = bdrv_co_pwritev(bs->file, cluster_offset + offset_in_cluster,
-                              n, &hd_qiov, 0);
+        ret = bdrv_co_pwrite(bs->file, cluster_offset + offset_in_cluster,
+                             n, buf, 0);
         qemu_co_mutex_lock(&s->lock);
         if (ret < 0) {
             break;
@@ -XXX,XX +XXX,XX @@ qcow_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
                            uint64_t bytes, QEMUIOVector *qiov)
 {
     BDRVQcowState *s = bs->opaque;
-    QEMUIOVector hd_qiov;
     z_stream strm;
     int ret, out_len;
     uint8_t *buf, *out_buf;
@@ -XXX,XX +XXX,XX @@ qcow_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
     }
     cluster_offset &= s->cluster_offset_mask;
 
-    qemu_iovec_init_buf(&hd_qiov, out_buf, out_len);
     BLKDBG_EVENT(bs->file, BLKDBG_WRITE_COMPRESSED);
-    ret = bdrv_co_pwritev(bs->file, cluster_offset, out_len, &hd_qiov, 0);
+    ret = bdrv_co_pwrite(bs->file, cluster_offset, out_len, out_buf, 0);
     if (ret < 0) {
         goto fail;
     }
-- 
2.20.1

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

Move to _co_ versions of io functions qed_read_table() and
qed_write_table(), as we use qemu_co_mutex_unlock()
anyway.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qed-table.c | 12 +++++-------
 block/qed.c       |  6 ++----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/block/qed-table.c b/block/qed-table.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qed-table.c
+++ b/block/qed-table.c
@@ -XXX,XX +XXX,XX @@
 /* Called with table_lock held.  */
 static int qed_read_table(BDRVQEDState *s, uint64_t offset, QEDTable *table)
 {
-    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(
-        qiov, table->offsets, s->header.cluster_size * s->header.table_size);
+    unsigned int bytes = s->header.cluster_size * s->header.table_size;
+
     int noffsets;
     int i, ret;
 
     trace_qed_read_table(s, offset, table);
 
     qemu_co_mutex_unlock(&s->table_lock);
-    ret = bdrv_preadv(s->bs->file, offset, &qiov);
+    ret = bdrv_co_pread(s->bs->file, offset, bytes, table->offsets, 0);
     qemu_co_mutex_lock(&s->table_lock);
     if (ret < 0) {
         goto out;
     }
 
     /* Byteswap offsets */
-    noffsets = qiov.size / sizeof(uint64_t);
+    noffsets = bytes / sizeof(uint64_t);
     for (i = 0; i < noffsets; i++) {
         table->offsets[i] = le64_to_cpu(table->offsets[i]);
     }
@@ -XXX,XX +XXX,XX @@ static int qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
     unsigned int sector_mask = BDRV_SECTOR_SIZE / sizeof(uint64_t) - 1;
     unsigned int start, end, i;
     QEDTable *new_table;
-    QEMUIOVector qiov;
     size_t len_bytes;
     int ret;
 
@@ -XXX,XX +XXX,XX @@ static int qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
     len_bytes = (end - start) * sizeof(uint64_t);
 
     new_table = qemu_blockalign(s->bs, len_bytes);
-    qemu_iovec_init_buf(&qiov, new_table->offsets, len_bytes);
 
     /* Byteswap table */
     for (i = start; i < end; i++) {
@@ -XXX,XX +XXX,XX @@ static int qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
     offset += start * sizeof(uint64_t);
 
     qemu_co_mutex_unlock(&s->table_lock);
-    ret = bdrv_pwritev(s->bs->file, offset, &qiov);
+    ret = bdrv_co_pwrite(s->bs->file, offset, len_bytes, new_table->offsets, 0);
     qemu_co_mutex_lock(&s->table_lock);
     trace_qed_write_table_cb(s, table, flush, ret);
     if (ret < 0) {
diff --git a/block/qed.c b/block/qed.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qed_write_header(BDRVQEDState *s)
     int nsectors = DIV_ROUND_UP(sizeof(QEDHeader), BDRV_SECTOR_SIZE);
     size_t len = nsectors * BDRV_SECTOR_SIZE;
     uint8_t *buf;
-    QEMUIOVector qiov;
     int ret;
 
     assert(s->allocating_acb || s->allocating_write_reqs_plugged);
 
     buf = qemu_blockalign(s->bs, len);
-    qemu_iovec_init_buf(&qiov, buf, len);
 
-    ret = bdrv_co_preadv(s->bs->file, 0, qiov.size, &qiov, 0);
+    ret = bdrv_co_pread(s->bs->file, 0, len, buf, 0);
     if (ret < 0) {
         goto out;
     }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qed_write_header(BDRVQEDState *s)
     /* Update header */
     qed_header_cpu_to_le(&s->header, (QEDHeader *) buf);
 
-    ret = bdrv_co_pwritev(s->bs->file, 0, qiov.size,  &qiov, 0);
+    ret = bdrv_co_pwrite(s->bs->file, 0, len,  buf, 0);
     if (ret < 0) {
         goto out;
     }
-- 
2.20.1

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

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/parallels.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/block/parallels.c b/block/parallels.c
index XXXXXXX..XXXXXXX 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -XXX,XX +XXX,XX @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num,
     if (bs->backing) {
         int64_t nb_cow_sectors = to_allocate * s->tracks;
         int64_t nb_cow_bytes = nb_cow_sectors << BDRV_SECTOR_BITS;
-        QEMUIOVector qiov =
-            QEMU_IOVEC_INIT_BUF(qiov, qemu_blockalign(bs, nb_cow_bytes),
-                                nb_cow_bytes);
+        void *buf = qemu_blockalign(bs, nb_cow_bytes);
 
-        ret = bdrv_co_preadv(bs->backing, idx * s->tracks * BDRV_SECTOR_SIZE,
-                             nb_cow_bytes, &qiov, 0);
+        ret = bdrv_co_pread(bs->backing, idx * s->tracks * BDRV_SECTOR_SIZE,
+                            nb_cow_bytes, buf, 0);
         if (ret < 0) {
-            qemu_vfree(qemu_iovec_buf(&qiov));
+            qemu_vfree(buf);
             return ret;
         }
 
         ret = bdrv_co_pwritev(bs->file, s->data_end * BDRV_SECTOR_SIZE,
-                              nb_cow_bytes, &qiov, 0);
-        qemu_vfree(qemu_iovec_buf(&qiov));
+                              nb_cow_bytes, buf, 0);
+        qemu_vfree(buf);
         if (ret < 0) {
             return ret;
         }
-- 
2.20.1

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

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/backup.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/block/backup.c b/block/backup.c
index XXXXXXX..XXXXXXX 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
                                                       void **bounce_buffer)
 {
     int ret;
-    QEMUIOVector qiov;
     BlockBackend *blk = job->common.blk;
     int nbytes;
     int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
     if (!*bounce_buffer) {
         *bounce_buffer = blk_blockalign(blk, job->cluster_size);
     }
-    qemu_iovec_init_buf(&qiov, *bounce_buffer, nbytes);
 
-    ret = blk_co_preadv(blk, start, qiov.size, &qiov, read_flags);
+    ret = blk_co_pread(blk, start, nbytes, *bounce_buffer, read_flags);
     if (ret < 0) {
         trace_backup_do_cow_read_fail(job, start, ret);
         if (error_is_read) {
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
         goto fail;
     }
 
-    if (qemu_iovec_is_zero(&qiov)) {
+    if (buffer_is_zero(*bounce_buffer, nbytes)) {
         ret = blk_co_pwrite_zeroes(job->target, start,
-                                   qiov.size, write_flags | BDRV_REQ_MAY_UNMAP);
+                                   nbytes, write_flags | BDRV_REQ_MAY_UNMAP);
     } else {
-        ret = blk_co_pwritev(job->target, start,
-                             qiov.size, &qiov, write_flags |
-                             (job->compress ? BDRV_REQ_WRITE_COMPRESSED : 0));
+        ret = blk_co_pwrite(job->target, start,
+                            nbytes, *bounce_buffer, write_flags |
+                            (job->compress ? BDRV_REQ_WRITE_COMPRESSED : 0));
     }
     if (ret < 0) {
         trace_backup_do_cow_write_fail(job, start, ret);
-- 
2.20.1

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

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/commit.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/block/commit.c b/block/commit.c
index XXXXXXX..XXXXXXX 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn commit_populate(BlockBackend *bs, BlockBackend *base,
                                         void *buf)
 {
     int ret = 0;
-    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
 
     assert(bytes < SIZE_MAX);
 
-    ret = blk_co_preadv(bs, offset, qiov.size, &qiov, 0);
+    ret = blk_co_pread(bs, offset, bytes, buf, 0);
     if (ret < 0) {
         return ret;
     }
 
-    ret = blk_co_pwritev(base, offset, qiov.size, &qiov, 0);
+    ret = blk_co_pwrite(base, offset, bytes, buf, 0);
     if (ret < 0) {
         return ret;
     }
-- 
2.20.1

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

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/stream.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/block/stream.c b/block/stream.c
index XXXXXXX..XXXXXXX 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn stream_populate(BlockBackend *blk,
                                         int64_t offset, uint64_t bytes,
                                         void *buf)
 {
-    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
-
     assert(bytes < SIZE_MAX);
 
     /* Copy-on-read the unallocated clusters */
-    return blk_co_preadv(blk, offset, qiov.size, &qiov, BDRV_REQ_COPY_ON_READ);
+    return blk_co_pread(blk, offset, bytes, buf, BDRV_REQ_COPY_ON_READ);
 }
 
 static void stream_abort(Job *job)
-- 
2.20.1

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

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qemu-img.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c
index XXXXXXX..XXXXXXX 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_read(ImgConvertState *s, int64_t sector_num,
                                         int nb_sectors, uint8_t *buf)
 {
     int n, ret;
-    QEMUIOVector qiov;
 
     assert(nb_sectors <= s->buf_sectors);
     while (nb_sectors > 0) {
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_read(ImgConvertState *s, int64_t sector_num,
         bs_sectors = s->src_sectors[src_cur];
 
         n = MIN(nb_sectors, bs_sectors - (sector_num - src_cur_offset));
-        qemu_iovec_init_buf(&qiov, buf, n << BDRV_SECTOR_BITS);
 
-        ret = blk_co_preadv(
+        ret = blk_co_pread(
                 blk, (sector_num - src_cur_offset) << BDRV_SECTOR_BITS,
-                n << BDRV_SECTOR_BITS, &qiov, 0);
+                n << BDRV_SECTOR_BITS, buf, 0);
         if (ret < 0) {
             return ret;
         }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_write(ImgConvertState *s, int64_t sector_num,
                                          enum ImgConvertBlockStatus status)
 {
     int ret;
-    QEMUIOVector qiov;
 
     while (nb_sectors > 0) {
         int n = nb_sectors;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_write(ImgConvertState *s, int64_t sector_num,
                 (s->compressed &&
                  !buffer_is_zero(buf, n * BDRV_SECTOR_SIZE)))
             {
-                qemu_iovec_init_buf(&qiov, buf, n << BDRV_SECTOR_BITS);
-
-                ret = blk_co_pwritev(s->target, sector_num << BDRV_SECTOR_BITS,
-                                     n << BDRV_SECTOR_BITS, &qiov, flags);
+                ret = blk_co_pwrite(s->target, sector_num << BDRV_SECTOR_BITS,
+                                    n << BDRV_SECTOR_BITS, buf, flags);
                 if (ret < 0) {
                     return ret;
                 }
-- 
2.20.1

From: Alberto Garcia <berto@igalia.com>

This tests the fix from the previous patch.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/249     | 115 +++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/249.out |  35 +++++++++++
 tests/qemu-iotests/group   |   1 +
 3 files changed, 151 insertions(+)
 create mode 100755 tests/qemu-iotests/249
 create mode 100644 tests/qemu-iotests/249.out

diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249
new file mode 100755
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/249
@@ -XXX,XX +XXX,XX @@
+#!/usr/bin/env bash
+#
+# Test that a backing image is put back in read-only mode after
+# block-commit (both when it fails and when it succeeds).
+#
+# Copyright (C) 2019 Igalia, S.L.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# creator
+owner=berto@igalia.com
+
+seq="$(basename $0)"
+echo "QA output created by $seq"
+
+status=1	# failure is the default!
+
+_cleanup()
+{
+    _cleanup_test_img
+    rm -f "$TEST_IMG.base"
+    rm -f "$TEST_IMG.int"
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+. ./common.qemu
+
+# Any format implementing BlockDriver.bdrv_change_backing_file
+_supported_fmt qcow2 qed
+_supported_proto file
+_supported_os Linux
+
+IMG_SIZE=1M
+
+# Create the images: base <- int <- active
+TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE | _filter_imgfmt
+TEST_IMG="$TEST_IMG.int" _make_test_img -b "$TEST_IMG.base" | _filter_imgfmt
+_make_test_img -b "$TEST_IMG.int" | _filter_imgfmt
+
+# Launch QEMU with these two drives:
+# none0: base (read-only)
+# none1: base <- int <- active
+_launch_qemu -drive if=none,file="${TEST_IMG}.base",node-name=base,read-only=on \
+             -drive if=none,file="${TEST_IMG}",backing.node-name=int,backing.backing=base
+
+_send_qemu_cmd $QEMU_HANDLE \
+    "{ 'execute': 'qmp_capabilities' }" \
+    'return'
+
+echo
+echo '=== Send a write command to a drive opened in read-only mode (1)'
+echo
+_send_qemu_cmd $QEMU_HANDLE \
+    "{ 'execute': 'human-monitor-command',
+       'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
+    'return'
+
+echo
+echo '=== Run block-commit on base using an invalid filter node name'
+echo
+_send_qemu_cmd $QEMU_HANDLE \
+    "{ 'execute': 'block-commit',
+       'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int',
+                     'filter-node-name': '1234'}}" \
+    'error'
+
+echo
+echo '=== Send a write command to a drive opened in read-only mode (2)'
+echo
+_send_qemu_cmd $QEMU_HANDLE \
+    "{ 'execute': 'human-monitor-command',
+       'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
+    'return'
+
+echo
+echo '=== Run block-commit on base using the default filter node name'
+echo
+_send_qemu_cmd $QEMU_HANDLE \
+    "{ 'execute': 'block-commit',
+       'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int'}}" \
+    'return'
+
+# Wait for block-commit to finish
+_send_qemu_cmd $QEMU_HANDLE '' \
+    '"status": "null"'
+
+echo
+echo '=== Send a write command to a drive opened in read-only mode (3)'
+echo
+_send_qemu_cmd $QEMU_HANDLE \
+    "{ 'execute': 'human-monitor-command',
+       'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
+    'return'
+
+_cleanup_qemu
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/249.out b/tests/qemu-iotests/249.out
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/249.out
@@ -XXX,XX +XXX,XX @@
+QA output created by 249
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=1048576
+Formatting 'TEST_DIR/t.IMGFMT.int', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.base
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.int
+{"return": {}}
+
+=== Send a write command to a drive opened in read-only mode (1)
+
+{"return": "Block node is read-onlyrn"}
+
+=== Run block-commit on base using an invalid filter node name
+
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
+{"error": {"class": "GenericError", "desc": "Invalid node name"}}
+
+=== Send a write command to a drive opened in read-only mode (2)
+
+{"return": "Block node is read-onlyrn"}
+
+=== Run block-commit on base using the default filter node name
+
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 1048576, "offset": 1048576, "speed": 0, "type": "commit"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
+
+=== Send a write command to a drive opened in read-only mode (3)
+
+{"return": "Block node is read-onlyrn"}
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -XXX,XX +XXX,XX @@
 246 rw auto quick
 247 rw auto quick
 248 rw auto quick
+249 rw auto quick
-- 
2.20.1

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

qed_read_table and qed_write_table use coroutine-only interfaces but
are not marked coroutine_fn. Happily, they are called only from
coroutine context, so we only need to add missed markers.

Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qed.h       | 28 ++++++++++++++++------------
 block/qed-check.c |  4 ++--
 block/qed-table.c | 33 ++++++++++++++++++++-------------
 block/qed.c       |  5 +++--
 4 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/block/qed.h b/block/qed.h
index XXXXXXX..XXXXXXX 100644
--- a/block/qed.h
+++ b/block/qed.h
@@ -XXX,XX +XXX,XX @@ void qed_commit_l2_cache_entry(L2TableCache *l2_cache, CachedL2Table *l2_table);
 /**
  * Table I/O functions
  */
-int qed_read_l1_table_sync(BDRVQEDState *s);
-int qed_write_l1_table(BDRVQEDState *s, unsigned int index, unsigned int n);
-int qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
-                            unsigned int n);
-int qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
-                           uint64_t offset);
-int qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset);
-int qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
-                       unsigned int index, unsigned int n, bool flush);
-int qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
-                            unsigned int index, unsigned int n, bool flush);
+int coroutine_fn qed_read_l1_table_sync(BDRVQEDState *s);
+int coroutine_fn qed_write_l1_table(BDRVQEDState *s, unsigned int index,
+                                    unsigned int n);
+int coroutine_fn qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
+                                         unsigned int n);
+int coroutine_fn qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
+                                        uint64_t offset);
+int coroutine_fn qed_read_l2_table(BDRVQEDState *s, QEDRequest *request,
+                                   uint64_t offset);
+int coroutine_fn qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
+                                    unsigned int index, unsigned int n,
+                                    bool flush);
+int coroutine_fn qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
+                                         unsigned int index, unsigned int n,
+                                         bool flush);
 
 /**
  * Cluster functions
@@ -XXX,XX +XXX,XX @@ int coroutine_fn qed_find_cluster(BDRVQEDState *s, QEDRequest *request,
 /**
  * Consistency check
  */
-int qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix);
+int coroutine_fn qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix);
 
 QEDTable *qed_alloc_table(BDRVQEDState *s);
 
diff --git a/block/qed-check.c b/block/qed-check.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qed-check.c
+++ b/block/qed-check.c
@@ -XXX,XX +XXX,XX @@ static unsigned int qed_check_l2_table(QEDCheck *check, QEDTable *table)
 /**
  * Descend tables and check each cluster is referenced once only
  */
-static int qed_check_l1_table(QEDCheck *check, QEDTable *table)
+static int coroutine_fn qed_check_l1_table(QEDCheck *check, QEDTable *table)
 {
     BDRVQEDState *s = check->s;
     unsigned int i, num_invalid_l1 = 0;
@@ -XXX,XX +XXX,XX @@ static void qed_check_mark_clean(BDRVQEDState *s, BdrvCheckResult *result)
 }
 
 /* Called with table_lock held.  */
-int qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix)
+int coroutine_fn qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix)
 {
     QEDCheck check = {
         .s = s,
diff --git a/block/qed-table.c b/block/qed-table.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qed-table.c
+++ b/block/qed-table.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/bswap.h"
 
 /* Called with table_lock held.  */
-static int qed_read_table(BDRVQEDState *s, uint64_t offset, QEDTable *table)
+static int coroutine_fn qed_read_table(BDRVQEDState *s, uint64_t offset,
+                                       QEDTable *table)
 {
     unsigned int bytes = s->header.cluster_size * s->header.table_size;
 
@@ -XXX,XX +XXX,XX @@ out:
  *
  * Called with table_lock held.
  */
-static int qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
-                           unsigned int index, unsigned int n, bool flush)
+static int coroutine_fn qed_write_table(BDRVQEDState *s, uint64_t offset,
+                                        QEDTable *table, unsigned int index,
+                                        unsigned int n, bool flush)
 {
     unsigned int sector_mask = BDRV_SECTOR_SIZE / sizeof(uint64_t) - 1;
     unsigned int start, end, i;
@@ -XXX,XX +XXX,XX @@ out:
     return ret;
 }
 
-int qed_read_l1_table_sync(BDRVQEDState *s)
+int coroutine_fn qed_read_l1_table_sync(BDRVQEDState *s)
 {
     return qed_read_table(s, s->header.l1_table_offset, s->l1_table);
 }
 
 /* Called with table_lock held.  */
-int qed_write_l1_table(BDRVQEDState *s, unsigned int index, unsigned int n)
+int coroutine_fn qed_write_l1_table(BDRVQEDState *s, unsigned int index,
+                                    unsigned int n)
 {
     BLKDBG_EVENT(s->bs->file, BLKDBG_L1_UPDATE);
     return qed_write_table(s, s->header.l1_table_offset,
                            s->l1_table, index, n, false);
 }
 
-int qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
-                            unsigned int n)
+int coroutine_fn qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
+                                         unsigned int n)
 {
     return qed_write_l1_table(s, index, n);
 }
 
 /* Called with table_lock held.  */
-int qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset)
+int coroutine_fn qed_read_l2_table(BDRVQEDState *s, QEDRequest *request,
+                                   uint64_t offset)
 {
     int ret;
 
@@ -XXX,XX +XXX,XX @@ int qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset)
     return ret;
 }
 
-int qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request, uint64_t offset)
+int coroutine_fn qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
+                                        uint64_t offset)
 {
     return qed_read_l2_table(s, request, offset);
 }
 
 /* Called with table_lock held.  */
-int qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
-                       unsigned int index, unsigned int n, bool flush)
+int coroutine_fn qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
+                                    unsigned int index, unsigned int n,
+                                    bool flush)
 {
     BLKDBG_EVENT(s->bs->file, BLKDBG_L2_UPDATE);
     return qed_write_table(s, request->l2_table->offset,
                            request->l2_table->table, index, n, flush);
 }
 
-int qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
-                            unsigned int index, unsigned int n, bool flush)
+int coroutine_fn qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
+                                         unsigned int index, unsigned int n,
+                                         bool flush)
 {
     return qed_write_l2_table(s, request, index, n, flush);
 }
diff --git a/block/qed.c b/block/qed.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn bdrv_qed_co_invalidate_cache(BlockDriverState *bs,
     }
 }
 
-static int bdrv_qed_co_check(BlockDriverState *bs, BdrvCheckResult *result,
-                             BdrvCheckMode fix)
+static int coroutine_fn bdrv_qed_co_check(BlockDriverState *bs,
+                                          BdrvCheckResult *result,
+                                          BdrvCheckMode fix)
 {
     BDRVQEDState *s = bs->opaque;
     int ret;
-- 
2.20.1

The following changes since commit 22dbfdecc3c52228d3489da3fe81da92b21197bf:

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20191010.0' into staging (2019-10-14 15:09:08 +0100)

are available in the Git repository at:

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

for you to fetch changes up to a1406a9262a087d9ec9627b88da13c4590b61dae:

iotests: Test large write request to qcow2 file (2019-10-14 17:12:48 +0200)

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

- block: Fix crash with qcow2 partial cluster COW with small cluster
  sizes (misaligned write requests with BDRV_REQ_NO_FALLBACK)
- qcow2: Fix integer overflow potentially causing corruption with huge
  requests
- vhdx: Detect truncated image files
- tools: Support help options for --object
- Various block-related replay improvements
- iotests/028: Fix for long $TEST_DIRs

----------------------------------------------------------------
Alberto Garcia (1):
      block: Reject misaligned write requests with BDRV_REQ_NO_FALLBACK

Kevin Wolf (4):
      vl: Split off user_creatable_print_help()
      qemu-io: Support help options for --object
      qemu-img: Support help options for --object
      qemu-nbd: Support help options for --object

Max Reitz (3):
      iotests/028: Fix for long $TEST_DIRs
      qcow2: Limit total allocation range to INT_MAX
      iotests: Test large write request to qcow2 file

Pavel Dovgaluk (6):
      block: implement bdrv_snapshot_goto for blkreplay
      replay: disable default snapshot for record/replay
      replay: update docs for record/replay with block devices
      replay: don't drain/flush bdrv queue while RR is working
      replay: finish record/replay before closing the disks
      replay: add BH oneshot event for block layer

Peter Lieven (1):
      block/vhdx: add check for truncated image files

From: Peter Lieven <pl@kamp.de>

qemu is currently not able to detect truncated vhdx image files.
Add a basic check if all allocated blocks are reachable at open and
report all errors during bdrv_co_check.

Signed-off-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/vhdx.c | 120 +++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 103 insertions(+), 17 deletions(-)

diff --git a/block/vhdx.c b/block/vhdx.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/option.h"
 #include "qemu/crc32c.h"
 #include "qemu/bswap.h"
+#include "qemu/error-report.h"
 #include "vhdx.h"
 #include "migration/blocker.h"
 #include "qemu/uuid.h"
@@ -XXX,XX +XXX,XX @@ static int vhdx_region_check(BDRVVHDXState *s, uint64_t start, uint64_t length)
     end = start + length;
     QLIST_FOREACH(r, &s->regions, entries) {
         if (!((start >= r->end) || (end <= r->start))) {
+            error_report("VHDX region %" PRIu64 "-%" PRIu64 " overlaps with "
+                         "region %" PRIu64 "-%." PRIu64, start, end, r->start,
+                         r->end);
             ret = -EINVAL;
             goto exit;
         }
@@ -XXX,XX +XXX,XX @@ static void vhdx_calc_bat_entries(BDRVVHDXState *s)
 
 }
 
+static int vhdx_check_bat_entries(BlockDriverState *bs, int *errcnt)
+{
+    BDRVVHDXState *s = bs->opaque;
+    int64_t image_file_size = bdrv_getlength(bs->file->bs);
+    uint64_t payblocks = s->chunk_ratio;
+    uint64_t i;
+    int ret = 0;
+
+    if (image_file_size < 0) {
+        error_report("Could not determinate VHDX image file size.");
+        return image_file_size;
+    }
+
+    for (i = 0; i < s->bat_entries; i++) {
+        if ((s->bat[i] & VHDX_BAT_STATE_BIT_MASK) ==
+            PAYLOAD_BLOCK_FULLY_PRESENT) {
+            uint64_t offset = s->bat[i] & VHDX_BAT_FILE_OFF_MASK;
+            /*
+             * Allow that the last block exists only partially. The VHDX spec
+             * states that the image file can only grow in blocksize increments,
+             * but QEMU created images with partial last blocks in the past.
+             */
+            uint32_t block_length = MIN(s->block_size,
+                bs->total_sectors * BDRV_SECTOR_SIZE - i * s->block_size);
+            /*
+             * Check for BAT entry overflow.
+             */
+            if (offset > INT64_MAX - s->block_size) {
+                error_report("VHDX BAT entry %" PRIu64 " offset overflow.", i);
+                ret = -EINVAL;
+                if (!errcnt) {
+                    break;
+                }
+                (*errcnt)++;
+            }
+            /*
+             * Check if fully allocated BAT entries do not reside after
+             * end of the image file.
+             */
+            if (offset >= image_file_size) {
+                error_report("VHDX BAT entry %" PRIu64 " start offset %" PRIu64
+                             " points after end of file (%" PRIi64 "). Image"
+                             " has probably been truncated.",
+                             i, offset, image_file_size);
+                ret = -EINVAL;
+                if (!errcnt) {
+                    break;
+                }
+                (*errcnt)++;
+            } else if (offset + block_length > image_file_size) {
+                error_report("VHDX BAT entry %" PRIu64 " end offset %" PRIu64
+                             " points after end of file (%" PRIi64 "). Image"
+                             " has probably been truncated.",
+                             i, offset + block_length - 1, image_file_size);
+                ret = -EINVAL;
+                if (!errcnt) {
+                    break;
+                }
+                (*errcnt)++;
+            }
+
+            /*
+             * verify populated BAT field file offsets against
+             * region table and log entries
+             */
+            if (payblocks--) {
+                /* payload bat entries */
+                int ret2;
+                ret2 = vhdx_region_check(s, offset, s->block_size);
+                if (ret2 < 0) {
+                    ret = -EINVAL;
+                    if (!errcnt) {
+                        break;
+                    }
+                    (*errcnt)++;
+                }
+            } else {
+                payblocks = s->chunk_ratio;
+                /*
+                 * Once differencing files are supported, verify sector bitmap
+                 * blocks here
+                 */
+            }
+        }
+    }
+
+    return ret;
+}
+
 static void vhdx_close(BlockDriverState *bs)
 {
     BDRVVHDXState *s = bs->opaque;
@@ -XXX,XX +XXX,XX @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags,
         goto fail;
     }
 
-    uint64_t payblocks = s->chunk_ratio;
-    /* endian convert, and verify populated BAT field file offsets against
-     * region table and log entries */
+    /* endian convert populated BAT field entires */
     for (i = 0; i < s->bat_entries; i++) {
         s->bat[i] = le64_to_cpu(s->bat[i]);
-        if (payblocks--) {
-            /* payload bat entries */
-            if ((s->bat[i] & VHDX_BAT_STATE_BIT_MASK) ==
-                    PAYLOAD_BLOCK_FULLY_PRESENT) {
-                ret = vhdx_region_check(s, s->bat[i] & VHDX_BAT_FILE_OFF_MASK,
-                                        s->block_size);
-                if (ret < 0) {
-                    goto fail;
-                }
-            }
-        } else {
-            payblocks = s->chunk_ratio;
-            /* Once differencing files are supported, verify sector bitmap
-             * blocks here */
+    }
+
+    if (!(flags & BDRV_O_CHECK)) {
+        ret = vhdx_check_bat_entries(bs, NULL);
+        if (ret < 0) {
+            goto fail;
         }
     }
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vhdx_co_check(BlockDriverState *bs,
     if (s->log_replayed_on_open) {
         result->corruptions_fixed++;
     }
+
+    vhdx_check_bat_entries(bs, &result->corruptions);
+
     return 0;
 }
 
-- 
2.20.1

From: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>

This patch enables making snapshots with blkreplay used in
block devices.
This function is required to make bdrv_snapshot_goto without
calling .bdrv_open which is not implemented.

Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
Acked-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/blkreplay.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/block/blkreplay.c b/block/blkreplay.c
index XXXXXXX..XXXXXXX 100644
--- a/block/blkreplay.c
+++ b/block/blkreplay.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn blkreplay_co_flush(BlockDriverState *bs)
     return ret;
 }
 
+static int blkreplay_snapshot_goto(BlockDriverState *bs,
+                                   const char *snapshot_id)
+{
+    return bdrv_snapshot_goto(bs->file->bs, snapshot_id, NULL);
+}
+
 static BlockDriver bdrv_blkreplay = {
     .format_name            = "blkreplay",
     .instance_size          = 0,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_blkreplay = {
     .bdrv_co_pwrite_zeroes  = blkreplay_co_pwrite_zeroes,
     .bdrv_co_pdiscard       = blkreplay_co_pdiscard,
     .bdrv_co_flush          = blkreplay_co_flush,
+
+    .bdrv_snapshot_goto     = blkreplay_snapshot_goto,
 };
 
 static void bdrv_blkreplay_init(void)
-- 
2.20.1

From: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>

This patch disables setting '-snapshot' option on by default
in record/replay mode. This is needed for creating vmstates in record
and replay modes.

Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
Acked-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 vl.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/vl.c b/vl.c
index XXXXXXX..XXXXXXX 100644
--- a/vl.c
+++ b/vl.c
@@ -XXX,XX +XXX,XX @@ static void configure_blockdev(BlockdevOptionsQueue *bdo_queue,
         qapi_free_BlockdevOptions(bdo->bdo);
         g_free(bdo);
     }
-    if (snapshot || replay_mode != REPLAY_MODE_NONE) {
+    if (snapshot) {
         qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot,
                           NULL, NULL);
     }
@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp)
                 drive_add(IF_PFLASH, -1, optarg, PFLASH_OPTS);
                 break;
             case QEMU_OPTION_snapshot:
-                snapshot = 1;
+                {
+                    Error *blocker = NULL;
+                    snapshot = 1;
+                    error_setg(&blocker, QERR_REPLAY_NOT_SUPPORTED,
+                               "-snapshot");
+                    replay_add_blocker(blocker);
+                }
                 break;
             case QEMU_OPTION_numa:
                 opts = qemu_opts_parse_noisily(qemu_find_opts("numa"),
-- 
2.20.1

From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>

This patch updates the description of the command lines for using
record/replay with attached block devices.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 docs/replay.txt | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/replay.txt b/docs/replay.txt
index XXXXXXX..XXXXXXX 100644
--- a/docs/replay.txt
+++ b/docs/replay.txt
@@ -XXX,XX +XXX,XX @@ Usage of the record/replay:
  * First, record the execution with the following command line:
     qemu-system-i386 \
      -icount shift=7,rr=record,rrfile=replay.bin \
-     -drive file=disk.qcow2,if=none,id=img-direct \
+     -drive file=disk.qcow2,if=none,snapshot,id=img-direct \
      -drive driver=blkreplay,if=none,image=img-direct,id=img-blkreplay \
      -device ide-hd,drive=img-blkreplay \
      -netdev user,id=net1 -device rtl8139,netdev=net1 \
@@ -XXX,XX +XXX,XX @@ Usage of the record/replay:
  * After recording, you can replay it by using another command line:
     qemu-system-i386 \
      -icount shift=7,rr=replay,rrfile=replay.bin \
-     -drive file=disk.qcow2,if=none,id=img-direct \
+     -drive file=disk.qcow2,if=none,snapshot,id=img-direct \
      -drive driver=blkreplay,if=none,image=img-direct,id=img-blkreplay \
      -device ide-hd,drive=img-blkreplay \
      -netdev user,id=net1 -device rtl8139,netdev=net1 \
@@ -XXX,XX +XXX,XX @@ Block devices record/replay module intercepts calls of
 bdrv coroutine functions at the top of block drivers stack.
 To record and replay block operations the drive must be configured
 as following:
- -drive file=disk.qcow2,if=none,id=img-direct
+ -drive file=disk.qcow2,if=none,snapshot,id=img-direct
  -drive driver=blkreplay,if=none,image=img-direct,id=img-blkreplay
  -device ide-hd,drive=img-blkreplay
 
@@ -XXX,XX +XXX,XX @@ This snapshot is created at start of recording and restored at start
 of replaying. It also can be loaded while replaying to roll back
 the execution.
 
+'snapshot' flag of the disk image must be removed to save the snapshots
+in the overlay (or original image) instead of using the temporary overlay.
+ -drive file=disk.ovl,if=none,id=img-direct
+ -drive driver=blkreplay,if=none,image=img-direct,id=img-blkreplay
+ -device ide-hd,drive=img-blkreplay
+
 Use QEMU monitor to create additional snapshots. 'savevm <name>' command
 created the snapshot and 'loadvm <name>' restores it. To prevent corruption
 of the original disk image, use overlay files linked to the original images.
-- 
2.20.1

From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>

In record/replay mode bdrv queue is controlled by replay mechanism.
It does not allow saving or loading the snapshots
when bdrv queue is not empty. Stopping the VM is not blocked by nonempty
queue, but flushing the queue is still impossible there,
because it may cause deadlocks in replay mode.
This patch disables bdrv_drain_all and bdrv_flush_all in
record/replay mode.

Stopping the machine when the IO requests are not finished is needed
for the debugging. E.g., breakpoint may be set at the specified step,
and forcing the IO requests to finish may break the determinism
of the execution.

Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
Acked-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/io.c | 28 ++++++++++++++++++++++++++++
 cpus.c     |  2 --
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
+#include "sysemu/replay.h"
 
 #define NOT_DONE 0x7fffffff /* used while emulated sync operation in progress */
 
@@ -XXX,XX +XXX,XX @@ void bdrv_drain_all_begin(void)
         return;
     }
 
+    /*
+     * bdrv queue is managed by record/replay,
+     * waiting for finishing the I/O requests may
+     * be infinite
+     */
+    if (replay_events_enabled()) {
+        return;
+    }
+
     /* AIO_WAIT_WHILE() with a NULL context can only be called from the main
      * loop AioContext, so make sure we're in the main context. */
     assert(qemu_get_current_aio_context() == qemu_get_aio_context());
@@ -XXX,XX +XXX,XX @@ void bdrv_drain_all_end(void)
     BlockDriverState *bs = NULL;
     int drained_end_counter = 0;
 
+    /*
+     * bdrv queue is managed by record/replay,
+     * waiting for finishing the I/O requests may
+     * be endless
+     */
+    if (replay_events_enabled()) {
+        return;
+    }
+
     while ((bs = bdrv_next_all_states(bs))) {
         AioContext *aio_context = bdrv_get_aio_context(bs);
 
@@ -XXX,XX +XXX,XX @@ int bdrv_flush_all(void)
     BlockDriverState *bs = NULL;
     int result = 0;
 
+    /*
+     * bdrv queue is managed by record/replay,
+     * creating new flush request for stopping
+     * the VM may break the determinism
+     */
+    if (replay_events_enabled()) {
+        return result;
+    }
+
     for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
         AioContext *aio_context = bdrv_get_aio_context(bs);
         int ret;
diff --git a/cpus.c b/cpus.c
index XXXXXXX..XXXXXXX 100644
--- a/cpus.c
+++ b/cpus.c
@@ -XXX,XX +XXX,XX @@ static int do_vm_stop(RunState state, bool send_stop)
     }
 
     bdrv_drain_all();
-    replay_disable_events();
     ret = bdrv_flush_all();
 
     return ret;
@@ -XXX,XX +XXX,XX @@ int vm_prepare_start(void)
     /* We are sending this now, but the CPUs will be resumed shortly later */
     qapi_event_send_resume();
 
-    replay_enable_events();
     cpu_enable_ticks();
     runstate_set(RUN_STATE_RUNNING);
     vm_state_notify(1, RUN_STATE_RUNNING);
-- 
2.20.1

From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>

After recent updates block devices cannot be closed on qemu exit.
This happens due to the block request polling when replay is not finished.
Therefore now we stop execution recording before closing the block devices.

Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 replay/replay.c | 2 ++
 vl.c            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/replay/replay.c b/replay/replay.c
index XXXXXXX..XXXXXXX 100644
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -XXX,XX +XXX,XX @@ void replay_finish(void)
     g_free(replay_snapshot);
     replay_snapshot = NULL;
 
+    replay_mode = REPLAY_MODE_NONE;
+
     replay_finish_events();
 }
 
diff --git a/vl.c b/vl.c
index XXXXXXX..XXXXXXX 100644
--- a/vl.c
+++ b/vl.c
@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp)
 
     /* No more vcpu or device emulation activity beyond this point */
     vm_shutdown();
+    replay_finish();
 
     job_cancel_sync_all();
     bdrv_close_all();
-- 
2.20.1

From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>

Replay is capable of recording normal BH events, but sometimes
there are single use callbacks scheduled with aio_bh_schedule_oneshot
function. This patch enables recording and replaying such callbacks.
Block layer uses these events for calling the completion function.
Replaying these calls makes the execution deterministic.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Acked-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/sysemu/replay.h  |  4 ++++
 replay/replay-internal.h |  1 +
 block/block-backend.c    |  9 ++++++---
 block/io.c               |  4 ++--
 block/iscsi.c            |  5 +++--
 block/nfs.c              |  6 ++++--
 block/null.c             |  4 +++-
 block/nvme.c             |  6 ++++--
 block/rbd.c              |  5 +++--
 block/vxhs.c             |  5 +++--
 replay/replay-events.c   | 16 ++++++++++++++++
 stubs/replay-user.c      |  9 +++++++++
 stubs/Makefile.objs      |  1 +
 13 files changed, 59 insertions(+), 16 deletions(-)
 create mode 100644 stubs/replay-user.c

diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index XXXXXXX..XXXXXXX 100644
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -XXX,XX +XXX,XX @@
 #include "qapi/qapi-types-misc.h"
 #include "qapi/qapi-types-run-state.h"
 #include "qapi/qapi-types-ui.h"
+#include "block/aio.h"
 
 /* replay clock kinds */
 enum ReplayClockKind {
@@ -XXX,XX +XXX,XX @@ void replay_enable_events(void);
 bool replay_events_enabled(void);
 /*! Adds bottom half event to the queue */
 void replay_bh_schedule_event(QEMUBH *bh);
+/* Adds oneshot bottom half event to the queue */
+void replay_bh_schedule_oneshot_event(AioContext *ctx,
+    QEMUBHFunc *cb, void *opaque);
 /*! Adds input event to the queue */
 void replay_input_event(QemuConsole *src, InputEvent *evt);
 /*! Adds input sync event to the queue */
diff --git a/replay/replay-internal.h b/replay/replay-internal.h
index XXXXXXX..XXXXXXX 100644
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -XXX,XX +XXX,XX @@ enum ReplayEvents {
 
 enum ReplayAsyncEventKind {
     REPLAY_ASYNC_EVENT_BH,
+    REPLAY_ASYNC_EVENT_BH_ONESHOT,
     REPLAY_ASYNC_EVENT_INPUT,
     REPLAY_ASYNC_EVENT_INPUT_SYNC,
     REPLAY_ASYNC_EVENT_CHAR_READ,
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 @@
 #include "hw/qdev-core.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/runstate.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/replay.h"
 #include "qapi/error.h"
 #include "qapi/qapi-events-block.h"
 #include "qemu/id.h"
@@ -XXX,XX +XXX,XX @@ BlockAIOCB *blk_abort_aio_request(BlockBackend *blk,
     acb->blk = blk;
     acb->ret = ret;
 
-    aio_bh_schedule_oneshot(blk_get_aio_context(blk), error_callback_bh, acb);
+    replay_bh_schedule_oneshot_event(blk_get_aio_context(blk),
+                                     error_callback_bh, acb);
     return &acb->common;
 }
 
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *blk_aio_prwv(BlockBackend *blk, int64_t offset, int bytes,
 
     acb->has_returned = true;
     if (acb->rwco.ret != NOT_DONE) {
-        aio_bh_schedule_oneshot(blk_get_aio_context(blk),
-                                blk_aio_complete_bh, acb);
+        replay_bh_schedule_oneshot_event(blk_get_aio_context(blk),
+                                         blk_aio_complete_bh, acb);
     }
 
     return &acb->common;
diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn bdrv_co_yield_to_drain(BlockDriverState *bs,
     if (bs) {
         bdrv_inc_in_flight(bs);
     }
-    aio_bh_schedule_oneshot(bdrv_get_aio_context(bs),
-                            bdrv_co_drain_bh_cb, &data);
+    replay_bh_schedule_oneshot_event(bdrv_get_aio_context(bs),
+                                     bdrv_co_drain_bh_cb, &data);
 
     qemu_coroutine_yield();
     /* If we are resumed from some other event (such as an aio completion or a
diff --git a/block/iscsi.c b/block/iscsi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/uuid.h"
+#include "sysemu/replay.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-misc.h"
 #include "qapi/qmp/qdict.h"
@@ -XXX,XX +XXX,XX @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status,
     }
 
     if (iTask->co) {
-        aio_bh_schedule_oneshot(iTask->iscsilun->aio_context,
-                                 iscsi_co_generic_bh_cb, iTask);
+        replay_bh_schedule_oneshot_event(iTask->iscsilun->aio_context,
+                                         iscsi_co_generic_bh_cb, iTask);
     } else {
         iTask->complete = 1;
     }
diff --git a/block/nfs.c b/block/nfs.c
index XXXXXXX..XXXXXXX 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/option.h"
 #include "qemu/uri.h"
 #include "qemu/cutils.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/replay.h"
 #include "qapi/qapi-visit-block-core.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
@@ -XXX,XX +XXX,XX @@ nfs_co_generic_cb(int ret, struct nfs_context *nfs, void *data,
     if (task->ret < 0) {
         error_report("NFS Error: %s", nfs_get_error(nfs));
     }
-    aio_bh_schedule_oneshot(task->client->aio_context,
-                            nfs_co_generic_bh_cb, task);
+    replay_bh_schedule_oneshot_event(task->client->aio_context,
+                                     nfs_co_generic_bh_cb, task);
 }
 
 static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, uint64_t offset,
diff --git a/block/null.c b/block/null.c
index XXXXXXX..XXXXXXX 100644
--- a/block/null.c
+++ b/block/null.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/module.h"
 #include "qemu/option.h"
 #include "block/block_int.h"
+#include "sysemu/replay.h"
 
 #define NULL_OPT_LATENCY "latency-ns"
 #define NULL_OPT_ZEROES  "read-zeroes"
@@ -XXX,XX +XXX,XX @@ static inline BlockAIOCB *null_aio_common(BlockDriverState *bs,
         timer_mod_ns(&acb->timer,
                      qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + s->latency_ns);
     } else {
-        aio_bh_schedule_oneshot(bdrv_get_aio_context(bs), null_bh_cb, acb);
+        replay_bh_schedule_oneshot_event(bdrv_get_aio_context(bs),
+                                         null_bh_cb, acb);
     }
     return &acb->common;
 }
diff --git a/block/nvme.c b/block/nvme.c
index XXXXXXX..XXXXXXX 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/option.h"
 #include "qemu/vfio-helpers.h"
 #include "block/block_int.h"
+#include "sysemu/replay.h"
 #include "trace.h"
 
 #include "block/nvme.h"
@@ -XXX,XX +XXX,XX @@ static bool nvme_process_completion(BDRVNVMeState *s, NVMeQueuePair *q)
         smp_mb_release();
         *q->cq.doorbell = cpu_to_le32(q->cq.head);
         if (!qemu_co_queue_empty(&q->free_req_queue)) {
-            aio_bh_schedule_oneshot(s->aio_context, nvme_free_req_queue_cb, q);
+            replay_bh_schedule_oneshot_event(s->aio_context,
+                                             nvme_free_req_queue_cb, q);
         }
     }
     q->busy = false;
@@ -XXX,XX +XXX,XX @@ static void nvme_rw_cb(void *opaque, int ret)
         /* The rw coroutine hasn't yielded, don't try to enter. */
         return;
     }
-    aio_bh_schedule_oneshot(data->ctx, nvme_rw_cb_bh, data);
+    replay_bh_schedule_oneshot_event(data->ctx, nvme_rw_cb_bh, data);
 }
 
 static coroutine_fn int nvme_co_prw_aligned(BlockDriverState *bs,
diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@
 #include "block/qdict.h"
 #include "crypto/secret.h"
 #include "qemu/cutils.h"
+#include "sysemu/replay.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qjson.h"
@@ -XXX,XX +XXX,XX @@ static void rbd_finish_aiocb(rbd_completion_t c, RADOSCB *rcb)
     rcb->ret = rbd_aio_get_return_value(c);
     rbd_aio_release(c);
 
-    aio_bh_schedule_oneshot(bdrv_get_aio_context(acb->common.bs),
-                            rbd_finish_bh, rcb);
+    replay_bh_schedule_oneshot_event(bdrv_get_aio_context(acb->common.bs),
+                                     rbd_finish_bh, rcb);
 }
 
 static int rbd_aio_discard_wrapper(rbd_image_t image,
diff --git a/block/vxhs.c b/block/vxhs.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vxhs.c
+++ b/block/vxhs.c
@@ -XXX,XX +XXX,XX @@
 #include "qapi/error.h"
 #include "qemu/uuid.h"
 #include "crypto/tlscredsx509.h"
+#include "sysemu/replay.h"
 
 #define VXHS_OPT_FILENAME           "filename"
 #define VXHS_OPT_VDISK_ID           "vdisk-id"
@@ -XXX,XX +XXX,XX @@ static void vxhs_iio_callback(void *ctx, uint32_t opcode, uint32_t error)
             trace_vxhs_iio_callback(error);
         }
 
-        aio_bh_schedule_oneshot(bdrv_get_aio_context(acb->common.bs),
-                                vxhs_complete_aio_bh, acb);
+        replay_bh_schedule_oneshot_event(bdrv_get_aio_context(acb->common.bs),
+                                         vxhs_complete_aio_bh, acb);
         break;
 
     default:
diff --git a/replay/replay-events.c b/replay/replay-events.c
index XXXXXXX..XXXXXXX 100644
--- a/replay/replay-events.c
+++ b/replay/replay-events.c
@@ -XXX,XX +XXX,XX @@ static void replay_run_event(Event *event)
     case REPLAY_ASYNC_EVENT_BH:
         aio_bh_call(event->opaque);
         break;
+    case REPLAY_ASYNC_EVENT_BH_ONESHOT:
+        ((QEMUBHFunc *)event->opaque)(event->opaque2);
+        break;
     case REPLAY_ASYNC_EVENT_INPUT:
         qemu_input_event_send_impl(NULL, (InputEvent *)event->opaque);
         qapi_free_InputEvent((InputEvent *)event->opaque);
@@ -XXX,XX +XXX,XX @@ void replay_bh_schedule_event(QEMUBH *bh)
     }
 }
 
+void replay_bh_schedule_oneshot_event(AioContext *ctx,
+    QEMUBHFunc *cb, void *opaque)
+{
+    if (events_enabled) {
+        uint64_t id = replay_get_current_icount();
+        replay_add_event(REPLAY_ASYNC_EVENT_BH_ONESHOT, cb, opaque, id);
+    } else {
+        aio_bh_schedule_oneshot(ctx, cb, opaque);
+    }
+}
+
 void replay_add_input_event(struct InputEvent *event)
 {
     replay_add_event(REPLAY_ASYNC_EVENT_INPUT, event, NULL, 0);
@@ -XXX,XX +XXX,XX @@ static void replay_save_event(Event *event, int checkpoint)
         /* save event-specific data */
         switch (event->event_kind) {
         case REPLAY_ASYNC_EVENT_BH:
+        case REPLAY_ASYNC_EVENT_BH_ONESHOT:
             replay_put_qword(event->id);
             break;
         case REPLAY_ASYNC_EVENT_INPUT:
@@ -XXX,XX +XXX,XX @@ static Event *replay_read_event(int checkpoint)
     /* Events that has not to be in the queue */
     switch (replay_state.read_event_kind) {
     case REPLAY_ASYNC_EVENT_BH:
+    case REPLAY_ASYNC_EVENT_BH_ONESHOT:
         if (replay_state.read_event_id == -1) {
             replay_state.read_event_id = replay_get_qword();
         }
diff --git a/stubs/replay-user.c b/stubs/replay-user.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/stubs/replay-user.c
@@ -XXX,XX +XXX,XX @@
+#include "qemu/osdep.h"
+#include "sysemu/replay.h"
+#include "sysemu/sysemu.h"
+
+void replay_bh_schedule_oneshot_event(AioContext *ctx,
+    QEMUBHFunc *cb, void *opaque)
+{
+    aio_bh_schedule_oneshot(ctx, cb, opaque);
+}
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index XXXXXXX..XXXXXXX 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -XXX,XX +XXX,XX @@ stub-obj-y += monitor.o
 stub-obj-y += notify-event.o
 stub-obj-y += qtest.o
 stub-obj-y += replay.o
+stub-obj-y += replay-user.o
 stub-obj-y += runstate-check.o
 stub-obj-y += set-fd-handler.o
 stub-obj-y += sysbus.o
-- 
2.20.1

From: Alberto Garcia <berto@igalia.com>

The BDRV_REQ_NO_FALLBACK flag means that an operation should only be
performed if it can be offloaded or otherwise performed efficiently.

However a misaligned write request requires a RMW so we should return
an error and let the caller decide how to proceed.

This hits an assertion since commit c8bb23cbdb if the required
alignment is larger than the cluster size:

qemu-img create -f qcow2 -o cluster_size=2k img.qcow2 4G
qemu-io -c "open -o driver=qcow2,file.align=4k blkdebug::img.qcow2" \
        -c 'write 0 512'
qemu-io: block/io.c:1127: bdrv_driver_pwritev: Assertion `!(flags & BDRV_REQ_NO_FALLBACK)' failed.
Aborted

The reason is that when writing to an unallocated cluster we try to
skip the copy-on-write part and zeroize it using BDRV_REQ_NO_FALLBACK
instead, resulting in a write request that is too small (2KB cluster
size vs 4KB required alignment).

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/io.c                 |  7 +++++
 tests/qemu-iotests/268     | 55 ++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/268.out |  7 +++++
 tests/qemu-iotests/group   |  1 +
 4 files changed, 70 insertions(+)
 create mode 100755 tests/qemu-iotests/268
 create mode 100644 tests/qemu-iotests/268.out

diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child,
         return ret;
     }
 
+    /* If the request is misaligned then we can't make it efficient */
+    if ((flags & BDRV_REQ_NO_FALLBACK) &&
+        !QEMU_IS_ALIGNED(offset | bytes, align))
+    {
+        return -ENOTSUP;
+    }
+
     bdrv_inc_in_flight(bs);
     /*
      * Align write if necessary by performing a read-modify-write cycle.
diff --git a/tests/qemu-iotests/268 b/tests/qemu-iotests/268
new file mode 100755
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/268
@@ -XXX,XX +XXX,XX @@
+#!/usr/bin/env bash
+#
+# Test write request with required alignment larger than the cluster size
+#
+# Copyright (C) 2019 Igalia, S.L.
+# Author: Alberto Garcia <berto@igalia.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# creator
+owner=berto@igalia.com
+
+seq=`basename $0`
+echo "QA output created by $seq"
+
+status=1	# failure is the default!
+
+_cleanup()
+{
+    _cleanup_test_img
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+
+_supported_fmt qcow2
+_supported_proto file
+
+echo
+echo "== Required alignment larger than cluster size =="
+
+CLUSTER_SIZE=2k _make_test_img 1M
+# Since commit c8bb23cbdb writing to an unallocated cluster fills the
+# empty COW areas with bdrv_write_zeroes(flags=BDRV_REQ_NO_FALLBACK)
+$QEMU_IO -c "open -o driver=$IMGFMT,file.align=4k blkdebug::$TEST_IMG" \
+         -c "write 0 512" | _filter_qemu_io
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/268.out b/tests/qemu-iotests/268.out
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/268.out
@@ -XXX,XX +XXX,XX @@
+QA output created by 268
+
+== Required alignment larger than cluster size ==
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+wrote 512/512 bytes at offset 0
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -XXX,XX +XXX,XX @@
 265 rw auto quick
 266 rw quick
 267 rw auto quick snapshot
+268 rw auto quick
-- 
2.20.1

From: Max Reitz <mreitz@redhat.com>

For long test image paths, the order of the "Formatting" line and the
"(qemu)" prompt after a drive_backup HMP command may be reversed.  In
fact, the interaction between the prompt and the line may lead to the
"Formatting" to being greppable at all after "read"-ing it (if the
prompt injects an IFS character into the "Formatting" string).

So just wait until we get a prompt.  At that point, the block job must
have been started, so "info block-jobs" will only return "No active
jobs" once it is done.

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/028     | 11 ++++++++---
 tests/qemu-iotests/028.out |  1 -
 2 files changed, 8 insertions(+), 4 deletions(-)

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 @@ fi
 # Silence output since it contains the disk image path and QEMU's readline
 # character echoing makes it very hard to filter the output. Plus, there
 # is no telling how many times the command will repeat before succeeding.
-_send_qemu_cmd $h "drive_backup disk ${TEST_IMG}.copy" "(qemu)" >/dev/null
-_send_qemu_cmd $h "" "Formatting" | _filter_img_create
-qemu_cmd_repeat=20 _send_qemu_cmd $h "info block-jobs" "No active jobs" >/dev/null
+# (Note that creating the image results in a "Formatting..." message over
+# stdout, which is the same channel the monitor uses.  We cannot reliably
+# wait for it because the monitor output may interact with it in such a
+# way that _timed_wait_for cannot read it.  However, once the block job is
+# done, we know that the "Formatting..." message must have appeared
+# already, so the output is still deterministic.)
+silent=y _send_qemu_cmd $h "drive_backup disk ${TEST_IMG}.copy" "(qemu)"
+silent=y qemu_cmd_repeat=20 _send_qemu_cmd $h "info block-jobs" "No active jobs"
 _send_qemu_cmd $h "info block-jobs" "No active jobs"
 _send_qemu_cmd $h 'quit' ""
 
diff --git a/tests/qemu-iotests/028.out b/tests/qemu-iotests/028.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/028.out
+++ b/tests/qemu-iotests/028.out
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 
 block-backup
 
-Formatting 'TEST_DIR/t.IMGFMT.copy', fmt=IMGFMT size=4294968832 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT
 (qemu) info block-jobs
 No active jobs
 === IO: pattern 195
-- 
2.20.1