Series comparison

-[PULL 00/36] Block patches
+[PULL 0/2] Block patches
-The following changes since commit 98b2e3c9ab3abfe476a2b02f8f51813edb90e72d:
+The following changes since commit 346ed3151f1c43e72c40cb55b392a1d4cface62c:
-  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-10-08 16:08:35 +0100)
+  Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20200206.0' into staging (2020-02-07 11:52:15 +0000)
 are available in the Git repository at:
-  https://github.com/XanClic/qemu.git tags/pull-block-2019-10-10
+  https://github.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 35f05b2e2ee59e077bf949057dc0959ddd6e5249:
+for you to fetch changes up to 11a18c84db4a71497d3d40769688a01b6f64b2ad:
-  iotests/162: Fix for newer Linux 5.3+ (2019-10-10 12:13:23 +0200)
+  hw/core: Allow setting 'virtio-blk-device.scsi' property on OSX host (2020-02-07 16:49:39 +0000)
 ----------------------------------------------------------------
-Block patches:
+Pull request
 - Parallelized request handling for qcow2
 - Backup job refactoring to use a filter node instead of before-write
   notifiers
 - Add discard accounting information to file-posix nodes
 - Allow trivial reopening of nbd nodes
 - Some iotest fixes
 ----------------------------------------------------------------
-Anton Nefedov (9):
-  qapi: group BlockDeviceStats fields
-  qapi: add unmap to BlockDeviceStats
-  block: add empty account cookie type
-  ide: account UNMAP (TRIM) operations
-  scsi: store unmap offset and nb_sectors in request struct
-  scsi: move unmap error checking to the complete callback
-  scsi: account unmap operations
-  file-posix: account discard operations
-  qapi: query-blockstat: add driver specific file-posix stats
-Daniel P. Berrangé (1):
+Philippe Mathieu-Daudé (1):
-  tests: fix I/O test for hosts defaulting to LUKSv2
+  hw/core: Allow setting 'virtio-blk-device.scsi' property on OSX host
-Max Reitz (4):
+Vladimir Sementsov-Ogievskiy (1):
-  iotests: Fix 125 for growth_mode = metadata
+  block: fix crash on zero-length unaligned write and read
   iotests: Disable 125 on broken XFS versions
   iotests: Use stat -c %b in 125
   iotests/162: Fix for newer Linux 5.3+
-Maxim Levitsky (1):
+ block/io.c        | 28 +++++++++++++++++++++++++++-
-  nbd: add empty .bdrv_reopen_prepare
+ hw/core/machine.c |  3 ++-
+files changed, 29 insertions(+), 2 deletions(-)
 Vladimir Sementsov-Ogievskiy (21):
   qemu-iotests: ignore leaks on failure paths in 026
   block: introduce aio task pool
   block/qcow2: refactor qcow2_co_preadv_part
   block/qcow2: refactor qcow2_co_pwritev_part
   block/qcow2: introduce parallel subrequest handling in read and write
   block/backup: fix max_transfer handling for copy_range
   block/backup: fix backup_cow_with_offload for last cluster
   block/backup: split shareable copying part from backup_do_cow
   block/backup: improve comment about image fleecing
   block/backup: introduce BlockCopyState
   block/backup: fix block-comment style
   block: move block_copy from block/backup.c to separate file
   block: teach bdrv_debug_breakpoint skip filters with backing
   iotests: prepare 124 and 257 bitmap querying for backup-top filter
   iotests: 257: drop unused Drive.device field
   iotests: 257: drop device_add
   block/backup: move in-flight requests handling from backup to
     block-copy
   block/backup: move write_flags calculation inside backup_job_create
   block/block-copy: split block_copy_set_callbacks function
   block: introduce backup-top filter driver
   block/backup: use backup-top instead of write notifiers
  block/Makefile.objs                |   4 +
  qapi/block-core.json               |  89 +++-
  block/backup-top.h                 |  41 ++
  block/qcow2.h                      |   3 +
  include/block/accounting.h         |   2 +
  include/block/aio_task.h           |  54 +++
  include/block/block-copy.h         |  93 ++++
  include/block/block.h              |   1 +
  include/block/block_int.h          |   2 +
  block.c                            |  43 +-
  block/accounting.c                 |   6 +
  block/aio_task.c                   | 124 +++++
  block/backup-top.c                 | 276 +++++++++++
  block/backup.c                     | 443 ++++--------------
  block/block-copy.c                 | 345 ++++++++++++++
  block/file-posix.c                 |  54 ++-
  block/nbd.c                        |  15 +
  block/qapi.c                       |  11 +
  block/qcow2.c                      | 466 ++++++++++++-------
  block/replication.c                |   2 +-
  blockdev.c                         |   1 +
  hw/ide/core.c                      |  12 +
  hw/scsi/scsi-disk.c                |  34 +-
  block/trace-events                 |  15 +-
  tests/qemu-iotests/026             |   6 +-
  tests/qemu-iotests/026.out         |  80 +---
  tests/qemu-iotests/026.out.nocache |  80 +---
  tests/qemu-iotests/056             |   8 +-
  tests/qemu-iotests/124             |  83 ++--
  tests/qemu-iotests/125             |  45 +-
  tests/qemu-iotests/141.out         |   2 +-
  tests/qemu-iotests/149             |   2 +-
  tests/qemu-iotests/149.out         |  44 +-
  tests/qemu-iotests/162             |   2 +-
  tests/qemu-iotests/162.out         |   2 +-
  tests/qemu-iotests/227.out         |  18 +
  tests/qemu-iotests/257             |  91 ++--
  tests/qemu-iotests/257.out         | 714 ++++++++++++-----------------
  tests/qemu-iotests/common.rc       |  17 +
  tests/qemu-iotests/iotests.py      |  27 ++
 files changed, 2108 insertions(+), 1249 deletions(-)
  create mode 100644 block/backup-top.h
  create mode 100644 include/block/aio_task.h
  create mode 100644 include/block/block-copy.h
  create mode 100644 block/aio_task.c
  create mode 100644 block/backup-top.c
  create mode 100644 block/block-copy.c
 --
-.21.0
+.24.1

-[PULL 01/36] qemu-iotests: ignore leaks on failure paths in 026
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Upcoming asynchronous handling of sub-parts of qcow2 requests will
-change number of leaked clusters and even make it racy. As a
-preparation, ignore leaks on failure parts in 026.
-It's not trivial to just grep or substitute qemu-img output for such
-thing. Instead do better: 3 is a error code of qemu-img check, if only
-leaks are found. Catch this case and print success output.
-Suggested-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20190916175324.18478-2-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/026             |  6 +--
- tests/qemu-iotests/026.out         | 80 ++++++++----------------------
- tests/qemu-iotests/026.out.nocache | 80 ++++++++----------------------
- tests/qemu-iotests/common.rc       | 17 +++++++
-files changed, 60 insertions(+), 123 deletions(-)
-diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/026
-+++ b/tests/qemu-iotests/026
-@@ -XXX,XX +XXX,XX @@ if [ "$event" == "l2_load" ]; then
-     $QEMU_IO -c "read $vmstate 0 128k " "$BLKDBG_TEST_IMG" | _filter_qemu_io
- fi
--_check_test_img 2>&1 | grep -v "refcount=1 reference=0"
-+_check_test_img_ignore_leaks 2>&1 | grep -v "refcount=1 reference=0"
- done
- done
-@@ -XXX,XX +XXX,XX @@ echo
- echo "Event: $event; errno: $errno; imm: $imm; once: $once; write $vmstate"
- $QEMU_IO -c "write $vmstate 0 64M" "$BLKDBG_TEST_IMG" | _filter_qemu_io
--_check_test_img 2>&1 | grep -v "refcount=1 reference=0"
-+_check_test_img_ignore_leaks 2>&1 | grep -v "refcount=1 reference=0"
- done
- done
-@@ -XXX,XX +XXX,XX @@ echo
- echo "Event: $event; errno: $errno; imm: $imm; once: $once"
- $QEMU_IO -c "write -b 0 64k" "$BLKDBG_TEST_IMG" | _filter_qemu_io
--_check_test_img 2>&1 | grep -v "refcount=1 reference=0"
-+_check_test_img_ignore_leaks 2>&1 | grep -v "refcount=1 reference=0"
- done
- done
-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 @@ Event: l1_update; errno: 5; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l1_update; errno: 28; imm: off; once: on; write
-@@ -XXX,XX +XXX,XX @@ Event: l1_update; errno: 28; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l2_load; errno: 5; imm: off; once: on; write
-@@ -XXX,XX +XXX,XX @@ Event: l2_update; errno: 5; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l2_update; errno: 28; imm: off; once: on; write
-@@ -XXX,XX +XXX,XX @@ Event: l2_update; errno: 28; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+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: on; write
-@@ -XXX,XX +XXX,XX @@ Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b
- 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.
--This means waste of disk space, but no harm to data.
-+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: on; write
-@@ -XXX,XX +XXX,XX @@ Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b
- 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.
--This means waste of disk space, but no harm to data.
-+No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: write_aio; errno: 5; imm: off; once: on; write
-@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+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: on; write
-@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+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: on; write
-@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+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: on; write
-@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+No errors were found on the image.
- === L1 growth tests ===
-@@ -XXX,XX +XXX,XX @@ Event: l1_grow_activate_table; errno: 5; imm: off; once: off
- 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.
--This means waste of disk space, but no harm to data.
-+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: on
-@@ -XXX,XX +XXX,XX @@ Event: l1_grow_activate_table; errno: 28; imm: off; once: off
- 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.
--This means waste of disk space, but no harm to data.
-+No errors were found on the image.
- === Avoid cluster leaks after temporary failure ===
-diff --git a/tests/qemu-iotests/026.out.nocache b/tests/qemu-iotests/026.out.nocache
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/026.out.nocache
-+++ b/tests/qemu-iotests/026.out.nocache
-@@ -XXX,XX +XXX,XX @@ Event: l1_update; errno: 5; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l1_update; errno: 28; imm: off; once: on; write
-@@ -XXX,XX +XXX,XX @@ Event: l1_update; errno: 28; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l2_load; errno: 5; imm: off; once: on; write
-@@ -XXX,XX +XXX,XX @@ qemu-io: Failed to flush the L2 table cache: Input/output error
- qemu-io: Failed to flush the refcount block cache: Input/output error
- wrote 131072/131072 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--
--127 leaked clusters were found on the image.
--This means waste of disk space, but no harm to data.
-+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 -b
-@@ -XXX,XX +XXX,XX @@ qemu-io: Failed to flush the L2 table cache: Input/output error
- qemu-io: Failed to flush the refcount block cache: Input/output error
- wrote 131072/131072 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--
--127 leaked clusters were found on the image.
--This means waste of disk space, but no harm to data.
-+No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: l2_update; errno: 28; imm: off; once: on; write
-@@ -XXX,XX +XXX,XX @@ 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
- wrote 131072/131072 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--
--127 leaked clusters were found on the image.
--This means waste of disk space, but no harm to data.
-+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 -b
-@@ -XXX,XX +XXX,XX @@ 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
- wrote 131072/131072 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--
--127 leaked clusters were found on the image.
--This means waste of disk space, but no harm to data.
-+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: on; write
-@@ -XXX,XX +XXX,XX @@ Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b
- 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.
--This means waste of disk space, but no harm to data.
-+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: on; write
-@@ -XXX,XX +XXX,XX @@ Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b
- 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.
--This means waste of disk space, but no harm to data.
-+No errors were found on the image.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
- Event: write_aio; errno: 5; imm: off; once: on; write
-@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+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: on; write
-@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+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: on; write
-@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+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: on; write
-@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write
- 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.
--This means waste of disk space, but no harm to data.
-+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 -b
- 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.
--This means waste of disk space, but no harm to data.
-+No errors were found on the image.
- === L1 growth tests ===
-@@ -XXX,XX +XXX,XX @@ Event: l1_grow_activate_table; errno: 5; imm: off; once: off
- 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.
--This means waste of disk space, but no harm to data.
-+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: on
-@@ -XXX,XX +XXX,XX @@ Event: l1_grow_activate_table; errno: 28; imm: off; once: off
- 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.
--This means waste of disk space, but no harm to data.
-+No errors were found on the image.
- === Avoid cluster leaks after temporary failure ===
-diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common.rc
-+++ b/tests/qemu-iotests/common.rc
-@@ -XXX,XX +XXX,XX @@ _check_test_img()
-             $QEMU_IMG check "$@" -f $IMGFMT "$TEST_IMG" 2>&1
-         fi
-     ) | _filter_testdir | _filter_qemu_img_check
-+
-+    # return real qemu_img check status, to analyze in
-+    # _check_test_img_ignore_leaks
-+    return ${PIPESTATUS[0]}
-+}
-+
-+_check_test_img_ignore_leaks()
-+{
-+    out=$(_check_test_img "$@")
-+    status=$?
-+    if [ $status = 3 ]; then
-+        # This must correspond to success output in dump_human_image_check()
-+        echo "No errors were found on the image."
-+        return 0
-+    fi
-+    echo "$out"
-+    return $status
- }
- _img_info()
---
-.21.0

-[PULL 02/36] block: introduce aio task pool
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Common interface for aio task loops. To be used for improving
-performance of synchronous io loops in qcow2, block-stream,
-copy-on-read, and may be other places.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190916175324.18478-3-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/Makefile.objs      |   2 +
- include/block/aio_task.h |  54 +++++++++++++++++
- block/aio_task.c         | 124 +++++++++++++++++++++++++++++++++++++++
-files changed, 180 insertions(+)
- create mode 100644 include/block/aio_task.h
- create mode 100644 block/aio_task.c
-diff --git a/block/Makefile.objs b/block/Makefile.objs
-index XXXXXXX..XXXXXXX 100644
---- a/block/Makefile.objs
-+++ b/block/Makefile.objs
-@@ -XXX,XX +XXX,XX @@ block-obj-y += throttle.o copy-on-read.o
- block-obj-y += crypto.o
-+block-obj-y += aio_task.o
-+
- common-obj-y += stream.o
- nfs.o-libs         := $(LIBNFS_LIBS)
-diff --git a/include/block/aio_task.h b/include/block/aio_task.h
-new file mode 100644
-index XXXXXXX..XXXXXXX
---- /dev/null
-+++ b/include/block/aio_task.h
-@@ -XXX,XX +XXX,XX @@
-+/*
-+ * Aio tasks loops
-+ *
-+ * Copyright (c) 2019 Virtuozzo International GmbH.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+ * THE SOFTWARE.
-+ */
-+
-+#ifndef BLOCK_AIO_TASK_H
-+#define BLOCK_AIO_TASK_H
-+
-+#include "qemu/coroutine.h"
-+
-+typedef struct AioTaskPool AioTaskPool;
-+typedef struct AioTask AioTask;
-+typedef int coroutine_fn (*AioTaskFunc)(AioTask *task);
-+struct AioTask {
-+    AioTaskPool *pool;
-+    AioTaskFunc func;
-+    int ret;
-+};
-+
-+AioTaskPool *coroutine_fn aio_task_pool_new(int max_busy_tasks);
-+void aio_task_pool_free(AioTaskPool *);
-+
-+/* error code of failed task or 0 if all is OK */
-+int aio_task_pool_status(AioTaskPool *pool);
-+
-+bool aio_task_pool_empty(AioTaskPool *pool);
-+
-+/* User provides filled @task, however task->pool will be set automatically */
-+void coroutine_fn aio_task_pool_start_task(AioTaskPool *pool, AioTask *task);
-+
-+void coroutine_fn aio_task_pool_wait_slot(AioTaskPool *pool);
-+void coroutine_fn aio_task_pool_wait_one(AioTaskPool *pool);
-+void coroutine_fn aio_task_pool_wait_all(AioTaskPool *pool);
-+
-+#endif /* BLOCK_AIO_TASK_H */
-diff --git a/block/aio_task.c b/block/aio_task.c
-new file mode 100644
-index XXXXXXX..XXXXXXX
---- /dev/null
-+++ b/block/aio_task.c
-@@ -XXX,XX +XXX,XX @@
-+/*
-+ * Aio tasks loops
-+ *
-+ * Copyright (c) 2019 Virtuozzo International GmbH.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+ * THE SOFTWARE.
-+ */
-+
-+#include "qemu/osdep.h"
-+#include "block/aio.h"
-+#include "block/aio_task.h"
-+
-+struct AioTaskPool {
-+    Coroutine *main_co;
-+    int status;
-+    int max_busy_tasks;
-+    int busy_tasks;
-+    bool waiting;
-+};
-+
-+static void coroutine_fn aio_task_co(void *opaque)
-+{
-+    AioTask *task = opaque;
-+    AioTaskPool *pool = task->pool;
-+
-+    assert(pool->busy_tasks < pool->max_busy_tasks);
-+    pool->busy_tasks++;
-+
-+    task->ret = task->func(task);
-+
-+    pool->busy_tasks--;
-+
-+    if (task->ret < 0 && pool->status == 0) {
-+        pool->status = task->ret;
-+    }
-+
-+    g_free(task);
-+
-+    if (pool->waiting) {
-+        pool->waiting = false;
-+        aio_co_wake(pool->main_co);
-+    }
-+}
-+
-+void coroutine_fn aio_task_pool_wait_one(AioTaskPool *pool)
-+{
-+    assert(pool->busy_tasks > 0);
-+    assert(qemu_coroutine_self() == pool->main_co);
-+
-+    pool->waiting = true;
-+    qemu_coroutine_yield();
-+
-+    assert(!pool->waiting);
-+    assert(pool->busy_tasks < pool->max_busy_tasks);
-+}
-+
-+void coroutine_fn aio_task_pool_wait_slot(AioTaskPool *pool)
-+{
-+    if (pool->busy_tasks < pool->max_busy_tasks) {
-+        return;
-+    }
-+
-+    aio_task_pool_wait_one(pool);
-+}
-+
-+void coroutine_fn aio_task_pool_wait_all(AioTaskPool *pool)
-+{
-+    while (pool->busy_tasks > 0) {
-+        aio_task_pool_wait_one(pool);
-+    }
-+}
-+
-+void coroutine_fn aio_task_pool_start_task(AioTaskPool *pool, AioTask *task)
-+{
-+    aio_task_pool_wait_slot(pool);
-+
-+    task->pool = pool;
-+    qemu_coroutine_enter(qemu_coroutine_create(aio_task_co, task));
-+}
-+
-+AioTaskPool *coroutine_fn aio_task_pool_new(int max_busy_tasks)
-+{
-+    AioTaskPool *pool = g_new0(AioTaskPool, 1);
-+
-+    pool->main_co = qemu_coroutine_self();
-+    pool->max_busy_tasks = max_busy_tasks;
-+
-+    return pool;
-+}
-+
-+void aio_task_pool_free(AioTaskPool *pool)
-+{
-+    g_free(pool);
-+}
-+
-+int aio_task_pool_status(AioTaskPool *pool)
-+{
-+    if (!pool) {
-+        return 0; /* Sugar for lazy allocation of aio pool */
-+    }
-+
-+    return pool->status;
-+}
-+
-+bool aio_task_pool_empty(AioTaskPool *pool)
-+{
-+    return pool->busy_tasks == 0;
-+}
---
-.21.0

-[PULL 03/36] block/qcow2: refactor qcow2_co_preadv_part
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Further patch will run partial requests of iterations of
-qcow2_co_preadv in parallel for performance reasons. To prepare for
-this, separate part which may be parallelized into separate function
-(qcow2_co_preadv_task).
-While being here, also separate encrypted clusters reading to own
-function, like it is done for compressed reading.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190916175324.18478-4-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/qcow2.c | 209 +++++++++++++++++++++++++++-----------------------
-file changed, 113 insertions(+), 96 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 @@ out:
-     return ret;
- }
-+static coroutine_fn int
-+qcow2_co_preadv_encrypted(BlockDriverState *bs,
-+                           uint64_t file_cluster_offset,
-+                           uint64_t offset,
-+                           uint64_t bytes,
-+                           QEMUIOVector *qiov,
-+                           uint64_t qiov_offset)
-+{
-+    int ret;
-+    BDRVQcow2State *s = bs->opaque;
-+    uint8_t *buf;
-+
-+    assert(bs->encrypted && s->crypto);
-+    assert(bytes <= QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size);
-+
-+    /*
-+     * For encrypted images, read everything into a temporary
-+     * contiguous buffer on which the AES functions can work.
-+     * Also, decryption in a separate buffer is better as it
-+     * prevents the guest from learning information about the
-+     * encrypted nature of the virtual disk.
-+     */
-+
-+    buf = qemu_try_blockalign(s->data_file->bs, bytes);
-+    if (buf == NULL) {
-+        return -ENOMEM;
-+    }
-+
-+    BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
-+    ret = bdrv_co_pread(s->data_file,
-+                        file_cluster_offset + offset_into_cluster(s, offset),
-+                        bytes, buf, 0);
-+    if (ret < 0) {
-+        goto fail;
-+    }
-+
-+    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
-+    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
-+    if (qcow2_co_decrypt(bs,
-+                         file_cluster_offset + offset_into_cluster(s, offset),
-+                         offset, buf, bytes) < 0)
-+    {
-+        ret = -EIO;
-+        goto fail;
-+    }
-+    qemu_iovec_from_buf(qiov, qiov_offset, buf, bytes);
-+
-+fail:
-+    qemu_vfree(buf);
-+
-+    return ret;
-+}
-+
-+static coroutine_fn int qcow2_co_preadv_task(BlockDriverState *bs,
-+                                             QCow2ClusterType cluster_type,
-+                                             uint64_t file_cluster_offset,
-+                                             uint64_t offset, uint64_t bytes,
-+                                             QEMUIOVector *qiov,
-+                                             size_t qiov_offset)
-+{
-+    BDRVQcow2State *s = bs->opaque;
-+    int offset_in_cluster = offset_into_cluster(s, offset);
-+
-+    switch (cluster_type) {
-+    case QCOW2_CLUSTER_ZERO_PLAIN:
-+    case QCOW2_CLUSTER_ZERO_ALLOC:
-+        /* Both zero types are handled in qcow2_co_preadv_part */
-+        g_assert_not_reached();
-+
-+    case QCOW2_CLUSTER_UNALLOCATED:
-+        assert(bs->backing); /* otherwise handled in qcow2_co_preadv_part */
-+
-+        BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
-+        return bdrv_co_preadv_part(bs->backing, offset, bytes,
-+                                   qiov, qiov_offset, 0);
-+
-+    case QCOW2_CLUSTER_COMPRESSED:
-+        return qcow2_co_preadv_compressed(bs, file_cluster_offset,
-+                                          offset, bytes, qiov, qiov_offset);
-+
-+    case QCOW2_CLUSTER_NORMAL:
-+        if ((file_cluster_offset & 511) != 0) {
-+            return -EIO;
-+        }
-+
-+        if (bs->encrypted) {
-+            return qcow2_co_preadv_encrypted(bs, file_cluster_offset,
-+                                             offset, bytes, qiov, qiov_offset);
-+        }
-+
-+        BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
-+        return bdrv_co_preadv_part(s->data_file,
-+                                   file_cluster_offset + offset_in_cluster,
-+                                   bytes, qiov, qiov_offset, 0);
-+
-+    default:
-+        g_assert_not_reached();
-+    }
-+
-+    g_assert_not_reached();
-+}
-+
- static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
-                                              uint64_t offset, uint64_t bytes,
-                                              QEMUIOVector *qiov,
-                                              size_t qiov_offset, int flags)
- {
-     BDRVQcow2State *s = bs->opaque;
--    int offset_in_cluster;
-     int ret;
-     unsigned int cur_bytes; /* number of bytes in current iteration */
-     uint64_t cluster_offset = 0;
--    uint8_t *cluster_data = NULL;
-     while (bytes != 0) {
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
-         ret = qcow2_get_cluster_offset(bs, offset, &cur_bytes, &cluster_offset);
-         qemu_co_mutex_unlock(&s->lock);
-         if (ret < 0) {
--            goto fail;
-+            return ret;
-         }
--        offset_in_cluster = offset_into_cluster(s, offset);
--
--        switch (ret) {
--        case QCOW2_CLUSTER_UNALLOCATED:
--
--            if (bs->backing) {
--                BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
--                ret = bdrv_co_preadv_part(bs->backing, offset, cur_bytes,
--                                          qiov, qiov_offset, 0);
--                if (ret < 0) {
--                    goto fail;
--                }
--            } else {
--                /* Note: in this case, no need to wait */
--                qemu_iovec_memset(qiov, qiov_offset, 0, cur_bytes);
--            }
--            break;
--
--        case QCOW2_CLUSTER_ZERO_PLAIN:
--        case QCOW2_CLUSTER_ZERO_ALLOC:
-+        if (ret == QCOW2_CLUSTER_ZERO_PLAIN ||
-+            ret == QCOW2_CLUSTER_ZERO_ALLOC ||
-+            (ret == QCOW2_CLUSTER_UNALLOCATED && !bs->backing))
-+        {
-             qemu_iovec_memset(qiov, qiov_offset, 0, cur_bytes);
--            break;
--
--        case QCOW2_CLUSTER_COMPRESSED:
--            ret = qcow2_co_preadv_compressed(bs, cluster_offset,
--                                             offset, cur_bytes,
--                                             qiov, qiov_offset);
-+        } else {
-+            ret = qcow2_co_preadv_task(bs, ret,
-+                                       cluster_offset, offset, cur_bytes,
-+                                       qiov, qiov_offset);
-             if (ret < 0) {
--                goto fail;
--            }
--
--            break;
--
--        case QCOW2_CLUSTER_NORMAL:
--            if ((cluster_offset & 511) != 0) {
--                ret = -EIO;
--                goto fail;
--            }
--
--            if (bs->encrypted) {
--                assert(s->crypto);
--
--                /*
--                 * For encrypted images, read everything into a temporary
--                 * contiguous buffer on which the AES functions can work.
--                 */
--                if (!cluster_data) {
--                    cluster_data =
--                        qemu_try_blockalign(s->data_file->bs,
--                                            QCOW_MAX_CRYPT_CLUSTERS
--                                            * s->cluster_size);
--                    if (cluster_data == NULL) {
--                        ret = -ENOMEM;
--                        goto fail;
--                    }
--                }
--
--                assert(cur_bytes <= QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size);
--
--                BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
--                ret = bdrv_co_pread(s->data_file,
--                                    cluster_offset + offset_in_cluster,
--                                    cur_bytes, cluster_data, 0);
--                if (ret < 0) {
--                    goto fail;
--                }
--
--                assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
--                assert(QEMU_IS_ALIGNED(cur_bytes, BDRV_SECTOR_SIZE));
--                if (qcow2_co_decrypt(bs, cluster_offset + offset_in_cluster,
--                                     offset,
--                                     cluster_data, cur_bytes) < 0) {
--                    ret = -EIO;
--                    goto fail;
--                }
--                qemu_iovec_from_buf(qiov, qiov_offset, cluster_data, cur_bytes);
--            } else {
--                BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
--                ret = bdrv_co_preadv_part(s->data_file,
--                                          cluster_offset + offset_in_cluster,
--                                          cur_bytes, qiov, qiov_offset, 0);
--                if (ret < 0) {
--                    goto fail;
--                }
-+                return ret;
-             }
--            break;
--
--        default:
--            g_assert_not_reached();
--            ret = -EIO;
--            goto fail;
-         }
-         bytes -= cur_bytes;
-         offset += cur_bytes;
-         qiov_offset += cur_bytes;
-     }
--    ret = 0;
--
--fail:
--    qemu_vfree(cluster_data);
--    return ret;
-+    return 0;
- }
- /* Check if it's possible to merge a write request with the writing of
---
-.21.0

-[PULL 04/36] block/qcow2: refactor qcow2_co_pwritev_part
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Similarly to previous commit, prepare for parallelizing write-loop
-iterations.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190916175324.18478-5-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/qcow2.c | 154 +++++++++++++++++++++++++++++---------------------
-file changed, 90 insertions(+), 64 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 handle_alloc_space(BlockDriverState *bs, QCowL2Meta *l2meta)
-     return 0;
- }
-+/*
-+ * qcow2_co_pwritev_task
-+ * Called with s->lock unlocked
-+ * l2meta  - if not NULL, qcow2_co_pwritev_task() will consume it. Caller must
-+ *           not use it somehow after qcow2_co_pwritev_task() call
-+ */
-+static coroutine_fn int qcow2_co_pwritev_task(BlockDriverState *bs,
-+                                              uint64_t file_cluster_offset,
-+                                              uint64_t offset, uint64_t bytes,
-+                                              QEMUIOVector *qiov,
-+                                              uint64_t qiov_offset,
-+                                              QCowL2Meta *l2meta)
-+{
-+    int ret;
-+    BDRVQcow2State *s = bs->opaque;
-+    void *crypt_buf = NULL;
-+    int offset_in_cluster = offset_into_cluster(s, offset);
-+    QEMUIOVector encrypted_qiov;
-+
-+    if (bs->encrypted) {
-+        assert(s->crypto);
-+        assert(bytes <= QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size);
-+        crypt_buf = qemu_try_blockalign(bs->file->bs, bytes);
-+        if (crypt_buf == NULL) {
-+            ret = -ENOMEM;
-+            goto out_unlocked;
-+        }
-+        qemu_iovec_to_buf(qiov, qiov_offset, crypt_buf, bytes);
-+
-+        if (qcow2_co_encrypt(bs, file_cluster_offset + offset_in_cluster,
-+                             offset, crypt_buf, bytes) < 0)
-+        {
-+            ret = -EIO;
-+            goto out_unlocked;
-+        }
-+
-+        qemu_iovec_init_buf(&encrypted_qiov, crypt_buf, bytes);
-+        qiov = &encrypted_qiov;
-+        qiov_offset = 0;
-+    }
-+
-+    /* Try to efficiently initialize the physical space with zeroes */
-+    ret = handle_alloc_space(bs, l2meta);
-+    if (ret < 0) {
-+        goto out_unlocked;
-+    }
-+
-+    /*
-+     * If we need to do COW, check if it's possible to merge the
-+     * writing of the guest data together with that of the COW regions.
-+     * If it's not possible (or not necessary) then write the
-+     * guest data now.
-+     */
-+    if (!merge_cow(offset, bytes, qiov, qiov_offset, l2meta)) {
-+        BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
-+        trace_qcow2_writev_data(qemu_coroutine_self(),
-+                                file_cluster_offset + offset_in_cluster);
-+        ret = bdrv_co_pwritev_part(s->data_file,
-+                                   file_cluster_offset + offset_in_cluster,
-+                                   bytes, qiov, qiov_offset, 0);
-+        if (ret < 0) {
-+            goto out_unlocked;
-+        }
-+    }
-+
-+    qemu_co_mutex_lock(&s->lock);
-+
-+    ret = qcow2_handle_l2meta(bs, &l2meta, true);
-+    goto out_locked;
-+
-+out_unlocked:
-+    qemu_co_mutex_lock(&s->lock);
-+
-+out_locked:
-+    qcow2_handle_l2meta(bs, &l2meta, false);
-+    qemu_co_mutex_unlock(&s->lock);
-+
-+    qemu_vfree(crypt_buf);
-+
-+    return ret;
-+}
-+
- static coroutine_fn int qcow2_co_pwritev_part(
-         BlockDriverState *bs, uint64_t offset, uint64_t bytes,
-         QEMUIOVector *qiov, size_t qiov_offset, int flags)
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_pwritev_part(
-     int ret;
-     unsigned int cur_bytes; /* number of sectors in current iteration */
-     uint64_t cluster_offset;
--    QEMUIOVector encrypted_qiov;
--    uint64_t bytes_done = 0;
--    uint8_t *cluster_data = NULL;
-     QCowL2Meta *l2meta = NULL;
-     trace_qcow2_writev_start_req(qemu_coroutine_self(), offset, bytes);
--    qemu_co_mutex_lock(&s->lock);
--
-     while (bytes != 0) {
-         l2meta = NULL;
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_pwritev_part(
-                             - offset_in_cluster);
-         }
-+        qemu_co_mutex_lock(&s->lock);
-+
-         ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,
-                                          &cluster_offset, &l2meta);
-         if (ret < 0) {
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_pwritev_part(
-         qemu_co_mutex_unlock(&s->lock);
--        if (bs->encrypted) {
--            assert(s->crypto);
--            if (!cluster_data) {
--                cluster_data = qemu_try_blockalign(bs->file->bs,
--                                                   QCOW_MAX_CRYPT_CLUSTERS
--                                                   * s->cluster_size);
--                if (cluster_data == NULL) {
--                    ret = -ENOMEM;
--                    goto out_unlocked;
--                }
--            }
--
--            assert(cur_bytes <= QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size);
--            qemu_iovec_to_buf(qiov, qiov_offset + bytes_done,
--                              cluster_data, cur_bytes);
--
--            if (qcow2_co_encrypt(bs, cluster_offset + offset_in_cluster, offset,
--                                 cluster_data, cur_bytes) < 0) {
--                ret = -EIO;
--                goto out_unlocked;
--            }
--
--            qemu_iovec_init_buf(&encrypted_qiov, cluster_data, cur_bytes);
--        }
--
--        /* Try to efficiently initialize the physical space with zeroes */
--        ret = handle_alloc_space(bs, l2meta);
-+        ret = qcow2_co_pwritev_task(bs, cluster_offset, offset, cur_bytes,
-+                                    qiov, qiov_offset, l2meta);
-+        l2meta = NULL; /* l2meta is consumed by qcow2_co_pwritev_task() */
-         if (ret < 0) {
--            goto out_unlocked;
--        }
--
--        /* If we need to do COW, check if it's possible to merge the
--         * writing of the guest data together with that of the COW regions.
--         * If it's not possible (or not necessary) then write the
--         * guest data now. */
--        if (!merge_cow(offset, cur_bytes,
--                       bs->encrypted ? &encrypted_qiov : qiov,
--                       bs->encrypted ? 0 : qiov_offset + bytes_done, l2meta))
--        {
--            BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
--            trace_qcow2_writev_data(qemu_coroutine_self(),
--                                    cluster_offset + offset_in_cluster);
--            ret = bdrv_co_pwritev_part(
--                    s->data_file, cluster_offset + offset_in_cluster, cur_bytes,
--                    bs->encrypted ? &encrypted_qiov : qiov,
--                    bs->encrypted ? 0 : qiov_offset + bytes_done, 0);
--            if (ret < 0) {
--                goto out_unlocked;
--            }
--        }
--
--        qemu_co_mutex_lock(&s->lock);
--
--        ret = qcow2_handle_l2meta(bs, &l2meta, true);
--        if (ret) {
--            goto out_locked;
-+            goto fail_nometa;
-         }
-         bytes -= cur_bytes;
-         offset += cur_bytes;
--        bytes_done += cur_bytes;
-+        qiov_offset += cur_bytes;
-         trace_qcow2_writev_done_part(qemu_coroutine_self(), cur_bytes);
-     }
-     ret = 0;
--    goto out_locked;
--out_unlocked:
-     qemu_co_mutex_lock(&s->lock);
- out_locked:
-@@ -XXX,XX +XXX,XX @@ out_locked:
-     qemu_co_mutex_unlock(&s->lock);
--    qemu_vfree(cluster_data);
-+fail_nometa:
-     trace_qcow2_writev_done_req(qemu_coroutine_self(), ret);
-     return ret;
---
-.21.0

-[PULL 05/36] block/qcow2: introduce parallel subrequest handling in read and write
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-It improves performance for fragmented qcow2 images.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20190916175324.18478-6-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/qcow2.h      |   3 ++
- block/qcow2.c      | 125 ++++++++++++++++++++++++++++++++++++++++-----
- block/trace-events |   1 +
-files changed, 117 insertions(+), 12 deletions(-)
-diff --git a/block/qcow2.h b/block/qcow2.h
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.h
-+++ b/block/qcow2.h
-@@ -XXX,XX +XXX,XX @@
- #define QCOW2_MAX_BITMAPS 65535
- #define QCOW2_MAX_BITMAP_DIRECTORY_SIZE (1024 * QCOW2_MAX_BITMAPS)
-+/* Maximum of parallel sub-request per guest request */
-+#define QCOW2_MAX_WORKERS 8
-+
- /* indicate that the refcount of the referenced cluster is exactly one. */
- #define QCOW_OFLAG_COPIED     (1ULL << 63)
- /* indicate that the cluster is compressed (they never have the copied flag) */
-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 @@
- #include "qapi/qobject-input-visitor.h"
- #include "qapi/qapi-visit-block-core.h"
- #include "crypto.h"
-+#include "block/aio_task.h"
- /*
-   Differences with QCOW:
-@@ -XXX,XX +XXX,XX @@ fail:
-     return ret;
- }
-+typedef struct Qcow2AioTask {
-+    AioTask task;
-+
-+    BlockDriverState *bs;
-+    QCow2ClusterType cluster_type; /* only for read */
-+    uint64_t file_cluster_offset;
-+    uint64_t offset;
-+    uint64_t bytes;
-+    QEMUIOVector *qiov;
-+    uint64_t qiov_offset;
-+    QCowL2Meta *l2meta; /* only for write */
-+} Qcow2AioTask;
-+
-+static coroutine_fn int qcow2_co_preadv_task_entry(AioTask *task);
-+static coroutine_fn int qcow2_add_task(BlockDriverState *bs,
-+                                       AioTaskPool *pool,
-+                                       AioTaskFunc func,
-+                                       QCow2ClusterType cluster_type,
-+                                       uint64_t file_cluster_offset,
-+                                       uint64_t offset,
-+                                       uint64_t bytes,
-+                                       QEMUIOVector *qiov,
-+                                       size_t qiov_offset,
-+                                       QCowL2Meta *l2meta)
-+{
-+    Qcow2AioTask local_task;
-+    Qcow2AioTask *task = pool ? g_new(Qcow2AioTask, 1) : &local_task;
-+
-+    *task = (Qcow2AioTask) {
-+        .task.func = func,
-+        .bs = bs,
-+        .cluster_type = cluster_type,
-+        .qiov = qiov,
-+        .file_cluster_offset = file_cluster_offset,
-+        .offset = offset,
-+        .bytes = bytes,
-+        .qiov_offset = qiov_offset,
-+        .l2meta = l2meta,
-+    };
-+
-+    trace_qcow2_add_task(qemu_coroutine_self(), bs, pool,
-+                         func == qcow2_co_preadv_task_entry ? "read" : "write",
-+                         cluster_type, file_cluster_offset, offset, bytes,
-+                         qiov, qiov_offset);
-+
-+    if (!pool) {
-+        return func(&task->task);
-+    }
-+
-+    aio_task_pool_start_task(pool, &task->task);
-+
-+    return 0;
-+}
-+
- static coroutine_fn int qcow2_co_preadv_task(BlockDriverState *bs,
-                                              QCow2ClusterType cluster_type,
-                                              uint64_t file_cluster_offset,
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_task(BlockDriverState *bs,
-     g_assert_not_reached();
- }
-+static coroutine_fn int qcow2_co_preadv_task_entry(AioTask *task)
-+{
-+    Qcow2AioTask *t = container_of(task, Qcow2AioTask, task);
-+
-+    assert(!t->l2meta);
-+
-+    return qcow2_co_preadv_task(t->bs, t->cluster_type, t->file_cluster_offset,
-+                                t->offset, t->bytes, t->qiov, t->qiov_offset);
-+}
-+
- static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
-                                              uint64_t offset, uint64_t bytes,
-                                              QEMUIOVector *qiov,
-                                              size_t qiov_offset, int flags)
- {
-     BDRVQcow2State *s = bs->opaque;
--    int ret;
-+    int ret = 0;
-     unsigned int cur_bytes; /* number of bytes in current iteration */
-     uint64_t cluster_offset = 0;
-+    AioTaskPool *aio = NULL;
--    while (bytes != 0) {
--
-+    while (bytes != 0 && aio_task_pool_status(aio) == 0) {
-         /* prepare next request */
-         cur_bytes = MIN(bytes, INT_MAX);
-         if (s->crypto) {
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
-         ret = qcow2_get_cluster_offset(bs, offset, &cur_bytes, &cluster_offset);
-         qemu_co_mutex_unlock(&s->lock);
-         if (ret < 0) {
--            return ret;
-+            goto out;
-         }
-         if (ret == QCOW2_CLUSTER_ZERO_PLAIN ||
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
-         {
-             qemu_iovec_memset(qiov, qiov_offset, 0, cur_bytes);
-         } else {
--            ret = qcow2_co_preadv_task(bs, ret,
--                                       cluster_offset, offset, cur_bytes,
--                                       qiov, qiov_offset);
-+            if (!aio && cur_bytes != bytes) {
-+                aio = aio_task_pool_new(QCOW2_MAX_WORKERS);
-+            }
-+            ret = qcow2_add_task(bs, aio, qcow2_co_preadv_task_entry, ret,
-+                                 cluster_offset, offset, cur_bytes,
-+                                 qiov, qiov_offset, NULL);
-             if (ret < 0) {
--                return ret;
-+                goto out;
-             }
-         }
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
-         qiov_offset += cur_bytes;
-     }
--    return 0;
-+out:
-+    if (aio) {
-+        aio_task_pool_wait_all(aio);
-+        if (ret == 0) {
-+            ret = aio_task_pool_status(aio);
-+        }
-+        g_free(aio);
-+    }
-+
-+    return ret;
- }
- /* Check if it's possible to merge a write request with the writing of
-@@ -XXX,XX +XXX,XX @@ out_locked:
-     return ret;
- }
-+static coroutine_fn int qcow2_co_pwritev_task_entry(AioTask *task)
-+{
-+    Qcow2AioTask *t = container_of(task, Qcow2AioTask, task);
-+
-+    assert(!t->cluster_type);
-+
-+    return qcow2_co_pwritev_task(t->bs, t->file_cluster_offset,
-+                                 t->offset, t->bytes, t->qiov, t->qiov_offset,
-+                                 t->l2meta);
-+}
-+
- static coroutine_fn int qcow2_co_pwritev_part(
-         BlockDriverState *bs, uint64_t offset, uint64_t bytes,
-         QEMUIOVector *qiov, size_t qiov_offset, int flags)
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_pwritev_part(
-     unsigned int cur_bytes; /* number of sectors in current iteration */
-     uint64_t cluster_offset;
-     QCowL2Meta *l2meta = NULL;
-+    AioTaskPool *aio = NULL;
-     trace_qcow2_writev_start_req(qemu_coroutine_self(), offset, bytes);
--    while (bytes != 0) {
-+    while (bytes != 0 && aio_task_pool_status(aio) == 0) {
-         l2meta = NULL;
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_pwritev_part(
-         qemu_co_mutex_unlock(&s->lock);
--        ret = qcow2_co_pwritev_task(bs, cluster_offset, offset, cur_bytes,
--                                    qiov, qiov_offset, l2meta);
-+        if (!aio && cur_bytes != bytes) {
-+            aio = aio_task_pool_new(QCOW2_MAX_WORKERS);
-+        }
-+        ret = qcow2_add_task(bs, aio, qcow2_co_pwritev_task_entry, 0,
-+                             cluster_offset, offset, cur_bytes,
-+                             qiov, qiov_offset, l2meta);
-         l2meta = NULL; /* l2meta is consumed by qcow2_co_pwritev_task() */
-         if (ret < 0) {
-             goto fail_nometa;
-@@ -XXX,XX +XXX,XX @@ out_locked:
-     qemu_co_mutex_unlock(&s->lock);
- fail_nometa:
-+    if (aio) {
-+        aio_task_pool_wait_all(aio);
-+        if (ret == 0) {
-+            ret = aio_task_pool_status(aio);
-+        }
-+        g_free(aio);
-+    }
-+
-     trace_qcow2_writev_done_req(qemu_coroutine_self(), ret);
-     return ret;
-diff --git a/block/trace-events b/block/trace-events
-index XXXXXXX..XXXXXXX 100644
---- a/block/trace-events
-+++ b/block/trace-events
-@@ -XXX,XX +XXX,XX @@ file_paio_submit(void *acb, void *opaque, int64_t offset, int count, int type) "
- file_copy_file_range(void *bs, int src, int64_t src_off, int dst, int64_t dst_off, int64_t bytes, int flags, int64_t ret) "bs %p src_fd %d offset %"PRIu64" dst_fd %d offset %"PRIu64" bytes %"PRIu64" flags %d ret %"PRId64
- # qcow2.c
-+qcow2_add_task(void *co, void *bs, void *pool, const char *action, int cluster_type, uint64_t file_cluster_offset, uint64_t offset, uint64_t bytes, void *qiov, size_t qiov_offset) "co %p bs %p pool %p: %s: cluster_type %d file_cluster_offset %" PRIu64 " offset %" PRIu64 " bytes %" PRIu64 " qiov %p qiov_offset %zu"
- qcow2_writev_start_req(void *co, int64_t offset, int bytes) "co %p offset 0x%" PRIx64 " bytes %d"
- qcow2_writev_done_req(void *co, int ret) "co %p ret %d"
- qcow2_writev_start_part(void *co) "co %p"
---
-.21.0

-[PULL 06/36] block/backup: fix max_transfer handling for copy_range
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Of course, QEMU_ALIGN_UP is a typo, it should be QEMU_ALIGN_DOWN, as we
-are trying to find aligned size which satisfy both source and target.
-Also, don't ignore too small max_transfer. In this case seems safer to
-disable copy_range.
-Fixes: 9ded4a0114968e
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20190920142056.12778-2-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/backup.c | 15 +++++++++++----
-file changed, 11 insertions(+), 4 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 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
-     job->cluster_size = cluster_size;
-     job->copy_bitmap = copy_bitmap;
-     copy_bitmap = NULL;
--    job->use_copy_range = !compress; /* compression isn't supported for it */
-     job->copy_range_size = MIN_NON_ZERO(blk_get_max_transfer(job->common.blk),
-                                         blk_get_max_transfer(job->target));
--    job->copy_range_size = MAX(job->cluster_size,
--                               QEMU_ALIGN_UP(job->copy_range_size,
--                                             job->cluster_size));
-+    job->copy_range_size = QEMU_ALIGN_DOWN(job->copy_range_size,
-+                                           job->cluster_size);
-+    /*
-+     * Set use_copy_range, consider the following:
-+     * 1. Compression is not supported for copy_range.
-+     * 2. copy_range does not respect max_transfer (it's a TODO), so we factor
-+     *    that in here. If max_transfer is smaller than the job->cluster_size,
-+     *    we do not use copy_range (in that case it's zero after aligning down
-+     *    above).
-+     */
-+    job->use_copy_range = !compress && job->copy_range_size > 0;
-     /* Required permissions are already taken with target's blk_new() */
-     block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
---
-.21.0

-[PULL 07/36] block/backup: fix backup_cow_with_offload for last cluster
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-We shouldn't try to copy bytes beyond EOF. Fix it.
-Fixes: 9ded4a0114968e
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Message-id: 20190920142056.12778-3-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/backup.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-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_offload(BackupBlockJob *job,
-     assert(QEMU_IS_ALIGNED(job->copy_range_size, job->cluster_size));
-     assert(QEMU_IS_ALIGNED(start, job->cluster_size));
--    nbytes = MIN(job->copy_range_size, end - start);
-+    nbytes = MIN(job->copy_range_size, MIN(end, job->len) - start);
-     nr_clusters = DIV_ROUND_UP(nbytes, job->cluster_size);
-     bdrv_reset_dirty_bitmap(job->copy_bitmap, start,
-                             job->cluster_size * nr_clusters);
---
-.21.0

-[PULL 08/36] block/backup: split shareable copying part from backup_do_cow
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Split copying logic which will be shared with backup-top filter.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190920142056.12778-4-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/backup.c | 47 ++++++++++++++++++++++++++++++++---------------
-file changed, 32 insertions(+), 15 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 int64_t backup_bitmap_reset_unallocated(BackupBlockJob *s,
-     return ret;
- }
--static int coroutine_fn backup_do_cow(BackupBlockJob *job,
--                                      int64_t offset, uint64_t bytes,
--                                      bool *error_is_read,
--                                      bool is_write_notifier)
-+static int coroutine_fn backup_do_copy(BackupBlockJob *job,
-+                                       int64_t start, uint64_t bytes,
-+                                       bool *error_is_read,
-+                                       bool is_write_notifier)
- {
--    CowRequest cow_request;
-     int ret = 0;
--    int64_t start, end; /* bytes */
-+    int64_t end = bytes + start; /* bytes */
-     void *bounce_buffer = NULL;
-     int64_t status_bytes;
--    qemu_co_rwlock_rdlock(&job->flush_rwlock);
--
--    start = QEMU_ALIGN_DOWN(offset, job->cluster_size);
--    end = QEMU_ALIGN_UP(bytes + offset, job->cluster_size);
--
--    trace_backup_do_cow_enter(job, start, offset, bytes);
--
--    wait_for_overlapping_requests(job, start, end);
--    cow_request_begin(&cow_request, job, start, end);
-+    assert(QEMU_IS_ALIGNED(start, job->cluster_size));
-+    assert(QEMU_IS_ALIGNED(end, job->cluster_size));
-     while (start < end) {
-         int64_t dirty_end;
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_cow(BackupBlockJob *job,
-         qemu_vfree(bounce_buffer);
-     }
-+    return ret;
-+}
-+
-+static int coroutine_fn backup_do_cow(BackupBlockJob *job,
-+                                      int64_t offset, uint64_t bytes,
-+                                      bool *error_is_read,
-+                                      bool is_write_notifier)
-+{
-+    CowRequest cow_request;
-+    int ret = 0;
-+    int64_t start, end; /* bytes */
-+
-+    qemu_co_rwlock_rdlock(&job->flush_rwlock);
-+
-+    start = QEMU_ALIGN_DOWN(offset, job->cluster_size);
-+    end = QEMU_ALIGN_UP(bytes + offset, job->cluster_size);
-+
-+    trace_backup_do_cow_enter(job, start, offset, bytes);
-+
-+    wait_for_overlapping_requests(job, start, end);
-+    cow_request_begin(&cow_request, job, start, end);
-+
-+    ret = backup_do_copy(job, start, end - start, error_is_read,
-+                         is_write_notifier);
-+
-     cow_request_end(&cow_request);
-     trace_backup_do_cow_return(job, offset, bytes, ret);
---
-.21.0

-[PULL 09/36] block/backup: improve comment about image fleecing
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190920142056.12778-5-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/backup.c | 15 ++++++++++++---
-file changed, 12 insertions(+), 3 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 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
-     job->bitmap_mode = bitmap_mode;
-     /*
--     * Set write flags:
--     * 1. Detect image-fleecing (and similar) schemes
--     * 2. Handle compression
-+     * If source is in backing chain of target assume that target is going to be
-+     * used for "image fleecing", i.e. it should represent a kind of snapshot of
-+     * source at backup-start point in time. And target is going to be read by
-+     * somebody (for example, used as NBD export) during backup job.
-+     *
-+     * In this case, we need to add BDRV_REQ_SERIALISING write flag to avoid
-+     * intersection of backup writes and third party reads from target,
-+     * otherwise reading from target we may occasionally read already updated by
-+     * guest data.
-+     *
-+     * For more information see commit f8d59dfb40bb and test
-+     * tests/qemu-iotests/222
-      */
-     job->write_flags =
-         (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0) |
---
-.21.0

-[PULL 10/36] block/backup: introduce BlockCopyState
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Split copying code part from backup to "block-copy", including separate
-state structure and function renaming. This is needed to share it with
-backup-top filter driver in further commits.
-Notes:
-. As BlockCopyState keeps own BlockBackend objects, remaining
-job->common.blk users only use it to get bs by blk_bs() call, so clear
-job->commen.blk permissions set in block_job_create and add
-job->source_bs to be used instead of blk_bs(job->common.blk), to keep
-it more clear which bs we use when introduce backup-top filter in
-further commit.
-. Rename s/initializing_bitmap/skip_unallocated/ to sound a bit better
-as interface to BlockCopyState
-. Split is not very clean: there left some duplicated fields, backup
-code uses some BlockCopyState fields directly, let's postpone it for
-further improvements and keep this comment simpler for review.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20190920142056.12778-6-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/backup.c     | 370 ++++++++++++++++++++++++++++-----------------
- block/trace-events |  12 +-
-files changed, 239 insertions(+), 143 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 @@ typedef struct CowRequest {
-     CoQueue wait_queue; /* coroutines blocked on this request */
- } CowRequest;
-+typedef void (*ProgressBytesCallbackFunc)(int64_t bytes, void *opaque);
-+typedef void (*ProgressResetCallbackFunc)(void *opaque);
-+typedef struct BlockCopyState {
-+    BlockBackend *source;
-+    BlockBackend *target;
-+    BdrvDirtyBitmap *copy_bitmap;
-+    int64_t cluster_size;
-+    bool use_copy_range;
-+    int64_t copy_range_size;
-+    uint64_t len;
-+
-+    BdrvRequestFlags write_flags;
-+
-+    /*
-+     * skip_unallocated:
-+     *
-+     * Used by sync=top jobs, which first scan the source node for unallocated
-+     * areas and clear them in the copy_bitmap.  During this process, the bitmap
-+     * is thus not fully initialized: It may still have bits set for areas that
-+     * are unallocated and should actually not be copied.
-+     *
-+     * This is indicated by skip_unallocated.
-+     *
-+     * In this case, block_copy() will query the source’s allocation status,
-+     * skip unallocated regions, clear them in the copy_bitmap, and invoke
-+     * block_copy_reset_unallocated() every time it does.
-+     */
-+    bool skip_unallocated;
-+
-+    /* progress_bytes_callback: called when some copying progress is done. */
-+    ProgressBytesCallbackFunc progress_bytes_callback;
-+
-+    /*
-+     * progress_reset_callback: called when some bytes reset from copy_bitmap
-+     * (see @skip_unallocated above). The callee is assumed to recalculate how
-+     * many bytes remain based on the dirty bit count of copy_bitmap.
-+     */
-+    ProgressResetCallbackFunc progress_reset_callback;
-+    void *progress_opaque;
-+} BlockCopyState;
-+
- typedef struct BackupBlockJob {
-     BlockJob common;
--    BlockBackend *target;
-+    BlockDriverState *source_bs;
-     BdrvDirtyBitmap *sync_bitmap;
--    BdrvDirtyBitmap *copy_bitmap;
-     MirrorSyncMode sync_mode;
-     BitmapSyncMode bitmap_mode;
-@@ -XXX,XX +XXX,XX @@ typedef struct BackupBlockJob {
-     NotifierWithReturn before_write;
-     QLIST_HEAD(, CowRequest) inflight_reqs;
--    bool use_copy_range;
--    int64_t copy_range_size;
--
--    BdrvRequestFlags write_flags;
--    bool initializing_bitmap;
-+    BlockCopyState *bcs;
- } BackupBlockJob;
- static const BlockJobDriver backup_job_driver;
-@@ -XXX,XX +XXX,XX @@ static void cow_request_end(CowRequest *req)
-     qemu_co_queue_restart_all(&req->wait_queue);
- }
-+static void block_copy_state_free(BlockCopyState *s)
-+{
-+    if (!s) {
-+        return;
-+    }
-+
-+    bdrv_release_dirty_bitmap(blk_bs(s->source), s->copy_bitmap);
-+    blk_unref(s->source);
-+    blk_unref(s->target);
-+    g_free(s);
-+}
-+
-+static BlockCopyState *block_copy_state_new(
-+        BlockDriverState *source, BlockDriverState *target,
-+        int64_t cluster_size, BdrvRequestFlags write_flags,
-+        ProgressBytesCallbackFunc progress_bytes_callback,
-+        ProgressResetCallbackFunc progress_reset_callback,
-+        void *progress_opaque, Error **errp)
-+{
-+    BlockCopyState *s;
-+    int ret;
-+    uint64_t no_resize = BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE |
-+                         BLK_PERM_WRITE_UNCHANGED | BLK_PERM_GRAPH_MOD;
-+    BdrvDirtyBitmap *copy_bitmap;
-+
-+    copy_bitmap = bdrv_create_dirty_bitmap(source, cluster_size, NULL, errp);
-+    if (!copy_bitmap) {
-+        return NULL;
-+    }
-+    bdrv_disable_dirty_bitmap(copy_bitmap);
-+
-+    s = g_new(BlockCopyState, 1);
-+    *s = (BlockCopyState) {
-+        .source = blk_new(bdrv_get_aio_context(source),
-+                          BLK_PERM_CONSISTENT_READ, no_resize),
-+        .target = blk_new(bdrv_get_aio_context(target),
-+                          BLK_PERM_WRITE, no_resize),
-+        .copy_bitmap = copy_bitmap,
-+        .cluster_size = cluster_size,
-+        .len = bdrv_dirty_bitmap_size(copy_bitmap),
-+        .write_flags = write_flags,
-+        .progress_bytes_callback = progress_bytes_callback,
-+        .progress_reset_callback = progress_reset_callback,
-+        .progress_opaque = progress_opaque,
-+    };
-+
-+    s->copy_range_size = QEMU_ALIGN_DOWN(MIN(blk_get_max_transfer(s->source),
-+                                             blk_get_max_transfer(s->target)),
-+                                         s->cluster_size);
-+    /*
-+     * Set use_copy_range, consider the following:
-+     * 1. Compression is not supported for copy_range.
-+     * 2. copy_range does not respect max_transfer (it's a TODO), so we factor
-+     *    that in here. If max_transfer is smaller than the job->cluster_size,
-+     *    we do not use copy_range (in that case it's zero after aligning down
-+     *    above).
-+     */
-+    s->use_copy_range =
-+        !(write_flags & BDRV_REQ_WRITE_COMPRESSED) && s->copy_range_size > 0;
-+
-+    /*
-+     * We just allow aio context change on our block backends. block_copy() user
-+     * (now it's only backup) is responsible for source and target being in same
-+     * aio context.
-+     */
-+    blk_set_disable_request_queuing(s->source, true);
-+    blk_set_allow_aio_context_change(s->source, true);
-+    blk_set_disable_request_queuing(s->target, true);
-+    blk_set_allow_aio_context_change(s->target, true);
-+
-+    ret = blk_insert_bs(s->source, source, errp);
-+    if (ret < 0) {
-+        goto fail;
-+    }
-+
-+    ret = blk_insert_bs(s->target, target, errp);
-+    if (ret < 0) {
-+        goto fail;
-+    }
-+
-+    return s;
-+
-+fail:
-+    block_copy_state_free(s);
-+
-+    return NULL;
-+}
-+
- /* Copy range to target with a bounce buffer and return the bytes copied. If
-  * error occurred, return a negative error number */
--static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
-+static int coroutine_fn block_copy_with_bounce_buffer(BlockCopyState *s,
-                                                       int64_t start,
-                                                       int64_t end,
-                                                       bool is_write_notifier,
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
-                                                       void **bounce_buffer)
- {
-     int ret;
--    BlockBackend *blk = job->common.blk;
-     int nbytes;
-     int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
--    assert(QEMU_IS_ALIGNED(start, job->cluster_size));
--    bdrv_reset_dirty_bitmap(job->copy_bitmap, start, job->cluster_size);
--    nbytes = MIN(job->cluster_size, job->len - start);
-+    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
-+    bdrv_reset_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
-+    nbytes = MIN(s->cluster_size, s->len - start);
-     if (!*bounce_buffer) {
--        *bounce_buffer = blk_blockalign(blk, job->cluster_size);
-+        *bounce_buffer = blk_blockalign(s->source, s->cluster_size);
-     }
--    ret = blk_co_pread(blk, start, nbytes, *bounce_buffer, read_flags);
-+    ret = blk_co_pread(s->source, start, nbytes, *bounce_buffer, read_flags);
-     if (ret < 0) {
--        trace_backup_do_cow_read_fail(job, start, ret);
-+        trace_block_copy_with_bounce_buffer_read_fail(s, start, ret);
-         if (error_is_read) {
-             *error_is_read = true;
-         }
-         goto fail;
-     }
--    ret = blk_co_pwrite(job->target, start, nbytes, *bounce_buffer,
--                        job->write_flags);
-+    ret = blk_co_pwrite(s->target, start, nbytes, *bounce_buffer,
-+                        s->write_flags);
-     if (ret < 0) {
--        trace_backup_do_cow_write_fail(job, start, ret);
-+        trace_block_copy_with_bounce_buffer_write_fail(s, start, ret);
-         if (error_is_read) {
-             *error_is_read = false;
-         }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
-     return nbytes;
- fail:
--    bdrv_set_dirty_bitmap(job->copy_bitmap, start, job->cluster_size);
-+    bdrv_set_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
-     return ret;
- }
- /* Copy range to target and return the bytes copied. If error occurred, return a
-  * negative error number. */
--static int coroutine_fn backup_cow_with_offload(BackupBlockJob *job,
-+static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
-                                                 int64_t start,
-                                                 int64_t end,
-                                                 bool is_write_notifier)
- {
-     int ret;
-     int nr_clusters;
--    BlockBackend *blk = job->common.blk;
-     int nbytes;
-     int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
--    assert(QEMU_IS_ALIGNED(job->copy_range_size, job->cluster_size));
--    assert(QEMU_IS_ALIGNED(start, job->cluster_size));
--    nbytes = MIN(job->copy_range_size, MIN(end, job->len) - start);
--    nr_clusters = DIV_ROUND_UP(nbytes, job->cluster_size);
--    bdrv_reset_dirty_bitmap(job->copy_bitmap, start,
--                            job->cluster_size * nr_clusters);
--    ret = blk_co_copy_range(blk, start, job->target, start, nbytes,
--                            read_flags, job->write_flags);
-+    assert(QEMU_IS_ALIGNED(s->copy_range_size, s->cluster_size));
-+    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
-+    nbytes = MIN(s->copy_range_size, MIN(end, s->len) - start);
-+    nr_clusters = DIV_ROUND_UP(nbytes, s->cluster_size);
-+    bdrv_reset_dirty_bitmap(s->copy_bitmap, start,
-+                            s->cluster_size * nr_clusters);
-+    ret = blk_co_copy_range(s->source, start, s->target, start, nbytes,
-+                            read_flags, s->write_flags);
-     if (ret < 0) {
--        trace_backup_do_cow_copy_range_fail(job, start, ret);
--        bdrv_set_dirty_bitmap(job->copy_bitmap, start,
--                              job->cluster_size * nr_clusters);
-+        trace_block_copy_with_offload_fail(s, start, ret);
-+        bdrv_set_dirty_bitmap(s->copy_bitmap, start,
-+                              s->cluster_size * nr_clusters);
-         return ret;
-     }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_offload(BackupBlockJob *job,
-  * Check if the cluster starting at offset is allocated or not.
-  * return via pnum the number of contiguous clusters sharing this allocation.
-  */
--static int backup_is_cluster_allocated(BackupBlockJob *s, int64_t offset,
--                                       int64_t *pnum)
-+static int block_copy_is_cluster_allocated(BlockCopyState *s, int64_t offset,
-+                                           int64_t *pnum)
- {
--    BlockDriverState *bs = blk_bs(s->common.blk);
-+    BlockDriverState *bs = blk_bs(s->source);
-     int64_t count, total_count = 0;
-     int64_t bytes = s->len - offset;
-     int ret;
-@@ -XXX,XX +XXX,XX @@ static int backup_is_cluster_allocated(BackupBlockJob *s, int64_t offset,
-  * @return 0 when the cluster at @offset was unallocated,
-  *         1 otherwise, and -ret on error.
-  */
--static int64_t backup_bitmap_reset_unallocated(BackupBlockJob *s,
--                                               int64_t offset, int64_t *count)
-+static int64_t block_copy_reset_unallocated(BlockCopyState *s,
-+                                            int64_t offset, int64_t *count)
- {
-     int ret;
--    int64_t clusters, bytes, estimate;
-+    int64_t clusters, bytes;
--    ret = backup_is_cluster_allocated(s, offset, &clusters);
-+    ret = block_copy_is_cluster_allocated(s, offset, &clusters);
-     if (ret < 0) {
-         return ret;
-     }
-@@ -XXX,XX +XXX,XX @@ static int64_t backup_bitmap_reset_unallocated(BackupBlockJob *s,
-     if (!ret) {
-         bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes);
--        estimate = bdrv_get_dirty_count(s->copy_bitmap);
--        job_progress_set_remaining(&s->common.job, estimate);
-+        s->progress_reset_callback(s->progress_opaque);
-     }
-     *count = bytes;
-     return ret;
- }
--static int coroutine_fn backup_do_copy(BackupBlockJob *job,
--                                       int64_t start, uint64_t bytes,
--                                       bool *error_is_read,
--                                       bool is_write_notifier)
-+static int coroutine_fn block_copy(BlockCopyState *s,
-+                                   int64_t start, uint64_t bytes,
-+                                   bool *error_is_read,
-+                                   bool is_write_notifier)
- {
-     int ret = 0;
-     int64_t end = bytes + start; /* bytes */
-     void *bounce_buffer = NULL;
-     int64_t status_bytes;
--    assert(QEMU_IS_ALIGNED(start, job->cluster_size));
--    assert(QEMU_IS_ALIGNED(end, job->cluster_size));
-+    /*
-+     * block_copy() user is responsible for keeping source and target in same
-+     * aio context
-+     */
-+    assert(blk_get_aio_context(s->source) == blk_get_aio_context(s->target));
-+
-+    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
-+    assert(QEMU_IS_ALIGNED(end, s->cluster_size));
-     while (start < end) {
-         int64_t dirty_end;
--        if (!bdrv_dirty_bitmap_get(job->copy_bitmap, start)) {
--            trace_backup_do_cow_skip(job, start);
--            start += job->cluster_size;
-+        if (!bdrv_dirty_bitmap_get(s->copy_bitmap, start)) {
-+            trace_block_copy_skip(s, start);
-+            start += s->cluster_size;
-             continue; /* already copied */
-         }
--        dirty_end = bdrv_dirty_bitmap_next_zero(job->copy_bitmap, start,
-+        dirty_end = bdrv_dirty_bitmap_next_zero(s->copy_bitmap, start,
-                                                 (end - start));
-         if (dirty_end < 0) {
-             dirty_end = end;
-         }
--        if (job->initializing_bitmap) {
--            ret = backup_bitmap_reset_unallocated(job, start, &status_bytes);
-+        if (s->skip_unallocated) {
-+            ret = block_copy_reset_unallocated(s, start, &status_bytes);
-             if (ret == 0) {
--                trace_backup_do_cow_skip_range(job, start, status_bytes);
-+                trace_block_copy_skip_range(s, start, status_bytes);
-                 start += status_bytes;
-                 continue;
-             }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_copy(BackupBlockJob *job,
-             dirty_end = MIN(dirty_end, start + status_bytes);
-         }
--        trace_backup_do_cow_process(job, start);
-+        trace_block_copy_process(s, start);
--        if (job->use_copy_range) {
--            ret = backup_cow_with_offload(job, start, dirty_end,
-+        if (s->use_copy_range) {
-+            ret = block_copy_with_offload(s, start, dirty_end,
-                                           is_write_notifier);
-             if (ret < 0) {
--                job->use_copy_range = false;
-+                s->use_copy_range = false;
-             }
-         }
--        if (!job->use_copy_range) {
--            ret = backup_cow_with_bounce_buffer(job, start, dirty_end,
-+        if (!s->use_copy_range) {
-+            ret = block_copy_with_bounce_buffer(s, start, dirty_end,
-                                                 is_write_notifier,
-                                                 error_is_read, &bounce_buffer);
-         }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_copy(BackupBlockJob *job,
-             break;
-         }
--        /* Publish progress, guest I/O counts as progress too.  Note that the
--         * offset field is an opaque progress value, it is not a disk offset.
--         */
-         start += ret;
--        job->bytes_read += ret;
--        job_progress_update(&job->common.job, ret);
-+        s->progress_bytes_callback(ret, s->progress_opaque);
-         ret = 0;
-     }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_copy(BackupBlockJob *job,
-     return ret;
- }
-+static void backup_progress_bytes_callback(int64_t bytes, void *opaque)
-+{
-+    BackupBlockJob *s = opaque;
-+
-+    s->bytes_read += bytes;
-+    job_progress_update(&s->common.job, bytes);
-+}
-+
-+static void backup_progress_reset_callback(void *opaque)
-+{
-+    BackupBlockJob *s = opaque;
-+    uint64_t estimate = bdrv_get_dirty_count(s->bcs->copy_bitmap);
-+
-+    job_progress_set_remaining(&s->common.job, estimate);
-+}
-+
- static int coroutine_fn backup_do_cow(BackupBlockJob *job,
-                                       int64_t offset, uint64_t bytes,
-                                       bool *error_is_read,
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_cow(BackupBlockJob *job,
-     wait_for_overlapping_requests(job, start, end);
-     cow_request_begin(&cow_request, job, start, end);
--    ret = backup_do_copy(job, start, end - start, error_is_read,
--                         is_write_notifier);
-+    ret = block_copy(job->bcs, start, end - start, error_is_read,
-+                     is_write_notifier);
-     cow_request_end(&cow_request);
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_before_write_notify(
-     BackupBlockJob *job = container_of(notifier, BackupBlockJob, before_write);
-     BdrvTrackedRequest *req = opaque;
--    assert(req->bs == blk_bs(job->common.blk));
-+    assert(req->bs == job->source_bs);
-     assert(QEMU_IS_ALIGNED(req->offset, BDRV_SECTOR_SIZE));
-     assert(QEMU_IS_ALIGNED(req->bytes, BDRV_SECTOR_SIZE));
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_before_write_notify(
- static void backup_cleanup_sync_bitmap(BackupBlockJob *job, int ret)
- {
-     BdrvDirtyBitmap *bm;
--    BlockDriverState *bs = blk_bs(job->common.blk);
-     bool sync = (((ret == 0) || (job->bitmap_mode == BITMAP_SYNC_MODE_ALWAYS)) \
-                  && (job->bitmap_mode != BITMAP_SYNC_MODE_NEVER));
-@@ -XXX,XX +XXX,XX @@ static void backup_cleanup_sync_bitmap(BackupBlockJob *job, int ret)
-          * We succeeded, or we always intended to sync the bitmap.
-          * Delete this bitmap and install the child.
-          */
--        bm = bdrv_dirty_bitmap_abdicate(bs, job->sync_bitmap, NULL);
-+        bm = bdrv_dirty_bitmap_abdicate(job->source_bs, job->sync_bitmap, NULL);
-     } else {
-         /*
-          * We failed, or we never intended to sync the bitmap anyway.
-          * Merge the successor back into the parent, keeping all data.
-          */
--        bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
-+        bm = bdrv_reclaim_dirty_bitmap(job->source_bs, job->sync_bitmap, NULL);
-     }
-     assert(bm);
-     if (ret < 0 && job->bitmap_mode == BITMAP_SYNC_MODE_ALWAYS) {
-         /* If we failed and synced, merge in the bits we didn't copy: */
--        bdrv_dirty_bitmap_merge_internal(bm, job->copy_bitmap,
-+        bdrv_dirty_bitmap_merge_internal(bm, job->bcs->copy_bitmap,
-                                          NULL, true);
-     }
- }
-@@ -XXX,XX +XXX,XX @@ static void backup_abort(Job *job)
- static void backup_clean(Job *job)
- {
-     BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);
--    BlockDriverState *bs = blk_bs(s->common.blk);
--    if (s->copy_bitmap) {
--        bdrv_release_dirty_bitmap(bs, s->copy_bitmap);
--        s->copy_bitmap = NULL;
--    }
--
--    assert(s->target);
--    blk_unref(s->target);
--    s->target = NULL;
-+    block_copy_state_free(s->bcs);
- }
- void backup_do_checkpoint(BlockJob *job, Error **errp)
-@@ -XXX,XX +XXX,XX @@ void backup_do_checkpoint(BlockJob *job, Error **errp)
-         return;
-     }
--    bdrv_set_dirty_bitmap(backup_job->copy_bitmap, 0, backup_job->len);
-+    bdrv_set_dirty_bitmap(backup_job->bcs->copy_bitmap, 0, backup_job->len);
- }
- static BlockErrorAction backup_error_action(BackupBlockJob *job,
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_loop(BackupBlockJob *job)
-     BdrvDirtyBitmapIter *bdbi;
-     int ret = 0;
--    bdbi = bdrv_dirty_iter_new(job->copy_bitmap);
-+    bdbi = bdrv_dirty_iter_new(job->bcs->copy_bitmap);
-     while ((offset = bdrv_dirty_iter_next(bdbi)) != -1) {
-         do {
-             if (yield_and_check(job)) {
-@@ -XXX,XX +XXX,XX @@ static void backup_init_copy_bitmap(BackupBlockJob *job)
-     uint64_t estimate;
-     if (job->sync_mode == MIRROR_SYNC_MODE_BITMAP) {
--        ret = bdrv_dirty_bitmap_merge_internal(job->copy_bitmap,
-+        ret = bdrv_dirty_bitmap_merge_internal(job->bcs->copy_bitmap,
-                                                job->sync_bitmap,
-                                                NULL, true);
-         assert(ret);
-@@ -XXX,XX +XXX,XX @@ static void backup_init_copy_bitmap(BackupBlockJob *job)
-              * We can't hog the coroutine to initialize this thoroughly.
-              * Set a flag and resume work when we are able to yield safely.
-              */
--            job->initializing_bitmap = true;
-+            job->bcs->skip_unallocated = true;
-         }
--        bdrv_set_dirty_bitmap(job->copy_bitmap, 0, job->len);
-+        bdrv_set_dirty_bitmap(job->bcs->copy_bitmap, 0, job->len);
-     }
--    estimate = bdrv_get_dirty_count(job->copy_bitmap);
-+    estimate = bdrv_get_dirty_count(job->bcs->copy_bitmap);
-     job_progress_set_remaining(&job->common.job, estimate);
- }
- static int coroutine_fn backup_run(Job *job, Error **errp)
- {
-     BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);
--    BlockDriverState *bs = blk_bs(s->common.blk);
-     int ret = 0;
-     QLIST_INIT(&s->inflight_reqs);
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_run(Job *job, Error **errp)
-     backup_init_copy_bitmap(s);
-     s->before_write.notify = backup_before_write_notify;
--    bdrv_add_before_write_notifier(bs, &s->before_write);
-+    bdrv_add_before_write_notifier(s->source_bs, &s->before_write);
-     if (s->sync_mode == MIRROR_SYNC_MODE_TOP) {
-         int64_t offset = 0;
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_run(Job *job, Error **errp)
-                 goto out;
-             }
--            ret = backup_bitmap_reset_unallocated(s, offset, &count);
-+            ret = block_copy_reset_unallocated(s->bcs, offset, &count);
-             if (ret < 0) {
-                 goto out;
-             }
-             offset += count;
-         }
--        s->initializing_bitmap = false;
-+        s->bcs->skip_unallocated = false;
-     }
-     if (s->sync_mode == MIRROR_SYNC_MODE_NONE) {
-@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
- {
-     int64_t len;
-     BackupBlockJob *job = NULL;
--    int ret;
-     int64_t cluster_size;
--    BdrvDirtyBitmap *copy_bitmap = NULL;
-+    BdrvRequestFlags write_flags;
-     assert(bs);
-     assert(target);
-@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
-         goto error;
-     }
--    copy_bitmap = bdrv_create_dirty_bitmap(bs, cluster_size, NULL, errp);
--    if (!copy_bitmap) {
--        goto error;
--    }
--    bdrv_disable_dirty_bitmap(copy_bitmap);
--
-     /* job->len is fixed, so we can't allow resize */
--    job = block_job_create(job_id, &backup_job_driver, txn, bs,
--                           BLK_PERM_CONSISTENT_READ,
--                           BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE |
--                           BLK_PERM_WRITE_UNCHANGED | BLK_PERM_GRAPH_MOD,
-+    job = block_job_create(job_id, &backup_job_driver, txn, bs, 0, BLK_PERM_ALL,
-                            speed, creation_flags, cb, opaque, errp);
-     if (!job) {
-         goto error;
-     }
--    /* The target must match the source in size, so no resize here either */
--    job->target = blk_new(job->common.job.aio_context,
--                          BLK_PERM_WRITE,
--                          BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE |
--                          BLK_PERM_WRITE_UNCHANGED | BLK_PERM_GRAPH_MOD);
--    ret = blk_insert_bs(job->target, target, errp);
--    if (ret < 0) {
--        goto error;
--    }
--    blk_set_disable_request_queuing(job->target, true);
--
-+    job->source_bs = bs;
-     job->on_source_error = on_source_error;
-     job->on_target_error = on_target_error;
-     job->sync_mode = sync_mode;
-@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
-      * For more information see commit f8d59dfb40bb and test
-      * tests/qemu-iotests/222
-      */
--    job->write_flags =
--        (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0) |
--        (compress ? BDRV_REQ_WRITE_COMPRESSED : 0);
-+    write_flags = (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0) |
-+                  (compress ? BDRV_REQ_WRITE_COMPRESSED : 0),
-+
-+    job->bcs = block_copy_state_new(bs, target, cluster_size, write_flags,
-+                                    backup_progress_bytes_callback,
-+                                    backup_progress_reset_callback, job, errp);
-+    if (!job->bcs) {
-+        goto error;
-+    }
-     job->cluster_size = cluster_size;
--    job->copy_bitmap = copy_bitmap;
--    copy_bitmap = NULL;
--    job->copy_range_size = MIN_NON_ZERO(blk_get_max_transfer(job->common.blk),
--                                        blk_get_max_transfer(job->target));
--    job->copy_range_size = QEMU_ALIGN_DOWN(job->copy_range_size,
--                                           job->cluster_size);
--    /*
--     * Set use_copy_range, consider the following:
--     * 1. Compression is not supported for copy_range.
--     * 2. copy_range does not respect max_transfer (it's a TODO), so we factor
--     *    that in here. If max_transfer is smaller than the job->cluster_size,
--     *    we do not use copy_range (in that case it's zero after aligning down
--     *    above).
--     */
--    job->use_copy_range = !compress && job->copy_range_size > 0;
--    /* Required permissions are already taken with target's blk_new() */
-+    /* Required permissions are already taken by block-copy-state target */
-     block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
-                        &error_abort);
-     job->len = len;
-@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
-     return &job->common;
-  error:
--    if (copy_bitmap) {
--        assert(!job || !job->copy_bitmap);
--        bdrv_release_dirty_bitmap(bs, copy_bitmap);
--    }
-     if (sync_bitmap) {
-         bdrv_reclaim_dirty_bitmap(bs, sync_bitmap, NULL);
-     }
-diff --git a/block/trace-events b/block/trace-events
-index XXXXXXX..XXXXXXX 100644
---- a/block/trace-events
-+++ b/block/trace-events
-@@ -XXX,XX +XXX,XX @@ mirror_yield_in_flight(void *s, int64_t offset, int in_flight) "s %p offset %" P
- # backup.c
- backup_do_cow_enter(void *job, int64_t start, int64_t offset, uint64_t bytes) "job %p start %" PRId64 " offset %" PRId64 " bytes %" PRIu64
- backup_do_cow_return(void *job, int64_t offset, uint64_t bytes, int ret) "job %p offset %" PRId64 " bytes %" PRIu64 " ret %d"
--backup_do_cow_skip(void *job, int64_t start) "job %p start %"PRId64
--backup_do_cow_skip_range(void *job, int64_t start, uint64_t bytes) "job %p start %"PRId64" bytes %"PRId64
--backup_do_cow_process(void *job, int64_t start) "job %p start %"PRId64
--backup_do_cow_read_fail(void *job, int64_t start, int ret) "job %p start %"PRId64" ret %d"
--backup_do_cow_write_fail(void *job, int64_t start, int ret) "job %p start %"PRId64" ret %d"
--backup_do_cow_copy_range_fail(void *job, int64_t start, int ret) "job %p start %"PRId64" ret %d"
-+block_copy_skip(void *bcs, int64_t start) "bcs %p start %"PRId64
-+block_copy_skip_range(void *bcs, int64_t start, uint64_t bytes) "bcs %p start %"PRId64" bytes %"PRId64
-+block_copy_process(void *bcs, int64_t start) "bcs %p start %"PRId64
-+block_copy_with_bounce_buffer_read_fail(void *bcs, int64_t start, int ret) "bcs %p start %"PRId64" ret %d"
-+block_copy_with_bounce_buffer_write_fail(void *bcs, int64_t start, int ret) "bcs %p start %"PRId64" ret %d"
-+block_copy_with_offload_fail(void *bcs, int64_t start, int ret) "bcs %p start %"PRId64" ret %d"
- # ../blockdev.c
- qmp_block_job_cancel(void *job) "job %p"
---
-.21.0

-[PULL 11/36] block/backup: fix block-comment style
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-We need to fix comment style around block-copy functions before further
-moving them to separate file to satisfy checkpatch. But do more: fix
-all comments style. Also, seems like doubled first asterisk is not
-forbidden, but drop it too for consistency.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190920142056.12778-7-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/backup.c | 32 +++++++++++++++++++++-----------
-file changed, 21 insertions(+), 11 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 @@ fail:
-     return NULL;
- }
--/* Copy range to target with a bounce buffer and return the bytes copied. If
-- * error occurred, return a negative error number */
-+/*
-+ * Copy range to target with a bounce buffer and return the bytes copied. If
-+ * error occurred, return a negative error number
-+ */
- static int coroutine_fn block_copy_with_bounce_buffer(BlockCopyState *s,
-                                                       int64_t start,
-                                                       int64_t end,
-@@ -XXX,XX +XXX,XX @@ fail:
- }
--/* Copy range to target and return the bytes copied. If error occurred, return a
-- * negative error number. */
-+/*
-+ * Copy range to target and return the bytes copied. If error occurred, return a
-+ * negative error number.
-+ */
- static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
-                                                 int64_t start,
-                                                 int64_t end,
-@@ -XXX,XX +XXX,XX @@ static int block_copy_is_cluster_allocated(BlockCopyState *s, int64_t offset,
-     }
- }
--/**
-+/*
-  * Reset bits in copy_bitmap starting at offset if they represent unallocated
-  * data in the image. May reset subsequent contiguous bits.
-  * @return 0 when the cluster at @offset was unallocated,
-@@ -XXX,XX +XXX,XX @@ static bool coroutine_fn yield_and_check(BackupBlockJob *job)
-         return true;
-     }
--    /* We need to yield even for delay_ns = 0 so that bdrv_drain_all() can
--     * return. Without a yield, the VM would not reboot. */
-+    /*
-+     * We need to yield even for delay_ns = 0 so that bdrv_drain_all() can
-+     * return. Without a yield, the VM would not reboot.
-+     */
-     delay_ns = block_job_ratelimit_get_delay(&job->common, job->bytes_read);
-     job->bytes_read = 0;
-     job_sleep_ns(&job->common.job, delay_ns);
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_run(Job *job, Error **errp)
-     }
-     if (s->sync_mode == MIRROR_SYNC_MODE_NONE) {
--        /* All bits are set in copy_bitmap to allow any cluster to be copied.
--         * This does not actually require them to be copied. */
-+        /*
-+         * All bits are set in copy_bitmap to allow any cluster to be copied.
-+         * This does not actually require them to be copied.
-+         */
-         while (!job_is_cancelled(job)) {
--            /* Yield until the job is cancelled.  We just let our before_write
--             * notify callback service CoW requests. */
-+            /*
-+             * Yield until the job is cancelled.  We just let our before_write
-+             * notify callback service CoW requests.
-+             */
-             job_yield(job);
-         }
-     } else {
---
-.21.0

-[PULL 12/36] block: move block_copy from block/backup.c to separate file
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Split block_copy to separate file, to be cleanly shared with backup-top
-filter driver in further commits.
-It's a clean movement, the only change is drop "static" from interface
-functions.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190920142056.12778-8-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/Makefile.objs        |   1 +
- include/block/block-copy.h |  76 ++++++++
- block/backup.c             | 355 +------------------------------------
- block/block-copy.c         | 333 ++++++++++++++++++++++++++++++++++
- block/trace-events         |   2 +
-files changed, 413 insertions(+), 354 deletions(-)
- create mode 100644 include/block/block-copy.h
- create mode 100644 block/block-copy.c
-diff --git a/block/Makefile.objs b/block/Makefile.objs
-index XXXXXXX..XXXXXXX 100644
---- a/block/Makefile.objs
-+++ b/block/Makefile.objs
-@@ -XXX,XX +XXX,XX @@ block-obj-y += write-threshold.o
- block-obj-y += backup.o
- block-obj-$(CONFIG_REPLICATION) += replication.o
- block-obj-y += throttle.o copy-on-read.o
-+block-obj-y += block-copy.o
- block-obj-y += crypto.o
-diff --git a/include/block/block-copy.h b/include/block/block-copy.h
-new file mode 100644
-index XXXXXXX..XXXXXXX
---- /dev/null
-+++ b/include/block/block-copy.h
-@@ -XXX,XX +XXX,XX @@
-+/*
-+ * block_copy API
-+ *
-+ * Copyright (C) 2013 Proxmox Server Solutions
-+ * Copyright (c) 2019 Virtuozzo International GmbH.
-+ *
-+ * Authors:
-+ *  Dietmar Maurer (dietmar@proxmox.com)
-+ *  Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-+ *
-+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
-+ * See the COPYING file in the top-level directory.
-+ */
-+
-+#ifndef BLOCK_COPY_H
-+#define BLOCK_COPY_H
-+
-+#include "block/block.h"
-+
-+typedef void (*ProgressBytesCallbackFunc)(int64_t bytes, void *opaque);
-+typedef void (*ProgressResetCallbackFunc)(void *opaque);
-+typedef struct BlockCopyState {
-+    BlockBackend *source;
-+    BlockBackend *target;
-+    BdrvDirtyBitmap *copy_bitmap;
-+    int64_t cluster_size;
-+    bool use_copy_range;
-+    int64_t copy_range_size;
-+    uint64_t len;
-+
-+    BdrvRequestFlags write_flags;
-+
-+    /*
-+     * skip_unallocated:
-+     *
-+     * Used by sync=top jobs, which first scan the source node for unallocated
-+     * areas and clear them in the copy_bitmap.  During this process, the bitmap
-+     * is thus not fully initialized: It may still have bits set for areas that
-+     * are unallocated and should actually not be copied.
-+     *
-+     * This is indicated by skip_unallocated.
-+     *
-+     * In this case, block_copy() will query the source’s allocation status,
-+     * skip unallocated regions, clear them in the copy_bitmap, and invoke
-+     * block_copy_reset_unallocated() every time it does.
-+     */
-+    bool skip_unallocated;
-+
-+    /* progress_bytes_callback: called when some copying progress is done. */
-+    ProgressBytesCallbackFunc progress_bytes_callback;
-+
-+    /*
-+     * progress_reset_callback: called when some bytes reset from copy_bitmap
-+     * (see @skip_unallocated above). The callee is assumed to recalculate how
-+     * many bytes remain based on the dirty bit count of copy_bitmap.
-+     */
-+    ProgressResetCallbackFunc progress_reset_callback;
-+    void *progress_opaque;
-+} BlockCopyState;
-+
-+BlockCopyState *block_copy_state_new(
-+        BlockDriverState *source, BlockDriverState *target,
-+        int64_t cluster_size, BdrvRequestFlags write_flags,
-+        ProgressBytesCallbackFunc progress_bytes_callback,
-+        ProgressResetCallbackFunc progress_reset_callback,
-+        void *progress_opaque, Error **errp);
-+
-+void block_copy_state_free(BlockCopyState *s);
-+
-+int64_t block_copy_reset_unallocated(BlockCopyState *s,
-+                                     int64_t offset, int64_t *count);
-+
-+int coroutine_fn block_copy(BlockCopyState *s, int64_t start, uint64_t bytes,
-+                            bool *error_is_read, bool is_write_notifier);
-+
-+#endif /* BLOCK_COPY_H */
-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 @@
- #include "block/block_int.h"
- #include "block/blockjob_int.h"
- #include "block/block_backup.h"
-+#include "block/block-copy.h"
- #include "qapi/error.h"
- #include "qapi/qmp/qerror.h"
- #include "qemu/ratelimit.h"
-@@ -XXX,XX +XXX,XX @@ typedef struct CowRequest {
-     CoQueue wait_queue; /* coroutines blocked on this request */
- } CowRequest;
--typedef void (*ProgressBytesCallbackFunc)(int64_t bytes, void *opaque);
--typedef void (*ProgressResetCallbackFunc)(void *opaque);
--typedef struct BlockCopyState {
--    BlockBackend *source;
--    BlockBackend *target;
--    BdrvDirtyBitmap *copy_bitmap;
--    int64_t cluster_size;
--    bool use_copy_range;
--    int64_t copy_range_size;
--    uint64_t len;
--
--    BdrvRequestFlags write_flags;
--
--    /*
--     * skip_unallocated:
--     *
--     * Used by sync=top jobs, which first scan the source node for unallocated
--     * areas and clear them in the copy_bitmap.  During this process, the bitmap
--     * is thus not fully initialized: It may still have bits set for areas that
--     * are unallocated and should actually not be copied.
--     *
--     * This is indicated by skip_unallocated.
--     *
--     * In this case, block_copy() will query the source’s allocation status,
--     * skip unallocated regions, clear them in the copy_bitmap, and invoke
--     * block_copy_reset_unallocated() every time it does.
--     */
--    bool skip_unallocated;
--
--    /* progress_bytes_callback: called when some copying progress is done. */
--    ProgressBytesCallbackFunc progress_bytes_callback;
--
--    /*
--     * progress_reset_callback: called when some bytes reset from copy_bitmap
--     * (see @skip_unallocated above). The callee is assumed to recalculate how
--     * many bytes remain based on the dirty bit count of copy_bitmap.
--     */
--    ProgressResetCallbackFunc progress_reset_callback;
--    void *progress_opaque;
--} BlockCopyState;
--
- typedef struct BackupBlockJob {
-     BlockJob common;
-     BlockDriverState *source_bs;
-@@ -XXX,XX +XXX,XX @@ static void cow_request_end(CowRequest *req)
-     qemu_co_queue_restart_all(&req->wait_queue);
- }
--static void block_copy_state_free(BlockCopyState *s)
--{
--    if (!s) {
--        return;
--    }
--
--    bdrv_release_dirty_bitmap(blk_bs(s->source), s->copy_bitmap);
--    blk_unref(s->source);
--    blk_unref(s->target);
--    g_free(s);
--}
--
--static BlockCopyState *block_copy_state_new(
--        BlockDriverState *source, BlockDriverState *target,
--        int64_t cluster_size, BdrvRequestFlags write_flags,
--        ProgressBytesCallbackFunc progress_bytes_callback,
--        ProgressResetCallbackFunc progress_reset_callback,
--        void *progress_opaque, Error **errp)
--{
--    BlockCopyState *s;
--    int ret;
--    uint64_t no_resize = BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE |
--                         BLK_PERM_WRITE_UNCHANGED | BLK_PERM_GRAPH_MOD;
--    BdrvDirtyBitmap *copy_bitmap;
--
--    copy_bitmap = bdrv_create_dirty_bitmap(source, cluster_size, NULL, errp);
--    if (!copy_bitmap) {
--        return NULL;
--    }
--    bdrv_disable_dirty_bitmap(copy_bitmap);
--
--    s = g_new(BlockCopyState, 1);
--    *s = (BlockCopyState) {
--        .source = blk_new(bdrv_get_aio_context(source),
--                          BLK_PERM_CONSISTENT_READ, no_resize),
--        .target = blk_new(bdrv_get_aio_context(target),
--                          BLK_PERM_WRITE, no_resize),
--        .copy_bitmap = copy_bitmap,
--        .cluster_size = cluster_size,
--        .len = bdrv_dirty_bitmap_size(copy_bitmap),
--        .write_flags = write_flags,
--        .progress_bytes_callback = progress_bytes_callback,
--        .progress_reset_callback = progress_reset_callback,
--        .progress_opaque = progress_opaque,
--    };
--
--    s->copy_range_size = QEMU_ALIGN_DOWN(MIN(blk_get_max_transfer(s->source),
--                                             blk_get_max_transfer(s->target)),
--                                         s->cluster_size);
--    /*
--     * Set use_copy_range, consider the following:
--     * 1. Compression is not supported for copy_range.
--     * 2. copy_range does not respect max_transfer (it's a TODO), so we factor
--     *    that in here. If max_transfer is smaller than the job->cluster_size,
--     *    we do not use copy_range (in that case it's zero after aligning down
--     *    above).
--     */
--    s->use_copy_range =
--        !(write_flags & BDRV_REQ_WRITE_COMPRESSED) && s->copy_range_size > 0;
--
--    /*
--     * We just allow aio context change on our block backends. block_copy() user
--     * (now it's only backup) is responsible for source and target being in same
--     * aio context.
--     */
--    blk_set_disable_request_queuing(s->source, true);
--    blk_set_allow_aio_context_change(s->source, true);
--    blk_set_disable_request_queuing(s->target, true);
--    blk_set_allow_aio_context_change(s->target, true);
--
--    ret = blk_insert_bs(s->source, source, errp);
--    if (ret < 0) {
--        goto fail;
--    }
--
--    ret = blk_insert_bs(s->target, target, errp);
--    if (ret < 0) {
--        goto fail;
--    }
--
--    return s;
--
--fail:
--    block_copy_state_free(s);
--
--    return NULL;
--}
--
--/*
-- * Copy range to target with a bounce buffer and return the bytes copied. If
-- * error occurred, return a negative error number
-- */
--static int coroutine_fn block_copy_with_bounce_buffer(BlockCopyState *s,
--                                                      int64_t start,
--                                                      int64_t end,
--                                                      bool is_write_notifier,
--                                                      bool *error_is_read,
--                                                      void **bounce_buffer)
--{
--    int ret;
--    int nbytes;
--    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
--
--    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
--    bdrv_reset_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
--    nbytes = MIN(s->cluster_size, s->len - start);
--    if (!*bounce_buffer) {
--        *bounce_buffer = blk_blockalign(s->source, s->cluster_size);
--    }
--
--    ret = blk_co_pread(s->source, start, nbytes, *bounce_buffer, read_flags);
--    if (ret < 0) {
--        trace_block_copy_with_bounce_buffer_read_fail(s, start, ret);
--        if (error_is_read) {
--            *error_is_read = true;
--        }
--        goto fail;
--    }
--
--    ret = blk_co_pwrite(s->target, start, nbytes, *bounce_buffer,
--                        s->write_flags);
--    if (ret < 0) {
--        trace_block_copy_with_bounce_buffer_write_fail(s, start, ret);
--        if (error_is_read) {
--            *error_is_read = false;
--        }
--        goto fail;
--    }
--
--    return nbytes;
--fail:
--    bdrv_set_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
--    return ret;
--
--}
--
--/*
-- * Copy range to target and return the bytes copied. If error occurred, return a
-- * negative error number.
-- */
--static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
--                                                int64_t start,
--                                                int64_t end,
--                                                bool is_write_notifier)
--{
--    int ret;
--    int nr_clusters;
--    int nbytes;
--    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
--
--    assert(QEMU_IS_ALIGNED(s->copy_range_size, s->cluster_size));
--    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
--    nbytes = MIN(s->copy_range_size, MIN(end, s->len) - start);
--    nr_clusters = DIV_ROUND_UP(nbytes, s->cluster_size);
--    bdrv_reset_dirty_bitmap(s->copy_bitmap, start,
--                            s->cluster_size * nr_clusters);
--    ret = blk_co_copy_range(s->source, start, s->target, start, nbytes,
--                            read_flags, s->write_flags);
--    if (ret < 0) {
--        trace_block_copy_with_offload_fail(s, start, ret);
--        bdrv_set_dirty_bitmap(s->copy_bitmap, start,
--                              s->cluster_size * nr_clusters);
--        return ret;
--    }
--
--    return nbytes;
--}
--
--/*
-- * Check if the cluster starting at offset is allocated or not.
-- * return via pnum the number of contiguous clusters sharing this allocation.
-- */
--static int block_copy_is_cluster_allocated(BlockCopyState *s, int64_t offset,
--                                           int64_t *pnum)
--{
--    BlockDriverState *bs = blk_bs(s->source);
--    int64_t count, total_count = 0;
--    int64_t bytes = s->len - offset;
--    int ret;
--
--    assert(QEMU_IS_ALIGNED(offset, s->cluster_size));
--
--    while (true) {
--        ret = bdrv_is_allocated(bs, offset, bytes, &count);
--        if (ret < 0) {
--            return ret;
--        }
--
--        total_count += count;
--
--        if (ret || count == 0) {
--            /*
--             * ret: partial segment(s) are considered allocated.
--             * otherwise: unallocated tail is treated as an entire segment.
--             */
--            *pnum = DIV_ROUND_UP(total_count, s->cluster_size);
--            return ret;
--        }
--
--        /* Unallocated segment(s) with uncertain following segment(s) */
--        if (total_count >= s->cluster_size) {
--            *pnum = total_count / s->cluster_size;
--            return 0;
--        }
--
--        offset += count;
--        bytes -= count;
--    }
--}
--
--/*
-- * Reset bits in copy_bitmap starting at offset if they represent unallocated
-- * data in the image. May reset subsequent contiguous bits.
-- * @return 0 when the cluster at @offset was unallocated,
-- *         1 otherwise, and -ret on error.
-- */
--static int64_t block_copy_reset_unallocated(BlockCopyState *s,
--                                            int64_t offset, int64_t *count)
--{
--    int ret;
--    int64_t clusters, bytes;
--
--    ret = block_copy_is_cluster_allocated(s, offset, &clusters);
--    if (ret < 0) {
--        return ret;
--    }
--
--    bytes = clusters * s->cluster_size;
--
--    if (!ret) {
--        bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes);
--        s->progress_reset_callback(s->progress_opaque);
--    }
--
--    *count = bytes;
--    return ret;
--}
--
--static int coroutine_fn block_copy(BlockCopyState *s,
--                                   int64_t start, uint64_t bytes,
--                                   bool *error_is_read,
--                                   bool is_write_notifier)
--{
--    int ret = 0;
--    int64_t end = bytes + start; /* bytes */
--    void *bounce_buffer = NULL;
--    int64_t status_bytes;
--
--    /*
--     * block_copy() user is responsible for keeping source and target in same
--     * aio context
--     */
--    assert(blk_get_aio_context(s->source) == blk_get_aio_context(s->target));
--
--    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
--    assert(QEMU_IS_ALIGNED(end, s->cluster_size));
--
--    while (start < end) {
--        int64_t dirty_end;
--
--        if (!bdrv_dirty_bitmap_get(s->copy_bitmap, start)) {
--            trace_block_copy_skip(s, start);
--            start += s->cluster_size;
--            continue; /* already copied */
--        }
--
--        dirty_end = bdrv_dirty_bitmap_next_zero(s->copy_bitmap, start,
--                                                (end - start));
--        if (dirty_end < 0) {
--            dirty_end = end;
--        }
--
--        if (s->skip_unallocated) {
--            ret = block_copy_reset_unallocated(s, start, &status_bytes);
--            if (ret == 0) {
--                trace_block_copy_skip_range(s, start, status_bytes);
--                start += status_bytes;
--                continue;
--            }
--            /* Clamp to known allocated region */
--            dirty_end = MIN(dirty_end, start + status_bytes);
--        }
--
--        trace_block_copy_process(s, start);
--
--        if (s->use_copy_range) {
--            ret = block_copy_with_offload(s, start, dirty_end,
--                                          is_write_notifier);
--            if (ret < 0) {
--                s->use_copy_range = false;
--            }
--        }
--        if (!s->use_copy_range) {
--            ret = block_copy_with_bounce_buffer(s, start, dirty_end,
--                                                is_write_notifier,
--                                                error_is_read, &bounce_buffer);
--        }
--        if (ret < 0) {
--            break;
--        }
--
--        start += ret;
--        s->progress_bytes_callback(ret, s->progress_opaque);
--        ret = 0;
--    }
--
--    if (bounce_buffer) {
--        qemu_vfree(bounce_buffer);
--    }
--
--    return ret;
--}
--
- static void backup_progress_bytes_callback(int64_t bytes, void *opaque)
- {
-     BackupBlockJob *s = opaque;
-diff --git a/block/block-copy.c b/block/block-copy.c
-new file mode 100644
-index XXXXXXX..XXXXXXX
---- /dev/null
-+++ b/block/block-copy.c
-@@ -XXX,XX +XXX,XX @@
-+/*
-+ * block_copy API
-+ *
-+ * Copyright (C) 2013 Proxmox Server Solutions
-+ * Copyright (c) 2019 Virtuozzo International GmbH.
-+ *
-+ * Authors:
-+ *  Dietmar Maurer (dietmar@proxmox.com)
-+ *  Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-+ *
-+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
-+ * See the COPYING file in the top-level directory.
-+ */
-+
-+#include "qemu/osdep.h"
-+
-+#include "trace.h"
-+#include "qapi/error.h"
-+#include "block/block-copy.h"
-+#include "sysemu/block-backend.h"
-+
-+void block_copy_state_free(BlockCopyState *s)
-+{
-+    if (!s) {
-+        return;
-+    }
-+
-+    bdrv_release_dirty_bitmap(blk_bs(s->source), s->copy_bitmap);
-+    blk_unref(s->source);
-+    blk_unref(s->target);
-+    g_free(s);
-+}
-+
-+BlockCopyState *block_copy_state_new(
-+        BlockDriverState *source, BlockDriverState *target,
-+        int64_t cluster_size, BdrvRequestFlags write_flags,
-+        ProgressBytesCallbackFunc progress_bytes_callback,
-+        ProgressResetCallbackFunc progress_reset_callback,
-+        void *progress_opaque, Error **errp)
-+{
-+    BlockCopyState *s;
-+    int ret;
-+    uint64_t no_resize = BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE |
-+                         BLK_PERM_WRITE_UNCHANGED | BLK_PERM_GRAPH_MOD;
-+    BdrvDirtyBitmap *copy_bitmap;
-+
-+    copy_bitmap = bdrv_create_dirty_bitmap(source, cluster_size, NULL, errp);
-+    if (!copy_bitmap) {
-+        return NULL;
-+    }
-+    bdrv_disable_dirty_bitmap(copy_bitmap);
-+
-+    s = g_new(BlockCopyState, 1);
-+    *s = (BlockCopyState) {
-+        .source = blk_new(bdrv_get_aio_context(source),
-+                          BLK_PERM_CONSISTENT_READ, no_resize),
-+        .target = blk_new(bdrv_get_aio_context(target),
-+                          BLK_PERM_WRITE, no_resize),
-+        .copy_bitmap = copy_bitmap,
-+        .cluster_size = cluster_size,
-+        .len = bdrv_dirty_bitmap_size(copy_bitmap),
-+        .write_flags = write_flags,
-+        .progress_bytes_callback = progress_bytes_callback,
-+        .progress_reset_callback = progress_reset_callback,
-+        .progress_opaque = progress_opaque,
-+    };
-+
-+    s->copy_range_size = QEMU_ALIGN_DOWN(MIN(blk_get_max_transfer(s->source),
-+                                             blk_get_max_transfer(s->target)),
-+                                         s->cluster_size);
-+    /*
-+     * Set use_copy_range, consider the following:
-+     * 1. Compression is not supported for copy_range.
-+     * 2. copy_range does not respect max_transfer (it's a TODO), so we factor
-+     *    that in here. If max_transfer is smaller than the job->cluster_size,
-+     *    we do not use copy_range (in that case it's zero after aligning down
-+     *    above).
-+     */
-+    s->use_copy_range =
-+        !(write_flags & BDRV_REQ_WRITE_COMPRESSED) && s->copy_range_size > 0;
-+
-+    /*
-+     * We just allow aio context change on our block backends. block_copy() user
-+     * (now it's only backup) is responsible for source and target being in same
-+     * aio context.
-+     */
-+    blk_set_disable_request_queuing(s->source, true);
-+    blk_set_allow_aio_context_change(s->source, true);
-+    blk_set_disable_request_queuing(s->target, true);
-+    blk_set_allow_aio_context_change(s->target, true);
-+
-+    ret = blk_insert_bs(s->source, source, errp);
-+    if (ret < 0) {
-+        goto fail;
-+    }
-+
-+    ret = blk_insert_bs(s->target, target, errp);
-+    if (ret < 0) {
-+        goto fail;
-+    }
-+
-+    return s;
-+
-+fail:
-+    block_copy_state_free(s);
-+
-+    return NULL;
-+}
-+
-+/*
-+ * Copy range to target with a bounce buffer and return the bytes copied. If
-+ * error occurred, return a negative error number
-+ */
-+static int coroutine_fn block_copy_with_bounce_buffer(BlockCopyState *s,
-+                                                      int64_t start,
-+                                                      int64_t end,
-+                                                      bool is_write_notifier,
-+                                                      bool *error_is_read,
-+                                                      void **bounce_buffer)
-+{
-+    int ret;
-+    int nbytes;
-+    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
-+
-+    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
-+    bdrv_reset_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
-+    nbytes = MIN(s->cluster_size, s->len - start);
-+    if (!*bounce_buffer) {
-+        *bounce_buffer = blk_blockalign(s->source, s->cluster_size);
-+    }
-+
-+    ret = blk_co_pread(s->source, start, nbytes, *bounce_buffer, read_flags);
-+    if (ret < 0) {
-+        trace_block_copy_with_bounce_buffer_read_fail(s, start, ret);
-+        if (error_is_read) {
-+            *error_is_read = true;
-+        }
-+        goto fail;
-+    }
-+
-+    ret = blk_co_pwrite(s->target, start, nbytes, *bounce_buffer,
-+                        s->write_flags);
-+    if (ret < 0) {
-+        trace_block_copy_with_bounce_buffer_write_fail(s, start, ret);
-+        if (error_is_read) {
-+            *error_is_read = false;
-+        }
-+        goto fail;
-+    }
-+
-+    return nbytes;
-+fail:
-+    bdrv_set_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
-+    return ret;
-+
-+}
-+
-+/*
-+ * Copy range to target and return the bytes copied. If error occurred, return a
-+ * negative error number.
-+ */
-+static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
-+                                                int64_t start,
-+                                                int64_t end,
-+                                                bool is_write_notifier)
-+{
-+    int ret;
-+    int nr_clusters;
-+    int nbytes;
-+    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
-+
-+    assert(QEMU_IS_ALIGNED(s->copy_range_size, s->cluster_size));
-+    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
-+    nbytes = MIN(s->copy_range_size, MIN(end, s->len) - start);
-+    nr_clusters = DIV_ROUND_UP(nbytes, s->cluster_size);
-+    bdrv_reset_dirty_bitmap(s->copy_bitmap, start,
-+                            s->cluster_size * nr_clusters);
-+    ret = blk_co_copy_range(s->source, start, s->target, start, nbytes,
-+                            read_flags, s->write_flags);
-+    if (ret < 0) {
-+        trace_block_copy_with_offload_fail(s, start, ret);
-+        bdrv_set_dirty_bitmap(s->copy_bitmap, start,
-+                              s->cluster_size * nr_clusters);
-+        return ret;
-+    }
-+
-+    return nbytes;
-+}
-+
-+/*
-+ * Check if the cluster starting at offset is allocated or not.
-+ * return via pnum the number of contiguous clusters sharing this allocation.
-+ */
-+static int block_copy_is_cluster_allocated(BlockCopyState *s, int64_t offset,
-+                                           int64_t *pnum)
-+{
-+    BlockDriverState *bs = blk_bs(s->source);
-+    int64_t count, total_count = 0;
-+    int64_t bytes = s->len - offset;
-+    int ret;
-+
-+    assert(QEMU_IS_ALIGNED(offset, s->cluster_size));
-+
-+    while (true) {
-+        ret = bdrv_is_allocated(bs, offset, bytes, &count);
-+        if (ret < 0) {
-+            return ret;
-+        }
-+
-+        total_count += count;
-+
-+        if (ret || count == 0) {
-+            /*
-+             * ret: partial segment(s) are considered allocated.
-+             * otherwise: unallocated tail is treated as an entire segment.
-+             */
-+            *pnum = DIV_ROUND_UP(total_count, s->cluster_size);
-+            return ret;
-+        }
-+
-+        /* Unallocated segment(s) with uncertain following segment(s) */
-+        if (total_count >= s->cluster_size) {
-+            *pnum = total_count / s->cluster_size;
-+            return 0;
-+        }
-+
-+        offset += count;
-+        bytes -= count;
-+    }
-+}
-+
-+/*
-+ * Reset bits in copy_bitmap starting at offset if they represent unallocated
-+ * data in the image. May reset subsequent contiguous bits.
-+ * @return 0 when the cluster at @offset was unallocated,
-+ *         1 otherwise, and -ret on error.
-+ */
-+int64_t block_copy_reset_unallocated(BlockCopyState *s,
-+                                     int64_t offset, int64_t *count)
-+{
-+    int ret;
-+    int64_t clusters, bytes;
-+
-+    ret = block_copy_is_cluster_allocated(s, offset, &clusters);
-+    if (ret < 0) {
-+        return ret;
-+    }
-+
-+    bytes = clusters * s->cluster_size;
-+
-+    if (!ret) {
-+        bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes);
-+        s->progress_reset_callback(s->progress_opaque);
-+    }
-+
-+    *count = bytes;
-+    return ret;
-+}
-+
-+int coroutine_fn block_copy(BlockCopyState *s,
-+                            int64_t start, uint64_t bytes,
-+                            bool *error_is_read,
-+                            bool is_write_notifier)
-+{
-+    int ret = 0;
-+    int64_t end = bytes + start; /* bytes */
-+    void *bounce_buffer = NULL;
-+    int64_t status_bytes;
-+
-+    /*
-+     * block_copy() user is responsible for keeping source and target in same
-+     * aio context
-+     */
-+    assert(blk_get_aio_context(s->source) == blk_get_aio_context(s->target));
-+
-+    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
-+    assert(QEMU_IS_ALIGNED(end, s->cluster_size));
-+
-+    while (start < end) {
-+        int64_t dirty_end;
-+
-+        if (!bdrv_dirty_bitmap_get(s->copy_bitmap, start)) {
-+            trace_block_copy_skip(s, start);
-+            start += s->cluster_size;
-+            continue; /* already copied */
-+        }
-+
-+        dirty_end = bdrv_dirty_bitmap_next_zero(s->copy_bitmap, start,
-+                                                (end - start));
-+        if (dirty_end < 0) {
-+            dirty_end = end;
-+        }
-+
-+        if (s->skip_unallocated) {
-+            ret = block_copy_reset_unallocated(s, start, &status_bytes);
-+            if (ret == 0) {
-+                trace_block_copy_skip_range(s, start, status_bytes);
-+                start += status_bytes;
-+                continue;
-+            }
-+            /* Clamp to known allocated region */
-+            dirty_end = MIN(dirty_end, start + status_bytes);
-+        }
-+
-+        trace_block_copy_process(s, start);
-+
-+        if (s->use_copy_range) {
-+            ret = block_copy_with_offload(s, start, dirty_end,
-+                                          is_write_notifier);
-+            if (ret < 0) {
-+                s->use_copy_range = false;
-+            }
-+        }
-+        if (!s->use_copy_range) {
-+            ret = block_copy_with_bounce_buffer(s, start, dirty_end,
-+                                                is_write_notifier,
-+                                                error_is_read, &bounce_buffer);
-+        }
-+        if (ret < 0) {
-+            break;
-+        }
-+
-+        start += ret;
-+        s->progress_bytes_callback(ret, s->progress_opaque);
-+        ret = 0;
-+    }
-+
-+    if (bounce_buffer) {
-+        qemu_vfree(bounce_buffer);
-+    }
-+
-+    return ret;
-+}
-diff --git a/block/trace-events b/block/trace-events
-index XXXXXXX..XXXXXXX 100644
---- a/block/trace-events
-+++ b/block/trace-events
-@@ -XXX,XX +XXX,XX @@ mirror_yield_in_flight(void *s, int64_t offset, int in_flight) "s %p offset %" P
- # backup.c
- backup_do_cow_enter(void *job, int64_t start, int64_t offset, uint64_t bytes) "job %p start %" PRId64 " offset %" PRId64 " bytes %" PRIu64
- backup_do_cow_return(void *job, int64_t offset, uint64_t bytes, int ret) "job %p offset %" PRId64 " bytes %" PRIu64 " ret %d"
-+
-+# block-copy.c
- block_copy_skip(void *bcs, int64_t start) "bcs %p start %"PRId64
- block_copy_skip_range(void *bcs, int64_t start, uint64_t bytes) "bcs %p start %"PRId64" bytes %"PRId64
- block_copy_process(void *bcs, int64_t start) "bcs %p start %"PRId64
---
-.21.0

-[PULL 13/36] block: teach bdrv_debug_breakpoint skip filters with backing
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Teach bdrv_debug_breakpoint and bdrv_debug_remove_breakpoint skip
-filters with backing. This is needed to implement and use in backup job
-it's own backup_top filter driver (like mirror already has one), and
-without this improvement, breakpoint removal will fail at least in 55
-iotest.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190920142056.12778-9-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block.c | 34 ++++++++++++++++++++++++++--------
-file changed, 26 insertions(+), 8 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_debug_event(BlockDriverState *bs, BlkdebugEvent event)
-     bs->drv->bdrv_debug_event(bs, event);
- }
--int bdrv_debug_breakpoint(BlockDriverState *bs, const char *event,
--                          const char *tag)
-+static BlockDriverState *bdrv_find_debug_node(BlockDriverState *bs)
- {
-     while (bs && bs->drv && !bs->drv->bdrv_debug_breakpoint) {
--        bs = bs->file ? bs->file->bs : NULL;
-+        if (bs->file) {
-+            bs = bs->file->bs;
-+            continue;
-+        }
-+
-+        if (bs->drv->is_filter && bs->backing) {
-+            bs = bs->backing->bs;
-+            continue;
-+        }
-+
-+        break;
-     }
-     if (bs && bs->drv && bs->drv->bdrv_debug_breakpoint) {
-+        assert(bs->drv->bdrv_debug_remove_breakpoint);
-+        return bs;
-+    }
-+
-+    return NULL;
-+}
-+
-+int bdrv_debug_breakpoint(BlockDriverState *bs, const char *event,
-+                          const char *tag)
-+{
-+    bs = bdrv_find_debug_node(bs);
-+    if (bs) {
-         return bs->drv->bdrv_debug_breakpoint(bs, event, tag);
-     }
-@@ -XXX,XX +XXX,XX @@ int bdrv_debug_breakpoint(BlockDriverState *bs, const char *event,
- int bdrv_debug_remove_breakpoint(BlockDriverState *bs, const char *tag)
- {
--    while (bs && bs->drv && !bs->drv->bdrv_debug_remove_breakpoint) {
--        bs = bs->file ? bs->file->bs : NULL;
--    }
--
--    if (bs && bs->drv && bs->drv->bdrv_debug_remove_breakpoint) {
-+    bs = bdrv_find_debug_node(bs);
-+    if (bs) {
-         return bs->drv->bdrv_debug_remove_breakpoint(bs, tag);
-     }
---
-.21.0

-[PULL 14/36] iotests: prepare 124 and 257 bitmap querying for backup-top filter
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-After backup-top filter appearing it's not possible to see dirty
-bitmaps in top node, so use node-name instead.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190920142056.12778-10-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/124        |  83 ++++----
- tests/qemu-iotests/257        |  49 ++---
- tests/qemu-iotests/257.out    | 364 +++++++++++++---------------------
- tests/qemu-iotests/iotests.py |  27 +++
-files changed, 219 insertions(+), 304 deletions(-)
-diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/124
-+++ b/tests/qemu-iotests/124
-@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackupBase(iotests.QMPTestCase):
-         # Create a base image with a distinctive patterning
-         drive0 = self.add_node('drive0')
-         self.img_create(drive0['file'], drive0['fmt'])
--        self.vm.add_drive(drive0['file'])
-+        self.vm.add_drive(drive0['file'], opts='node-name=node0')
-         self.write_default_pattern(drive0['file'])
-         self.vm.launch()
-@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackup(TestIncrementalBackupBase):
-                             ('0xfe', '16M', '256k'),
-                             ('0x64', '32736k', '64k')))
-         # Check the dirty bitmap stats
--        result = self.vm.qmp('query-block')
--        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/name', 'bitmap0')
--        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/count', 458752)
--        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/granularity', 65536)
--        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/status', 'active')
--        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/persistent', False)
-+        self.assertTrue(self.vm.check_bitmap_status(
-+            'node0', bitmap0.name, {
-+                'name': 'bitmap0',
-+                'count': 458752,
-+                'granularity': 65536,
-+                'status': 'active',
-+                'persistent': False
-+            }))
-         # Prepare a cluster_size=128k backup target without a backing file.
-         (target, _) = bitmap0.new_target()
-@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
-         """
-         drive0 = self.drives[0]
--        # NB: The blkdebug script here looks for a "flush, read, read" pattern.
--        # The flush occurs in hmp_io_writes, the first read in device_add, and
--        # the last read during the block job.
-+        # NB: The blkdebug script here looks for a "flush, read" pattern.
-+        # The flush occurs in hmp_io_writes, and the read during the block job.
-         result = self.vm.qmp('blockdev-add',
-                              node_name=drive0['id'],
-                              driver=drive0['fmt'],
-@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
-                                      'event': 'flush_to_disk',
-                                      'state': 1,
-                                      'new_state': 2
--                                 },{
--                                     'event': 'read_aio',
--                                     'state': 2,
--                                     'new_state': 3
-                                  }],
-                                  'inject-error': [{
-                                      'event': 'read_aio',
-                                      'errno': 5,
--                                     'state': 3,
-+                                     'state': 2,
-                                      'immediately': False,
-                                      'once': True
-                                  }],
-@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
-                                           ('0xfe', '16M', '256k'),
-                                           ('0x64', '32736k', '64k')))
--        # For the purposes of query-block visibility of bitmaps, add a drive
--        # frontend after we've written data; otherwise we can't use hmp-io
--        result = self.vm.qmp("device_add",
--                             id="device0",
--                             drive=drive0['id'],
--                             driver="virtio-blk")
--        self.assert_qmp(result, 'return', {})
--
-         # Bitmap Status Check
--        query = self.vm.qmp('query-block')
--        ret = [bmap for bmap in query['return'][0]['dirty-bitmaps']
--               if bmap.get('name') == bitmap.name][0]
--        self.assert_qmp(ret, 'count', 458752)
--        self.assert_qmp(ret, 'granularity', 65536)
--        self.assert_qmp(ret, 'status', 'active')
--        self.assert_qmp(ret, 'busy', False)
--        self.assert_qmp(ret, 'recording', True)
-+        self.assertTrue(self.vm.check_bitmap_status(
-+            drive0['id'], bitmap.name, {
-+                'count': 458752,
-+                'granularity': 65536,
-+                'status': 'active',
-+                'busy': False,
-+                'recording': True
-+            }))
-         # Start backup
-         parent, _ = bitmap.last_target()
-@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
-                                         'operation': 'read'})
-         # Bitmap Status Check
--        query = self.vm.qmp('query-block')
--        ret = [bmap for bmap in query['return'][0]['dirty-bitmaps']
--               if bmap.get('name') == bitmap.name][0]
--        self.assert_qmp(ret, 'count', 458752)
--        self.assert_qmp(ret, 'granularity', 65536)
--        self.assert_qmp(ret, 'status', 'frozen')
--        self.assert_qmp(ret, 'busy', True)
--        self.assert_qmp(ret, 'recording', True)
-+        self.assertTrue(self.vm.check_bitmap_status(
-+            drive0['id'], bitmap.name, {
-+                'count': 458752,
-+                'granularity': 65536,
-+                'status': 'frozen',
-+                'busy': True,
-+                'recording': True
-+            }))
-         # Resume and check incremental backup for consistency
-         res = self.vm.qmp('block-job-resume', device=bitmap.drive['id'])
-@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
-         self.wait_qmp_backup(bitmap.drive['id'])
-         # Bitmap Status Check
--        query = self.vm.qmp('query-block')
--        ret = [bmap for bmap in query['return'][0]['dirty-bitmaps']
--               if bmap.get('name') == bitmap.name][0]
--        self.assert_qmp(ret, 'count', 0)
--        self.assert_qmp(ret, 'granularity', 65536)
--        self.assert_qmp(ret, 'status', 'active')
--        self.assert_qmp(ret, 'busy', False)
--        self.assert_qmp(ret, 'recording', True)
-+        self.assertTrue(self.vm.check_bitmap_status(
-+            drive0['id'], bitmap.name, {
-+                'count': 0,
-+                'granularity': 65536,
-+                'status': 'active',
-+                'busy': False,
-+                'recording': True
-+            }))
-         # Finalize / Cleanup
-         self.make_reference_backup(bitmap)
-diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/257
-+++ b/tests/qemu-iotests/257
-@@ -XXX,XX +XXX,XX @@ class Drive:
-         self.size = size
-         self.node = name
--def query_bitmaps(vm):
--    res = vm.qmp("query-block")
--    return {"bitmaps": {device['device'] or device['qdev']:
--                        device.get('dirty-bitmaps', []) for
--                        device in res['return']}}
--
--def get_bitmap(bitmaps, drivename, name, recording=None):
--    """
--    get a specific bitmap from the object returned by query_bitmaps.
--    :param recording: If specified, filter results by the specified value.
--    """
--    for bitmap in bitmaps['bitmaps'][drivename]:
--        if bitmap.get('name', '') == name:
--            if recording is None:
--                return bitmap
--            elif bitmap.get('recording') == recording:
--                return bitmap
--    return None
--
- def blockdev_backup(vm, device, target, sync, **kwargs):
-     # Strip any arguments explicitly nulled by the caller:
-     kwargs = {key: val for key, val in kwargs.items() if val is not None}
-@@ -XXX,XX +XXX,XX @@ def perform_writes(drive, n):
-             pattern.size)
-         log(cmd)
-         log(drive.vm.hmp_qemu_io(drive.name, cmd))
--    bitmaps = query_bitmaps(drive.vm)
--    log(bitmaps, indent=2)
-+    bitmaps = drive.vm.query_bitmaps()
-+    log({'bitmaps': bitmaps}, indent=2)
-     log('')
-     return bitmaps
-@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
-         # 1 - Writes and Reference Backup
-         bitmaps = perform_writes(drive0, 1)
-         ebitmap.dirty_group(1)
--        bitmap = get_bitmap(bitmaps, drive0.device, 'bitmap0')
-+        bitmap = vm.get_bitmap(drive0.node, 'bitmap0', bitmaps=bitmaps)
-         ebitmap.compare(bitmap)
-         reference_backup(drive0, 1, fbackup1)
-@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
-             log('')
-             bitmaps = perform_writes(drive0, 2)
-             # Named bitmap (static, should be unchanged)
--            ebitmap.compare(get_bitmap(bitmaps, drive0.device, 'bitmap0'))
-+            ebitmap.compare(vm.get_bitmap(drive0.node, 'bitmap0',
-+                                          bitmaps=bitmaps))
-             # Anonymous bitmap (dynamic, shows new writes)
-             anonymous = EmulatedBitmap()
-             anonymous.dirty_group(2)
--            anonymous.compare(get_bitmap(bitmaps, drive0.device, '',
--                                         recording=True))
-+            anonymous.compare(vm.get_bitmap(drive0.node, '', recording=True,
-+                                            bitmaps=bitmaps))
-             # Simulate the order in which this will happen:
-             # group 1 gets cleared first, then group two gets written.
-@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
-         vm.run_job(job, auto_dismiss=True, auto_finalize=False,
-                    pre_finalize=_callback,
-                    cancel=(failure == 'simulated'))
--        bitmaps = query_bitmaps(vm)
--        log(bitmaps, indent=2)
-+        bitmaps = vm.query_bitmaps()
-+        log({'bitmaps': bitmaps}, indent=2)
-         log('')
-         if bsync_mode == 'always' and failure == 'intermediate':
-@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
-                 ebitmap.clear()
-                 ebitmap.dirty_bits(range(fail_bit, SIZE // GRANULARITY))
--        ebitmap.compare(get_bitmap(bitmaps, drive0.device, 'bitmap0'))
-+        ebitmap.compare(vm.get_bitmap(drive0.node, 'bitmap0', bitmaps=bitmaps))
-         # 2 - Writes and Reference Backup
-         bitmaps = perform_writes(drive0, 3)
-         ebitmap.dirty_group(3)
--        ebitmap.compare(get_bitmap(bitmaps, drive0.device, 'bitmap0'))
-+        ebitmap.compare(vm.get_bitmap(drive0.node, 'bitmap0', bitmaps=bitmaps))
-         reference_backup(drive0, 2, fbackup2)
-         # 2 - Bitmap Backup (In failure modes, this is a recovery.)
-         job = backup(drive0, 2, bsync2, "bitmap",
-                      bitmap="bitmap0", bitmap_mode=bsync_mode)
-         vm.run_job(job, auto_dismiss=True, auto_finalize=False)
--        bitmaps = query_bitmaps(vm)
--        log(bitmaps, indent=2)
-+        bitmaps = vm.query_bitmaps()
-+        log({'bitmaps': bitmaps}, indent=2)
-         log('')
-         if bsync_mode != 'never':
-             ebitmap.clear()
--        ebitmap.compare(get_bitmap(bitmaps, drive0.device, 'bitmap0'))
-+        ebitmap.compare(vm.get_bitmap(drive0.node, 'bitmap0', bitmaps=bitmaps))
-         log('--- Cleanup ---\n')
-         vm.qmp_log("block-dirty-bitmap-remove",
-                    node=drive0.name, name="bitmap0")
--        log(query_bitmaps(vm), indent=2)
-+        bitmaps = vm.query_bitmaps()
-+        log({'bitmaps': bitmaps}, indent=2)
-         vm.shutdown()
-         log('')
-diff --git a/tests/qemu-iotests/257.out b/tests/qemu-iotests/257.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/257.out
-+++ b/tests/qemu-iotests/257.out
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 393216, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 655360,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 983040,
-@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
- {"data": {"device": "backup_2", "len": 983040, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 983040,
-@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
- {"data": {"device": "backup_1", "error": "Input/output error", "len": 393216, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 917504,
-@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
- {"data": {"device": "backup_2", "len": 917504, "offset": 917504, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 917504,
-@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 393216, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 655360,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 983040,
-@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
- {"data": {"device": "backup_2", "len": 983040, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 983040,
-@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 393216, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 655360,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 983040,
-@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
- {"data": {"device": "backup_2", "len": 983040, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
- {"data": {"device": "backup_1", "error": "Input/output error", "len": 393216, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 917504,
-@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
- {"data": {"device": "backup_2", "len": 917504, "offset": 917504, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 393216, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 786432,
-@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
- {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 393216, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 786432,
-@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
- {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
- {"data": {"device": "backup_1", "error": "Input/output error", "len": 393216, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 327680,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 851968,
-@@ -XXX,XX +XXX,XX @@ expecting 13 dirty sectors; have 13. OK!
- {"data": {"device": "backup_2", "len": 851968, "offset": 851968, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 393216, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 786432,
-@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
- {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 655360,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 983040,
-@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
- {"data": {"device": "backup_2", "len": 983040, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
- {"data": {"device": "backup_1", "error": "Input/output error", "len": 67108864, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 917504,
-@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
- {"data": {"device": "backup_2", "len": 917504, "offset": 917504, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 786432,
-@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
- {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 786432,
-@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
- {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
- {"data": {"device": "backup_1", "error": "Input/output error", "len": 67108864, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 66125824,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 66453504,
-@@ -XXX,XX +XXX,XX @@ expecting 1014 dirty sectors; have 1014. OK!
- {"data": {"device": "backup_2", "len": 66453504, "offset": 66453504, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 786432,
-@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
- {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 458752, "offset": 458752, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 655360,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 983040,
-@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
- {"data": {"device": "backup_2", "len": 983040, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
- {"data": {"device": "backup_1", "error": "Input/output error", "len": 458752, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 917504,
-@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
- {"data": {"device": "backup_2", "len": 917504, "offset": 917504, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 458752, "offset": 458752, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 786432,
-@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
- {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 458752, "offset": 458752, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 786432,
-@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
- {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
- {"data": {"device": "backup_1", "error": "Input/output error", "len": 458752, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 917504,
-@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
- {"data": {"device": "backup_2", "len": 917504, "offset": 917504, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
- write -P0x76 0x3ff0000 0x10000
- {"return": ""}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Reference Backup #0 ---
-@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 393216,
-@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
- {"data": {"device": "backup_1", "len": 458752, "offset": 458752, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
- {"return": ""}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 786432,
-@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
- {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
- {
-   "bitmaps": {
--    "device0": [
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 0,
-@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
- {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
- {"return": {}}
- {
--  "bitmaps": {
--    "device0": []
--  }
-+  "bitmaps": {}
- }
- --- Verification ---
-diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/iotests.py
-+++ b/tests/qemu-iotests/iotests.py
-@@ -XXX,XX +XXX,XX @@ class VM(qtest.QEMUQtestMachine):
-                 return x
-         return None
-+    def query_bitmaps(self):
-+        res = self.qmp("query-named-block-nodes")
-+        return {device['node-name']: device['dirty-bitmaps']
-+                for device in res['return'] if 'dirty-bitmaps' in device}
-+
-+    def get_bitmap(self, node_name, bitmap_name, recording=None, bitmaps=None):
-+        """
-+        get a specific bitmap from the object returned by query_bitmaps.
-+        :param recording: If specified, filter results by the specified value.
-+        :param bitmaps: If specified, use it instead of call query_bitmaps()
-+        """
-+        if bitmaps is None:
-+            bitmaps = self.query_bitmaps()
-+
-+        for bitmap in bitmaps[node_name]:
-+            if bitmap.get('name', '') == bitmap_name:
-+                if recording is None:
-+                    return bitmap
-+                elif bitmap.get('recording') == recording:
-+                    return bitmap
-+        return None
-+
-+    def check_bitmap_status(self, node_name, bitmap_name, fields):
-+        ret = self.get_bitmap(node_name, bitmap_name)
-+
-+        return fields.items() <= ret.items()
-+
- index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')
---
-.21.0

-[PULL 15/36] iotests: 257: drop unused Drive.device field
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-After previous commit Drive.device is actually unused. Drop it together
-with .name property.  While being here reuse .node in qmp commands
-instead of writing 'drive0' twice.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190920142056.12778-11-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/257 | 37 +++++++++++++++----------------------
-file changed, 15 insertions(+), 22 deletions(-)
-diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/257
-+++ b/tests/qemu-iotests/257
-@@ -XXX,XX +XXX,XX @@ class Drive:
-         self.fmt = None
-         self.size = None
-         self.node = None
--        self.device = None
--
--    @property
--    def name(self):
--        return self.node or self.device
-     def img_create(self, fmt, size):
-         self.fmt = fmt
-@@ -XXX,XX +XXX,XX @@ def blockdev_backup(vm, device, target, sync, **kwargs):
- def blockdev_backup_mktarget(drive, target_id, filepath, sync, **kwargs):
-     target_drive = Drive(filepath, vm=drive.vm)
-     target_drive.create_target(target_id, drive.fmt, drive.size)
--    blockdev_backup(drive.vm, drive.name, target_id, sync, **kwargs)
-+    blockdev_backup(drive.vm, drive.node, target_id, sync, **kwargs)
- def reference_backup(drive, n, filepath):
-     log("--- Reference Backup #{:d} ---\n".format(n))
-@@ -XXX,XX +XXX,XX @@ def perform_writes(drive, n):
-             pattern.offset,
-             pattern.size)
-         log(cmd)
--        log(drive.vm.hmp_qemu_io(drive.name, cmd))
-+        log(drive.vm.hmp_qemu_io(drive.node, cmd))
-     bitmaps = drive.vm.query_bitmaps()
-     log({'bitmaps': bitmaps}, indent=2)
-     log('')
-@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
-                 }]
-             }
-+        drive0.node = 'drive0'
-         vm.qmp_log('blockdev-add',
-                    filters=[iotests.filter_qmp_testfiles],
--                   node_name="drive0",
-+                   node_name=drive0.node,
-                    driver=drive0.fmt,
-                    file=file_config)
--        drive0.node = 'drive0'
--        drive0.device = 'device0'
-         # Use share-rw to allow writes directly to the node;
-         # The anonymous block-backend for this configuration prevents us
-         # from using HMP's qemu-io commands to address the device.
--        vm.qmp_log("device_add", id=drive0.device,
--                   drive=drive0.name, driver="scsi-hd",
-+        vm.qmp_log("device_add", id='device0',
-+                   drive=drive0.node, driver="scsi-hd",
-                    share_rw=True)
-         log('')
-@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
-         perform_writes(drive0, 0)
-         reference_backup(drive0, 0, fbackup0)
-         log('--- Add Bitmap ---\n')
--        vm.qmp_log("block-dirty-bitmap-add", node=drive0.name,
-+        vm.qmp_log("block-dirty-bitmap-add", node=drive0.node,
-                    name="bitmap0", granularity=GRANULARITY)
-         log('')
-         ebitmap = EmulatedBitmap()
-@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
-         # 1 - Test Backup (w/ Optional induced failure)
-         if failure == 'intermediate':
-             # Activate blkdebug induced failure for second-to-next read
--            log(vm.hmp_qemu_io(drive0.name, 'flush'))
-+            log(vm.hmp_qemu_io(drive0.node, 'flush'))
-             log('')
-         job = backup(drive0, 1, bsync1, msync_mode,
-                      bitmap="bitmap0", bitmap_mode=bsync_mode)
-@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
-         log('--- Cleanup ---\n')
-         vm.qmp_log("block-dirty-bitmap-remove",
--                   node=drive0.name, name="bitmap0")
-+                   node=drive0.node, name="bitmap0")
-         bitmaps = vm.query_bitmaps()
-         log({'bitmaps': bitmaps}, indent=2)
-         vm.shutdown()
-@@ -XXX,XX +XXX,XX @@ def test_backup_api():
-             'filename': drive0.path
-         }
-+        drive0.node = 'drive0'
-         vm.qmp_log('blockdev-add',
-                    filters=[iotests.filter_qmp_testfiles],
--                   node_name="drive0",
-+                   node_name=drive0.node,
-                    driver=drive0.fmt,
-                    file=file_config)
--        drive0.node = 'drive0'
--        drive0.device = 'device0'
--        vm.qmp_log("device_add", id=drive0.device,
--                   drive=drive0.name, driver="scsi-hd")
-+        vm.qmp_log("device_add", id='device0',
-+                   drive=drive0.node, driver="scsi-hd")
-         log('')
-         target0 = Drive(backup_path, vm=vm)
-         target0.create_target("backup_target", drive0.fmt, drive0.size)
-         log('')
--        vm.qmp_log("block-dirty-bitmap-add", node=drive0.name,
-+        vm.qmp_log("block-dirty-bitmap-add", node=drive0.node,
-                    name="bitmap0", granularity=GRANULARITY)
-         log('')
-@@ -XXX,XX +XXX,XX @@ def test_backup_api():
-             log("-- Sync mode {:s} tests --\n".format(sync_mode))
-             for bitmap in (None, 'bitmap404', 'bitmap0'):
-                 for policy in error_cases[sync_mode][bitmap]:
--                    blockdev_backup(drive0.vm, drive0.name, "backup_target",
-+                    blockdev_backup(drive0.vm, drive0.node, "backup_target",
-                                     sync_mode, job_id='api_job',
-                                     bitmap=bitmap, bitmap_mode=policy)
-                     log('')
---
-.21.0

-[PULL 16/36] iotests: 257: drop device_add
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-SCSI devices are unused in test, drop them.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190920142056.12778-12-vsementsov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/257     |  8 -------
- tests/qemu-iotests/257.out | 44 --------------------------------------
-files changed, 52 deletions(-)
-diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/257
-+++ b/tests/qemu-iotests/257
-@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
-                    node_name=drive0.node,
-                    driver=drive0.fmt,
-                    file=file_config)
--        # Use share-rw to allow writes directly to the node;
--        # The anonymous block-backend for this configuration prevents us
--        # from using HMP's qemu-io commands to address the device.
--        vm.qmp_log("device_add", id='device0',
--                   drive=drive0.node, driver="scsi-hd",
--                   share_rw=True)
-         log('')
-         # 0 - Writes and Reference Backup
-@@ -XXX,XX +XXX,XX @@ def test_backup_api():
-                    node_name=drive0.node,
-                    driver=drive0.fmt,
-                    file=file_config)
--        vm.qmp_log("device_add", id='device0',
--                   drive=drive0.node, driver="scsi-hd")
-         log('')
-         target0 = Drive(backup_path, vm=vm)
-diff --git a/tests/qemu-iotests/257.out b/tests/qemu-iotests/257.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/257.out
-+++ b/tests/qemu-iotests/257.out
-@@ -XXX,XX +XXX,XX @@
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
--{"return": {}}
- --- Write #0 ---
-@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
- {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
- {"return": {}}
--{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0"}}
--{"return": {}}
- {}
- {"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
---
-.21.0

-[PULL 17/36] qapi: group BlockDeviceStats fields
+Deleted patch
-From: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Make the stat fields definition slightly more readable.
-Also reorder total_time_ns stats read-write-flush as done elsewhere.
-Cosmetic change only.
-Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20190923121737.83281-2-anton.nefedov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- qapi/block-core.json | 26 +++++++++++++++-----------
-file changed, 15 insertions(+), 11 deletions(-)
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
-+++ b/qapi/block-core.json
-@@ -XXX,XX +XXX,XX @@
- # @flush_operations: The number of cache flush operations performed by the
- #                    device (since 0.15.0)
- #
--# @flush_total_time_ns: Total time spend on cache flushes in nano-seconds
--#                       (since 0.15.0).
-+# @rd_total_time_ns: Total time spent on reads in nanoseconds (since 0.15.0).
- #
--# @wr_total_time_ns: Total time spend on writes in nano-seconds (since 0.15.0).
-+# @wr_total_time_ns: Total time spent on writes in nanoseconds (since 0.15.0).
- #
--# @rd_total_time_ns: Total_time_spend on reads in nano-seconds (since 0.15.0).
-+# @flush_total_time_ns: Total time spent on cache flushes in nanoseconds
-+#                       (since 0.15.0).
- #
- # @wr_highest_offset: The offset after the greatest byte written to the
- #                     device.  The intended use of this information is for
-@@ -XXX,XX +XXX,XX @@
- # Since: 0.14.0
- ##
- { 'struct': 'BlockDeviceStats',
--  'data': {'rd_bytes': 'int', 'wr_bytes': 'int', 'rd_operations': 'int',
--           'wr_operations': 'int', 'flush_operations': 'int',
--           'flush_total_time_ns': 'int', 'wr_total_time_ns': 'int',
--           'rd_total_time_ns': 'int', 'wr_highest_offset': 'int',
--           'rd_merged': 'int', 'wr_merged': 'int', '*idle_time_ns': 'int',
-+  'data': {'rd_bytes': 'int', 'wr_bytes': 'int',
-+           'rd_operations': 'int', 'wr_operations': 'int',
-+           'flush_operations': 'int',
-+           'rd_total_time_ns': 'int', 'wr_total_time_ns': 'int',
-+           'flush_total_time_ns': 'int',
-+           'wr_highest_offset': 'int',
-+           'rd_merged': 'int', 'wr_merged': 'int',
-+           '*idle_time_ns': 'int',
-            'failed_rd_operations': 'int', 'failed_wr_operations': 'int',
--           'failed_flush_operations': 'int', 'invalid_rd_operations': 'int',
--           'invalid_wr_operations': 'int', 'invalid_flush_operations': 'int',
-+           'failed_flush_operations': 'int',
-+           'invalid_rd_operations': 'int', 'invalid_wr_operations': 'int',
-+           'invalid_flush_operations': 'int',
-            'account_invalid': 'bool', 'account_failed': 'bool',
-            'timed_stats': ['BlockDeviceTimedStats'],
-            '*rd_latency_histogram': 'BlockLatencyHistogramInfo',
---
-.21.0

-[PULL 18/36] qapi: add unmap to BlockDeviceStats
+Deleted patch
-From: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Message-id: 20190923121737.83281-3-anton.nefedov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- qapi/block-core.json       | 29 +++++++++++++++++++++++------
- include/block/accounting.h |  1 +
- block/qapi.c               |  6 ++++++
- tests/qemu-iotests/227.out | 18 ++++++++++++++++++
-files changed, 48 insertions(+), 6 deletions(-)
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
-+++ b/qapi/block-core.json
-@@ -XXX,XX +XXX,XX @@
- #
- # @wr_bytes:      The number of bytes written by the device.
- #
-+# @unmap_bytes: The number of bytes unmapped by the device (Since 4.2)
-+#
- # @rd_operations: The number of read operations performed by the device.
- #
- # @wr_operations: The number of write operations performed by the device.
-@@ -XXX,XX +XXX,XX @@
- # @flush_operations: The number of cache flush operations performed by the
- #                    device (since 0.15.0)
- #
-+# @unmap_operations: The number of unmap operations performed by the device
-+#                    (Since 4.2)
-+#
- # @rd_total_time_ns: Total time spent on reads in nanoseconds (since 0.15.0).
- #
- # @wr_total_time_ns: Total time spent on writes in nanoseconds (since 0.15.0).
-@@ -XXX,XX +XXX,XX @@
- # @flush_total_time_ns: Total time spent on cache flushes in nanoseconds
- #                       (since 0.15.0).
- #
-+# @unmap_total_time_ns: Total time spent on unmap operations in nanoseconds
-+#                       (Since 4.2)
-+#
- # @wr_highest_offset: The offset after the greatest byte written to the
- #                     device.  The intended use of this information is for
- #                     growable sparse files (like qcow2) that are used on top
-@@ -XXX,XX +XXX,XX @@
- # @wr_merged: Number of write requests that have been merged into another
- #             request (Since 2.3).
- #
-+# @unmap_merged: Number of unmap requests that have been merged into another
-+#                request (Since 4.2)
-+#
- # @idle_time_ns: Time since the last I/O operation, in
- #                nanoseconds. If the field is absent it means that
- #                there haven't been any operations yet (Since 2.5).
-@@ -XXX,XX +XXX,XX @@
- # @failed_flush_operations: The number of failed flush operations
- #                           performed by the device (Since 2.5)
- #
-+# @failed_unmap_operations: The number of failed unmap operations performed
-+#                           by the device (Since 4.2)
-+#
- # @invalid_rd_operations: The number of invalid read operations
- #                          performed by the device (Since 2.5)
- #
-@@ -XXX,XX +XXX,XX @@
- # @invalid_flush_operations: The number of invalid flush operations
- #                            performed by the device (Since 2.5)
- #
-+# @invalid_unmap_operations: The number of invalid unmap operations performed
-+#                            by the device (Since 4.2)
-+#
- # @account_invalid: Whether invalid operations are included in the
- #                   last access statistics (Since 2.5)
- #
-@@ -XXX,XX +XXX,XX @@
- # Since: 0.14.0
- ##
- { 'struct': 'BlockDeviceStats',
--  'data': {'rd_bytes': 'int', 'wr_bytes': 'int',
-+  'data': {'rd_bytes': 'int', 'wr_bytes': 'int', 'unmap_bytes' : 'int',
-            'rd_operations': 'int', 'wr_operations': 'int',
--           'flush_operations': 'int',
-+           'flush_operations': 'int', 'unmap_operations': 'int',
-            'rd_total_time_ns': 'int', 'wr_total_time_ns': 'int',
--           'flush_total_time_ns': 'int',
-+           'flush_total_time_ns': 'int', 'unmap_total_time_ns': 'int',
-            'wr_highest_offset': 'int',
--           'rd_merged': 'int', 'wr_merged': 'int',
-+           'rd_merged': 'int', 'wr_merged': 'int', 'unmap_merged': 'int',
-            '*idle_time_ns': 'int',
-            'failed_rd_operations': 'int', 'failed_wr_operations': 'int',
--           'failed_flush_operations': 'int',
-+           'failed_flush_operations': 'int', 'failed_unmap_operations': 'int',
-            'invalid_rd_operations': 'int', 'invalid_wr_operations': 'int',
--           'invalid_flush_operations': 'int',
-+           'invalid_flush_operations': 'int', 'invalid_unmap_operations': 'int',
-            'account_invalid': 'bool', 'account_failed': 'bool',
-            'timed_stats': ['BlockDeviceTimedStats'],
-            '*rd_latency_histogram': 'BlockLatencyHistogramInfo',
-diff --git a/include/block/accounting.h b/include/block/accounting.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/accounting.h
-+++ b/include/block/accounting.h
-@@ -XXX,XX +XXX,XX @@ enum BlockAcctType {
-     BLOCK_ACCT_READ,
-     BLOCK_ACCT_WRITE,
-     BLOCK_ACCT_FLUSH,
-+    BLOCK_ACCT_UNMAP,
-     BLOCK_MAX_IOTYPE,
- };
-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 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk)
-     ds->rd_bytes = stats->nr_bytes[BLOCK_ACCT_READ];
-     ds->wr_bytes = stats->nr_bytes[BLOCK_ACCT_WRITE];
-+    ds->unmap_bytes = stats->nr_bytes[BLOCK_ACCT_UNMAP];
-     ds->rd_operations = stats->nr_ops[BLOCK_ACCT_READ];
-     ds->wr_operations = stats->nr_ops[BLOCK_ACCT_WRITE];
-+    ds->unmap_operations = stats->nr_ops[BLOCK_ACCT_UNMAP];
-     ds->failed_rd_operations = stats->failed_ops[BLOCK_ACCT_READ];
-     ds->failed_wr_operations = stats->failed_ops[BLOCK_ACCT_WRITE];
-     ds->failed_flush_operations = stats->failed_ops[BLOCK_ACCT_FLUSH];
-+    ds->failed_unmap_operations = stats->failed_ops[BLOCK_ACCT_UNMAP];
-     ds->invalid_rd_operations = stats->invalid_ops[BLOCK_ACCT_READ];
-     ds->invalid_wr_operations = stats->invalid_ops[BLOCK_ACCT_WRITE];
-     ds->invalid_flush_operations =
-         stats->invalid_ops[BLOCK_ACCT_FLUSH];
-+    ds->invalid_unmap_operations = stats->invalid_ops[BLOCK_ACCT_UNMAP];
-     ds->rd_merged = stats->merged[BLOCK_ACCT_READ];
-     ds->wr_merged = stats->merged[BLOCK_ACCT_WRITE];
-+    ds->unmap_merged = stats->merged[BLOCK_ACCT_UNMAP];
-     ds->flush_operations = stats->nr_ops[BLOCK_ACCT_FLUSH];
-     ds->wr_total_time_ns = stats->total_time_ns[BLOCK_ACCT_WRITE];
-     ds->rd_total_time_ns = stats->total_time_ns[BLOCK_ACCT_READ];
-     ds->flush_total_time_ns = stats->total_time_ns[BLOCK_ACCT_FLUSH];
-+    ds->unmap_total_time_ns = stats->total_time_ns[BLOCK_ACCT_UNMAP];
-     ds->has_idle_time_ns = stats->last_access_time_ns > 0;
-     if (ds->has_idle_time_ns) {
-diff --git a/tests/qemu-iotests/227.out b/tests/qemu-iotests/227.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/227.out
-+++ b/tests/qemu-iotests/227.out
-@@ -XXX,XX +XXX,XX @@ Testing: -drive driver=null-co,read-zeroes=on,if=virtio
-         {
-             "device": "virtio0",
-             "stats": {
-+                "unmap_operations": 0,
-+                "unmap_merged": 0,
-                 "flush_total_time_ns": 0,
-                 "wr_highest_offset": 0,
-                 "wr_total_time_ns": 0,
-@@ -XXX,XX +XXX,XX @@ Testing: -drive driver=null-co,read-zeroes=on,if=virtio
-                 "wr_bytes": 0,
-                 "timed_stats": [
-                 ],
-+                "failed_unmap_operations": 0,
-                 "failed_flush_operations": 0,
-                 "account_invalid": true,
-                 "rd_total_time_ns": 0,
-+                "invalid_unmap_operations": 0,
-                 "flush_operations": 0,
-                 "wr_operations": 0,
-+                "unmap_bytes": 0,
-                 "rd_merged": 0,
-                 "rd_bytes": 0,
-+                "unmap_total_time_ns": 0,
-                 "invalid_flush_operations": 0,
-                 "account_failed": true,
-                 "rd_operations": 0,
-@@ -XXX,XX +XXX,XX @@ Testing: -drive driver=null-co,if=none
-         {
-             "device": "none0",
-             "stats": {
-+                "unmap_operations": 0,
-+                "unmap_merged": 0,
-                 "flush_total_time_ns": 0,
-                 "wr_highest_offset": 0,
-                 "wr_total_time_ns": 0,
-@@ -XXX,XX +XXX,XX @@ Testing: -drive driver=null-co,if=none
-                 "wr_bytes": 0,
-                 "timed_stats": [
-                 ],
-+                "failed_unmap_operations": 0,
-                 "failed_flush_operations": 0,
-                 "account_invalid": true,
-                 "rd_total_time_ns": 0,
-+                "invalid_unmap_operations": 0,
-                 "flush_operations": 0,
-                 "wr_operations": 0,
-+                "unmap_bytes": 0,
-                 "rd_merged": 0,
-                 "rd_bytes": 0,
-+                "unmap_total_time_ns": 0,
-                 "invalid_flush_operations": 0,
-                 "account_failed": true,
-                 "rd_operations": 0,
-@@ -XXX,XX +XXX,XX @@ Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device virtio-b
-         {
-             "device": "",
-             "stats": {
-+                "unmap_operations": 0,
-+                "unmap_merged": 0,
-                 "flush_total_time_ns": 0,
-                 "wr_highest_offset": 0,
-                 "wr_total_time_ns": 0,
-@@ -XXX,XX +XXX,XX @@ Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device virtio-b
-                 "wr_bytes": 0,
-                 "timed_stats": [
-                 ],
-+                "failed_unmap_operations": 0,
-                 "failed_flush_operations": 0,
-                 "account_invalid": false,
-                 "rd_total_time_ns": 0,
-+                "invalid_unmap_operations": 0,
-                 "flush_operations": 0,
-                 "wr_operations": 0,
-+                "unmap_bytes": 0,
-                 "rd_merged": 0,
-                 "rd_bytes": 0,
-+                "unmap_total_time_ns": 0,
-                 "invalid_flush_operations": 0,
-                 "account_failed": false,
-                 "rd_operations": 0,
---
-.21.0

-[PULL 19/36] block: add empty account cookie type
+Deleted patch
-From: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Each block_acct_done/failed call is designed to correspond to a
-previous block_acct_start call, which initializes the stats cookie.
-However sometimes it is not the case, e.g. some error paths might
-report the same cookie twice because it is hard to accurately track if
-the cookie was reported yet or not.
-This patch cleans the cookie after report.
-(Note: block_acct_failed/done without a previous block_acct_start at
-all should be avoided. Uninitialized cookie might hold a garbage value
-and there is still "< BLOCK_MAX_IOTYPE" assertion for that)
-It will be particularly useful in ide code where it's hard to
-keep track whether the request done its accounting or not: in the
-following patch of the series, trim requests will do the accounting
-separately.
-Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20190923121737.83281-4-anton.nefedov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- include/block/accounting.h | 1 +
- block/accounting.c         | 6 ++++++
-files changed, 7 insertions(+)
-diff --git a/include/block/accounting.h b/include/block/accounting.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/accounting.h
-+++ b/include/block/accounting.h
-@@ -XXX,XX +XXX,XX @@ typedef struct BlockAcctTimedStats BlockAcctTimedStats;
- typedef struct BlockAcctStats BlockAcctStats;
- enum BlockAcctType {
-+    BLOCK_ACCT_NONE = 0,
-     BLOCK_ACCT_READ,
-     BLOCK_ACCT_WRITE,
-     BLOCK_ACCT_FLUSH,
-diff --git a/block/accounting.c b/block/accounting.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/accounting.c
-+++ b/block/accounting.c
-@@ -XXX,XX +XXX,XX @@ static void block_account_one_io(BlockAcctStats *stats, BlockAcctCookie *cookie,
-     assert(cookie->type < BLOCK_MAX_IOTYPE);
-+    if (cookie->type == BLOCK_ACCT_NONE) {
-+        return;
-+    }
-+
-     qemu_mutex_lock(&stats->lock);
-     if (failed) {
-@@ -XXX,XX +XXX,XX @@ static void block_account_one_io(BlockAcctStats *stats, BlockAcctCookie *cookie,
-     }
-     qemu_mutex_unlock(&stats->lock);
-+
-+    cookie->type = BLOCK_ACCT_NONE;
- }
- void block_acct_done(BlockAcctStats *stats, BlockAcctCookie *cookie)
---
-.21.0

-[PULL 20/36] ide: account UNMAP (TRIM) operations
+Deleted patch
-From: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20190923121737.83281-5-anton.nefedov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- hw/ide/core.c | 12 ++++++++++++
-file changed, 12 insertions(+)
-diff --git a/hw/ide/core.c b/hw/ide/core.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/ide/core.c
-+++ b/hw/ide/core.c
-@@ -XXX,XX +XXX,XX @@ static void ide_issue_trim_cb(void *opaque, int ret)
-     TrimAIOCB *iocb = opaque;
-     IDEState *s = iocb->s;
-+    if (iocb->i >= 0) {
-+        if (ret >= 0) {
-+            block_acct_done(blk_get_stats(s->blk), &s->acct);
-+        } else {
-+            block_acct_failed(blk_get_stats(s->blk), &s->acct);
-+        }
-+    }
-+
-     if (ret >= 0) {
-         while (iocb->j < iocb->qiov->niov) {
-             int j = iocb->j;
-@@ -XXX,XX +XXX,XX @@ static void ide_issue_trim_cb(void *opaque, int ret)
-                 }
-                 if (!ide_sect_range_ok(s, sector, count)) {
-+                    block_acct_invalid(blk_get_stats(s->blk), BLOCK_ACCT_UNMAP);
-                     iocb->ret = -EINVAL;
-                     goto done;
-                 }
-+                block_acct_start(blk_get_stats(s->blk), &s->acct,
-+                                 count << BDRV_SECTOR_BITS, BLOCK_ACCT_UNMAP);
-+
-                 /* Got an entry! Submit and exit.  */
-                 iocb->aiocb = blk_aio_pdiscard(s->blk,
-                                                sector << BDRV_SECTOR_BITS,
---
-.21.0

-[PULL 21/36] scsi: store unmap offset and nb_sectors in request struct
+Deleted patch
-From: Anton Nefedov <anton.nefedov@virtuozzo.com>
-it allows to report it in the error handler
-Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Message-id: 20190923121737.83281-6-anton.nefedov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- hw/scsi/scsi-disk.c | 14 +++++++-------
-file changed, 7 insertions(+), 7 deletions(-)
-diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/scsi/scsi-disk.c
-+++ b/hw/scsi/scsi-disk.c
-@@ -XXX,XX +XXX,XX @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret)
- {
-     SCSIDiskReq *r = data->r;
-     SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
--    uint64_t sector_num;
--    uint32_t nb_sectors;
-     assert(r->req.aiocb == NULL);
-     if (scsi_disk_req_check_error(r, ret, false)) {
-@@ -XXX,XX +XXX,XX @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret)
-     }
-     if (data->count > 0) {
--        sector_num = ldq_be_p(&data->inbuf[0]);
--        nb_sectors = ldl_be_p(&data->inbuf[8]) & 0xffffffffULL;
--        if (!check_lba_range(s, sector_num, nb_sectors)) {
-+        r->sector = ldq_be_p(&data->inbuf[0])
-+            * (s->qdev.blocksize / BDRV_SECTOR_SIZE);
-+        r->sector_count = (ldl_be_p(&data->inbuf[8]) & 0xffffffffULL)
-+            * (s->qdev.blocksize / BDRV_SECTOR_SIZE);
-+        if (!check_lba_range(s, r->sector, r->sector_count)) {
-             scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));
-             goto done;
-         }
-         r->req.aiocb = blk_aio_pdiscard(s->qdev.conf.blk,
--                                        sector_num * s->qdev.blocksize,
--                                        nb_sectors * s->qdev.blocksize,
-+                                        r->sector * BDRV_SECTOR_SIZE,
-+                                        r->sector_count * BDRV_SECTOR_SIZE,
-                                         scsi_unmap_complete, data);
-         data->count--;
-         data->inbuf += 16;
---
-.21.0

-[PULL 22/36] scsi: move unmap error checking to the complete callback
+Deleted patch
-From: Anton Nefedov <anton.nefedov@virtuozzo.com>
-This will help to account the operation in the following commit.
-The difference is that we don't call scsi_disk_req_check_error() before
-the 1st discard iteration anymore. That function also checks if
-the request is cancelled, however it shouldn't get canceled until it
-yields in blk_aio() functions anyway.
-Same approach is already used for emulate_write_same.
-Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Message-id: 20190923121737.83281-7-anton.nefedov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- hw/scsi/scsi-disk.c | 10 ++++++----
-file changed, 6 insertions(+), 4 deletions(-)
-diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/scsi/scsi-disk.c
-+++ b/hw/scsi/scsi-disk.c
-@@ -XXX,XX +XXX,XX @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret)
-     SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
-     assert(r->req.aiocb == NULL);
--    if (scsi_disk_req_check_error(r, ret, false)) {
--        goto done;
--    }
-     if (data->count > 0) {
-         r->sector = ldq_be_p(&data->inbuf[0])
-@@ -XXX,XX +XXX,XX @@ static void scsi_unmap_complete(void *opaque, int ret)
-     r->req.aiocb = NULL;
-     aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk));
--    scsi_unmap_complete_noio(data, ret);
-+    if (scsi_disk_req_check_error(r, ret, false)) {
-+        scsi_req_unref(&r->req);
-+        g_free(data);
-+    } else {
-+        scsi_unmap_complete_noio(data, ret);
-+    }
-     aio_context_release(blk_get_aio_context(s->qdev.conf.blk));
- }
---
-.21.0

-[PULL 23/36] scsi: account unmap operations
+Deleted patch
-From: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20190923121737.83281-8-anton.nefedov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- hw/scsi/scsi-disk.c | 12 +++++++++++-
-file changed, 11 insertions(+), 1 deletion(-)
-diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/scsi/scsi-disk.c
-+++ b/hw/scsi/scsi-disk.c
-@@ -XXX,XX +XXX,XX @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret)
-         r->sector_count = (ldl_be_p(&data->inbuf[8]) & 0xffffffffULL)
-             * (s->qdev.blocksize / BDRV_SECTOR_SIZE);
-         if (!check_lba_range(s, r->sector, r->sector_count)) {
-+            block_acct_invalid(blk_get_stats(s->qdev.conf.blk),
-+                               BLOCK_ACCT_UNMAP);
-             scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));
-             goto done;
-         }
-+        block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct,
-+                         r->sector_count * BDRV_SECTOR_SIZE,
-+                         BLOCK_ACCT_UNMAP);
-+
-         r->req.aiocb = blk_aio_pdiscard(s->qdev.conf.blk,
-                                         r->sector * BDRV_SECTOR_SIZE,
-                                         r->sector_count * BDRV_SECTOR_SIZE,
-@@ -XXX,XX +XXX,XX @@ static void scsi_unmap_complete(void *opaque, int ret)
-     r->req.aiocb = NULL;
-     aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk));
--    if (scsi_disk_req_check_error(r, ret, false)) {
-+    if (scsi_disk_req_check_error(r, ret, true)) {
-         scsi_req_unref(&r->req);
-         g_free(data);
-     } else {
-+        block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct);
-         scsi_unmap_complete_noio(data, ret);
-     }
-     aio_context_release(blk_get_aio_context(s->qdev.conf.blk));
-@@ -XXX,XX +XXX,XX @@ static void scsi_disk_emulate_unmap(SCSIDiskReq *r, uint8_t *inbuf)
-     }
-     if (blk_is_read_only(s->qdev.conf.blk)) {
-+        block_acct_invalid(blk_get_stats(s->qdev.conf.blk), BLOCK_ACCT_UNMAP);
-         scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED));
-         return;
-     }
-@@ -XXX,XX +XXX,XX @@ static void scsi_disk_emulate_unmap(SCSIDiskReq *r, uint8_t *inbuf)
-     return;
- invalid_param_len:
-+    block_acct_invalid(blk_get_stats(s->qdev.conf.blk), BLOCK_ACCT_UNMAP);
-     scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
-     return;
- invalid_field:
-+    block_acct_invalid(blk_get_stats(s->qdev.conf.blk), BLOCK_ACCT_UNMAP);
-     scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
- }
---
-.21.0

-[PULL 24/36] file-posix: account discard operations
+Deleted patch
-From: Anton Nefedov <anton.nefedov@virtuozzo.com>
-This will help to identify how many of the user-issued discard operations
-(accounted on a device level) have actually suceeded down on the host file
-(even though the numbers will not be exactly the same if non-raw format
-driver is used (e.g. qcow2 sending metadata discards)).
-Note that these numbers will not include discards triggered by
-write-zeroes + MAY_UNMAP calls.
-Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20190923121737.83281-9-anton.nefedov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/file-posix.c | 22 +++++++++++++++++++++-
-file changed, 21 insertions(+), 1 deletion(-)
-diff --git a/block/file-posix.c b/block/file-posix.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
-+++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRawState {
-     bool needs_alignment;
-     bool drop_cache;
-     bool check_cache_dropped;
-+    struct {
-+        uint64_t discard_nb_ok;
-+        uint64_t discard_nb_failed;
-+        uint64_t discard_bytes_ok;
-+    } stats;
-     PRManager *pr_mgr;
- } BDRVRawState;
-@@ -XXX,XX +XXX,XX @@ static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
- #endif /* !__linux__ */
- }
-+static void raw_account_discard(BDRVRawState *s, uint64_t nbytes, int ret)
-+{
-+    if (ret) {
-+        s->stats.discard_nb_failed++;
-+    } else {
-+        s->stats.discard_nb_ok++;
-+        s->stats.discard_bytes_ok += nbytes;
-+    }
-+}
-+
- static coroutine_fn int
- raw_do_pdiscard(BlockDriverState *bs, int64_t offset, int bytes, bool blkdev)
- {
-     BDRVRawState *s = bs->opaque;
-     RawPosixAIOData acb;
-+    int ret;
-     acb = (RawPosixAIOData) {
-         .bs             = bs,
-@@ -XXX,XX +XXX,XX @@ raw_do_pdiscard(BlockDriverState *bs, int64_t offset, int bytes, bool blkdev)
-         acb.aio_type |= QEMU_AIO_BLKDEV;
-     }
--    return raw_thread_pool_submit(bs, handle_aiocb_discard, &acb);
-+    ret = raw_thread_pool_submit(bs, handle_aiocb_discard, &acb);
-+    raw_account_discard(s, bytes, ret);
-+    return ret;
- }
- static coroutine_fn int
-@@ -XXX,XX +XXX,XX @@ static int fd_open(BlockDriverState *bs)
- static coroutine_fn int
- hdev_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes)
- {
-+    BDRVRawState *s = bs->opaque;
-     int ret;
-     ret = fd_open(bs);
-     if (ret < 0) {
-+        raw_account_discard(s, bytes, ret);
-         return ret;
-     }
-     return raw_do_pdiscard(bs, offset, bytes, true);
---
-.21.0

-[PULL 25/36] qapi: query-blockstat: add driver specific file-posix stats
+Deleted patch
-From: Anton Nefedov <anton.nefedov@virtuozzo.com>
-A block driver can provide a callback to report driver-specific
-statistics.
-file-posix driver now reports discard statistics
-Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Acked-by: Markus Armbruster <armbru@redhat.com>
-Message-id: 20190923121737.83281-10-anton.nefedov@virtuozzo.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- qapi/block-core.json      | 38 ++++++++++++++++++++++++++++++++++++++
- include/block/block.h     |  1 +
- include/block/block_int.h |  1 +
- block.c                   |  9 +++++++++
- block/file-posix.c        | 32 ++++++++++++++++++++++++++++++++
- block/qapi.c              |  5 +++++
-files changed, 86 insertions(+)
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
-+++ b/qapi/block-core.json
-@@ -XXX,XX +XXX,XX @@
-            '*wr_latency_histogram': 'BlockLatencyHistogramInfo',
-            '*flush_latency_histogram': 'BlockLatencyHistogramInfo' } }
-+##
-+# @BlockStatsSpecificFile:
-+#
-+# File driver statistics
-+#
-+# @discard-nb-ok: The number of successful discard operations performed by
-+#                 the driver.
-+#
-+# @discard-nb-failed: The number of failed discard operations performed by
-+#                     the driver.
-+#
-+# @discard-bytes-ok: The number of bytes discarded by the driver.
-+#
-+# Since: 4.2
-+##
-+{ 'struct': 'BlockStatsSpecificFile',
-+  'data': {
-+      'discard-nb-ok': 'uint64',
-+      'discard-nb-failed': 'uint64',
-+      'discard-bytes-ok': 'uint64' } }
-+
-+##
-+# @BlockStatsSpecific:
-+#
-+# Block driver specific statistics
-+#
-+# Since: 4.2
-+##
-+{ 'union': 'BlockStatsSpecific',
-+  'base': { 'driver': 'BlockdevDriver' },
-+  'discriminator': 'driver',
-+  'data': {
-+      'file': 'BlockStatsSpecificFile',
-+      'host_device': 'BlockStatsSpecificFile' } }
-+
- ##
- # @BlockStats:
- #
-@@ -XXX,XX +XXX,XX @@
- #
- # @stats:  A @BlockDeviceStats for the device.
- #
-+# @driver-specific: Optional driver-specific stats. (Since 4.2)
-+#
- # @parent: This describes the file block device if it has one.
- #          Contains recursively the statistics of the underlying
- #          protocol (e.g. the host file for a qcow2 image). If there is
-@@ -XXX,XX +XXX,XX @@
- { 'struct': 'BlockStats',
-   'data': {'*device': 'str', '*qdev': 'str', '*node-name': 'str',
-            'stats': 'BlockDeviceStats',
-+           '*driver-specific': 'BlockStatsSpecific',
-            '*parent': 'BlockStats',
-            '*backing': 'BlockStats'} }
-diff --git a/include/block/block.h b/include/block/block.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/block.h
-+++ b/include/block/block.h
-@@ -XXX,XX +XXX,XX @@ int bdrv_get_flags(BlockDriverState *bs);
- int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
- ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs,
-                                           Error **errp);
-+BlockStatsSpecific *bdrv_get_specific_stats(BlockDriverState *bs);
- void bdrv_round_to_clusters(BlockDriverState *bs,
-                             int64_t offset, int64_t bytes,
-                             int64_t *cluster_offset,
-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 @@ struct BlockDriver {
-     int (*bdrv_get_info)(BlockDriverState *bs, BlockDriverInfo *bdi);
-     ImageInfoSpecific *(*bdrv_get_specific_info)(BlockDriverState *bs,
-                                                  Error **errp);
-+    BlockStatsSpecific *(*bdrv_get_specific_stats)(BlockDriverState *bs);
-     int coroutine_fn (*bdrv_save_vmstate)(BlockDriverState *bs,
-                                           QEMUIOVector *qiov,
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs,
-     return NULL;
- }
-+BlockStatsSpecific *bdrv_get_specific_stats(BlockDriverState *bs)
-+{
-+    BlockDriver *drv = bs->drv;
-+    if (!drv || !drv->bdrv_get_specific_stats) {
-+        return NULL;
-+    }
-+    return drv->bdrv_get_specific_stats(bs);
-+}
-+
- void bdrv_debug_event(BlockDriverState *bs, BlkdebugEvent event)
- {
-     if (!bs || !bs->drv || !bs->drv->bdrv_debug_event) {
-diff --git a/block/file-posix.c b/block/file-posix.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
-+++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ static int raw_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
-     return 0;
- }
-+static BlockStatsSpecificFile get_blockstats_specific_file(BlockDriverState *bs)
-+{
-+    BDRVRawState *s = bs->opaque;
-+    return (BlockStatsSpecificFile) {
-+        .discard_nb_ok = s->stats.discard_nb_ok,
-+        .discard_nb_failed = s->stats.discard_nb_failed,
-+        .discard_bytes_ok = s->stats.discard_bytes_ok,
-+    };
-+}
-+
-+static BlockStatsSpecific *raw_get_specific_stats(BlockDriverState *bs)
-+{
-+    BlockStatsSpecific *stats = g_new(BlockStatsSpecific, 1);
-+
-+    stats->driver = BLOCKDEV_DRIVER_FILE;
-+    stats->u.file = get_blockstats_specific_file(bs);
-+
-+    return stats;
-+}
-+
-+static BlockStatsSpecific *hdev_get_specific_stats(BlockDriverState *bs)
-+{
-+    BlockStatsSpecific *stats = g_new(BlockStatsSpecific, 1);
-+
-+    stats->driver = BLOCKDEV_DRIVER_HOST_DEVICE;
-+    stats->u.host_device = get_blockstats_specific_file(bs);
-+
-+    return stats;
-+}
-+
- static QemuOptsList raw_create_opts = {
-     .name = "raw-create-opts",
-     .head = QTAILQ_HEAD_INITIALIZER(raw_create_opts.head),
-@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_file = {
-     .bdrv_get_info = raw_get_info,
-     .bdrv_get_allocated_file_size
-                         = raw_get_allocated_file_size,
-+    .bdrv_get_specific_stats = raw_get_specific_stats,
-     .bdrv_check_perm = raw_check_perm,
-     .bdrv_set_perm   = raw_set_perm,
-     .bdrv_abort_perm_update = raw_abort_perm_update,
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
-     .bdrv_get_info = raw_get_info,
-     .bdrv_get_allocated_file_size
-                         = raw_get_allocated_file_size,
-+    .bdrv_get_specific_stats = hdev_get_specific_stats,
-     .bdrv_check_perm = raw_check_perm,
-     .bdrv_set_perm   = raw_set_perm,
-     .bdrv_abort_perm_update = raw_abort_perm_update,
-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 @@ static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs,
-     s->stats->wr_highest_offset = stat64_get(&bs->wr_highest_offset);
-+    s->driver_specific = bdrv_get_specific_stats(bs);
-+    if (s->driver_specific) {
-+        s->has_driver_specific = true;
-+    }
-+
-     if (bs->file) {
-         s->has_parent = true;
-         s->parent = bdrv_query_bds_stats(bs->file->bs, blk_level);
---
-.21.0

-[PULL 26/36] iotests: Fix 125 for growth_mode = metadata
+Deleted patch
-If we use growth_mode = metadata, it is very much possible that the file
-uses more disk space after we have written something to the added area.
-We did indeed want to test for this case, but unfortunately we evidently
-just copied the code from the "Test creation preallocation" section and
-forgot to replace "$create_mode" by "$growth_mode".
-We never noticed because we only read the first number from qemu-img
-info's "disk size" output -- and that is effectively useless, because
-qemu-img prints a human-readable value (which generally includes a
-decimal point).  That will be fixed in the patch after the next one.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190925183231.11196-2-mreitz@redhat.com
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/125 | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/125
-+++ b/tests/qemu-iotests/125
-@@ -XXX,XX +XXX,XX @@ for GROWTH_SIZE in 16 48 80; do
-                 if [ $file_length_2 -gt $file_length_1 ]; then
-                     echo "ERROR (grow): Image length has grown from $file_length_1 to $file_length_2"
-                 fi
--                if [ $create_mode != metadata ]; then
-+                if [ $growth_mode != metadata ]; then
-                     # The host size should not have grown either
-                     if [ $host_size_2 -gt $host_size_1 ]; then
-                         echo "ERROR (grow): Host size has grown from $host_size_1 to $host_size_2"
---
-.21.0

-[PULL 27/36] iotests: Disable 125 on broken XFS versions
+Deleted patch
-And by that I mean all XFS versions, as far as I can tell.  All details
-are in the comment below.
-We never noticed this problem because we only read the first number from
-qemu-img info's "disk size" output -- and that is effectively useless,
-because qemu-img prints a human-readable value (which generally includes
-a decimal point).  That will be fixed in the next patch.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190925183231.11196-3-mreitz@redhat.com
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/125 | 40 ++++++++++++++++++++++++++++++++++++++++
-file changed, 40 insertions(+)
-diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/125
-+++ b/tests/qemu-iotests/125
-@@ -XXX,XX +XXX,XX @@ if [ -z "$TEST_IMG_FILE" ]; then
-     TEST_IMG_FILE=$TEST_IMG
- fi
-+# Test whether we are running on a broken XFS version.  There is this
-+# bug:
-+
-+# $ rm -f foo
-+# $ touch foo
-+# $ block_size=4096 # Your FS's block size
-+# $ fallocate -o $((block_size / 2)) -l $block_size foo
-+# $ LANG=C xfs_bmap foo | grep hole
-+#         1: [8..15]: hole
-+#
-+# The problem is that the XFS driver rounds down the offset and
-+# rounds up the length to the block size, but independently.  As
-+# such, it only allocates the first block in the example above,
-+# even though it should allocate the first two blocks (because our
-+# request is to fallocate something that touches both the first
-+# two blocks).
-+#
-+# This means that when you then write to the beginning of the
-+# second block, the disk usage of the first two blocks grows.
-+#
-+# That is precisely what fallocate() promises, though: That when you
-+# write to an area that you have fallocated, no new blocks will have
-+# to be allocated.
-+
-+touch "$TEST_IMG_FILE"
-+# Assuming there is no FS with a block size greater than 64k
-+fallocate -o 65535 -l 2 "$TEST_IMG_FILE"
-+len0=$(get_image_size_on_host)
-+
-+# Write to something that in theory we have just fallocated
-+# (Thus, the on-disk size should not increase)
-+poke_file "$TEST_IMG_FILE" 65536 42
-+len1=$(get_image_size_on_host)
-+
-+if [ $len1 -gt $len0 ]; then
-+    _notrun "the test filesystem's fallocate() is broken"
-+fi
-+
-+rm -f "$TEST_IMG_FILE"
-+
- # Generally, we create some image with or without existing preallocation and
- # then resize it. Then we write some data into the image and verify that its
- # size does not change if we have used preallocation.
---
-.21.0

-[PULL 28/36] iotests: Use stat -c %b in 125
+Deleted patch
-should not use qemu-img to get the on-disk image size, because that
-reports it in a human-readable format that is useless to us.  Just use
-stat instead (like we do to get the image file length).
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190925183231.11196-4-mreitz@redhat.com
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/125 | 3 +--
-file changed, 1 insertion(+), 2 deletions(-)
-diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/125
-+++ b/tests/qemu-iotests/125
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- get_image_size_on_host()
- {
--    $QEMU_IMG info -f "$IMGFMT" "$TEST_IMG" | grep "disk size" \
--        | sed -e 's/^[^0-9]*\([0-9]\+\).*$/\1/'
-+    echo $(($(stat -c '%b * %B' "$TEST_IMG_FILE")))
- }
- # get standard environment and filters
---
-.21.0

-[PULL 29/36] block/backup: move in-flight requests handling from backup to block-copy
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Move synchronization mechanism to block-copy, to be able to use one
-block-copy instance from backup job and backup-top filter in parallel.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20191001131409.14202-2-vsementsov@virtuozzo.com
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- include/block/block-copy.h |  8 ++++++
- block/backup.c             | 52 --------------------------------------
- block/block-copy.c         | 43 +++++++++++++++++++++++++++++++
-files changed, 51 insertions(+), 52 deletions(-)
-diff --git a/include/block/block-copy.h b/include/block/block-copy.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/block-copy.h
-+++ b/include/block/block-copy.h
-@@ -XXX,XX +XXX,XX @@
- #include "block/block.h"
-+typedef struct BlockCopyInFlightReq {
-+    int64_t start_byte;
-+    int64_t end_byte;
-+    QLIST_ENTRY(BlockCopyInFlightReq) list;
-+    CoQueue wait_queue; /* coroutines blocked on this request */
-+} BlockCopyInFlightReq;
-+
- typedef void (*ProgressBytesCallbackFunc)(int64_t bytes, void *opaque);
- typedef void (*ProgressResetCallbackFunc)(void *opaque);
- typedef struct BlockCopyState {
-@@ -XXX,XX +XXX,XX @@ typedef struct BlockCopyState {
-     bool use_copy_range;
-     int64_t copy_range_size;
-     uint64_t len;
-+    QLIST_HEAD(, BlockCopyInFlightReq) inflight_reqs;
-     BdrvRequestFlags write_flags;
-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 @@
- #define BACKUP_CLUSTER_SIZE_DEFAULT (1 << 16)
--typedef struct CowRequest {
--    int64_t start_byte;
--    int64_t end_byte;
--    QLIST_ENTRY(CowRequest) list;
--    CoQueue wait_queue; /* coroutines blocked on this request */
--} CowRequest;
--
- typedef struct BackupBlockJob {
-     BlockJob common;
-     BlockDriverState *source_bs;
-@@ -XXX,XX +XXX,XX @@ typedef struct BackupBlockJob {
-     uint64_t bytes_read;
-     int64_t cluster_size;
-     NotifierWithReturn before_write;
--    QLIST_HEAD(, CowRequest) inflight_reqs;
-     BlockCopyState *bcs;
- } BackupBlockJob;
- static const BlockJobDriver backup_job_driver;
--/* See if in-flight requests overlap and wait for them to complete */
--static void coroutine_fn wait_for_overlapping_requests(BackupBlockJob *job,
--                                                       int64_t start,
--                                                       int64_t end)
--{
--    CowRequest *req;
--    bool retry;
--
--    do {
--        retry = false;
--        QLIST_FOREACH(req, &job->inflight_reqs, list) {
--            if (end > req->start_byte && start < req->end_byte) {
--                qemu_co_queue_wait(&req->wait_queue, NULL);
--                retry = true;
--                break;
--            }
--        }
--    } while (retry);
--}
--
--/* Keep track of an in-flight request */
--static void cow_request_begin(CowRequest *req, BackupBlockJob *job,
--                              int64_t start, int64_t end)
--{
--    req->start_byte = start;
--    req->end_byte = end;
--    qemu_co_queue_init(&req->wait_queue);
--    QLIST_INSERT_HEAD(&job->inflight_reqs, req, list);
--}
--
--/* Forget about a completed request */
--static void cow_request_end(CowRequest *req)
--{
--    QLIST_REMOVE(req, list);
--    qemu_co_queue_restart_all(&req->wait_queue);
--}
--
- static void backup_progress_bytes_callback(int64_t bytes, void *opaque)
- {
-     BackupBlockJob *s = opaque;
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_cow(BackupBlockJob *job,
-                                       bool *error_is_read,
-                                       bool is_write_notifier)
- {
--    CowRequest cow_request;
-     int ret = 0;
-     int64_t start, end; /* bytes */
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_cow(BackupBlockJob *job,
-     trace_backup_do_cow_enter(job, start, offset, bytes);
--    wait_for_overlapping_requests(job, start, end);
--    cow_request_begin(&cow_request, job, start, end);
--
-     ret = block_copy(job->bcs, start, end - start, error_is_read,
-                      is_write_notifier);
--    cow_request_end(&cow_request);
--
-     trace_backup_do_cow_return(job, offset, bytes, ret);
-     qemu_co_rwlock_unlock(&job->flush_rwlock);
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_run(Job *job, Error **errp)
-     BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);
-     int ret = 0;
--    QLIST_INIT(&s->inflight_reqs);
-     qemu_co_rwlock_init(&s->flush_rwlock);
-     backup_init_copy_bitmap(s);
-diff --git a/block/block-copy.c b/block/block-copy.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/block-copy.c
-+++ b/block/block-copy.c
-@@ -XXX,XX +XXX,XX @@
- #include "block/block-copy.h"
- #include "sysemu/block-backend.h"
-+static void coroutine_fn block_copy_wait_inflight_reqs(BlockCopyState *s,
-+                                                       int64_t start,
-+                                                       int64_t end)
-+{
-+    BlockCopyInFlightReq *req;
-+    bool waited;
-+
-+    do {
-+        waited = false;
-+        QLIST_FOREACH(req, &s->inflight_reqs, list) {
-+            if (end > req->start_byte && start < req->end_byte) {
-+                qemu_co_queue_wait(&req->wait_queue, NULL);
-+                waited = true;
-+                break;
-+            }
-+        }
-+    } while (waited);
-+}
-+
-+static void block_copy_inflight_req_begin(BlockCopyState *s,
-+                                          BlockCopyInFlightReq *req,
-+                                          int64_t start, int64_t end)
-+{
-+    req->start_byte = start;
-+    req->end_byte = end;
-+    qemu_co_queue_init(&req->wait_queue);
-+    QLIST_INSERT_HEAD(&s->inflight_reqs, req, list);
-+}
-+
-+static void coroutine_fn block_copy_inflight_req_end(BlockCopyInFlightReq *req)
-+{
-+    QLIST_REMOVE(req, list);
-+    qemu_co_queue_restart_all(&req->wait_queue);
-+}
-+
- void block_copy_state_free(BlockCopyState *s)
- {
-     if (!s) {
-@@ -XXX,XX +XXX,XX @@ BlockCopyState *block_copy_state_new(
-     s->use_copy_range =
-         !(write_flags & BDRV_REQ_WRITE_COMPRESSED) && s->copy_range_size > 0;
-+    QLIST_INIT(&s->inflight_reqs);
-+
-     /*
-      * We just allow aio context change on our block backends. block_copy() user
-      * (now it's only backup) is responsible for source and target being in same
-@@ -XXX,XX +XXX,XX @@ int coroutine_fn block_copy(BlockCopyState *s,
-     int64_t end = bytes + start; /* bytes */
-     void *bounce_buffer = NULL;
-     int64_t status_bytes;
-+    BlockCopyInFlightReq req;
-     /*
-      * block_copy() user is responsible for keeping source and target in same
-@@ -XXX,XX +XXX,XX @@ int coroutine_fn block_copy(BlockCopyState *s,
-     assert(QEMU_IS_ALIGNED(start, s->cluster_size));
-     assert(QEMU_IS_ALIGNED(end, s->cluster_size));
-+    block_copy_wait_inflight_reqs(s, start, bytes);
-+    block_copy_inflight_req_begin(s, &req, start, end);
-+
-     while (start < end) {
-         int64_t dirty_end;
-@@ -XXX,XX +XXX,XX @@ int coroutine_fn block_copy(BlockCopyState *s,
-         qemu_vfree(bounce_buffer);
-     }
-+    block_copy_inflight_req_end(&req);
-+
-     return ret;
- }
---
-.21.0

-[PULL 30/36] block/backup: move write_flags calculation inside backup_job_create
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-This is logic-less refactoring, which simplifies further patch, as
-we'll need write_flags for backup-top filter creation and backup-top
-should be created before block job creation.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20191001131409.14202-3-vsementsov@virtuozzo.com
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/backup.c | 30 +++++++++++++++---------------
-file changed, 15 insertions(+), 15 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 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
-         goto error;
-     }
--    /* job->len is fixed, so we can't allow resize */
--    job = block_job_create(job_id, &backup_job_driver, txn, bs, 0, BLK_PERM_ALL,
--                           speed, creation_flags, cb, opaque, errp);
--    if (!job) {
--        goto error;
--    }
--
--    job->source_bs = bs;
--    job->on_source_error = on_source_error;
--    job->on_target_error = on_target_error;
--    job->sync_mode = sync_mode;
--    job->sync_bitmap = sync_bitmap;
--    job->bitmap_mode = bitmap_mode;
--
-     /*
-      * If source is in backing chain of target assume that target is going to be
-      * used for "image fleecing", i.e. it should represent a kind of snapshot of
-@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
-     write_flags = (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0) |
-                   (compress ? BDRV_REQ_WRITE_COMPRESSED : 0),
-+    /* job->len is fixed, so we can't allow resize */
-+    job = block_job_create(job_id, &backup_job_driver, txn, bs, 0, BLK_PERM_ALL,
-+                           speed, creation_flags, cb, opaque, errp);
-+    if (!job) {
-+        goto error;
-+    }
-+
-+    job->source_bs = bs;
-+    job->on_source_error = on_source_error;
-+    job->on_target_error = on_target_error;
-+    job->sync_mode = sync_mode;
-+    job->sync_bitmap = sync_bitmap;
-+    job->bitmap_mode = bitmap_mode;
-+
-     job->bcs = block_copy_state_new(bs, target, cluster_size, write_flags,
-                                     backup_progress_bytes_callback,
-                                     backup_progress_reset_callback, job, errp);
-@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
-     }
-     job->cluster_size = cluster_size;
-+    job->len = len;
-     /* Required permissions are already taken by block-copy-state target */
-     block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
-                        &error_abort);
--    job->len = len;
-     return &job->common;
---
-.21.0

-[PULL 31/36] block/block-copy: split block_copy_set_callbacks function
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Split block_copy_set_callbacks out of block_copy_state_new. It's needed
-for further commit: block-copy will use BdrvChildren of backup-top
-filter, so it will be created from backup-top filter creation function.
-But callbacks will still belong to backup job and will be set in
-separate.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20191001131409.14202-4-vsementsov@virtuozzo.com
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- include/block/block-copy.h | 13 +++++++++----
- block/backup.c             |  6 ++++--
- block/block-copy.c         | 24 +++++++++++++++---------
-files changed, 28 insertions(+), 15 deletions(-)
-diff --git a/include/block/block-copy.h b/include/block/block-copy.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/block-copy.h
-+++ b/include/block/block-copy.h
-@@ -XXX,XX +XXX,XX @@ typedef struct BlockCopyState {
-     void *progress_opaque;
- } BlockCopyState;
--BlockCopyState *block_copy_state_new(
--        BlockDriverState *source, BlockDriverState *target,
--        int64_t cluster_size, BdrvRequestFlags write_flags,
-+BlockCopyState *block_copy_state_new(BlockDriverState *source,
-+                                     BlockDriverState *target,
-+                                     int64_t cluster_size,
-+                                     BdrvRequestFlags write_flags,
-+                                     Error **errp);
-+
-+void block_copy_set_callbacks(
-+        BlockCopyState *s,
-         ProgressBytesCallbackFunc progress_bytes_callback,
-         ProgressResetCallbackFunc progress_reset_callback,
--        void *progress_opaque, Error **errp);
-+        void *progress_opaque);
- void block_copy_state_free(BlockCopyState *s);
-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 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
-     job->bitmap_mode = bitmap_mode;
-     job->bcs = block_copy_state_new(bs, target, cluster_size, write_flags,
--                                    backup_progress_bytes_callback,
--                                    backup_progress_reset_callback, job, errp);
-+                                    errp);
-     if (!job->bcs) {
-         goto error;
-     }
-@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
-     job->cluster_size = cluster_size;
-     job->len = len;
-+    block_copy_set_callbacks(job->bcs, backup_progress_bytes_callback,
-+                             backup_progress_reset_callback, job);
-+
-     /* Required permissions are already taken by block-copy-state target */
-     block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
-                        &error_abort);
-diff --git a/block/block-copy.c b/block/block-copy.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/block-copy.c
-+++ b/block/block-copy.c
-@@ -XXX,XX +XXX,XX @@ void block_copy_state_free(BlockCopyState *s)
-     g_free(s);
- }
--BlockCopyState *block_copy_state_new(
--        BlockDriverState *source, BlockDriverState *target,
--        int64_t cluster_size, BdrvRequestFlags write_flags,
--        ProgressBytesCallbackFunc progress_bytes_callback,
--        ProgressResetCallbackFunc progress_reset_callback,
--        void *progress_opaque, Error **errp)
-+BlockCopyState *block_copy_state_new(BlockDriverState *source,
-+                                     BlockDriverState *target,
-+                                     int64_t cluster_size,
-+                                     BdrvRequestFlags write_flags, Error **errp)
- {
-     BlockCopyState *s;
-     int ret;
-@@ -XXX,XX +XXX,XX @@ BlockCopyState *block_copy_state_new(
-         .cluster_size = cluster_size,
-         .len = bdrv_dirty_bitmap_size(copy_bitmap),
-         .write_flags = write_flags,
--        .progress_bytes_callback = progress_bytes_callback,
--        .progress_reset_callback = progress_reset_callback,
--        .progress_opaque = progress_opaque,
-     };
-     s->copy_range_size = QEMU_ALIGN_DOWN(MIN(blk_get_max_transfer(s->source),
-@@ -XXX,XX +XXX,XX @@ fail:
-     return NULL;
- }
-+void block_copy_set_callbacks(
-+        BlockCopyState *s,
-+        ProgressBytesCallbackFunc progress_bytes_callback,
-+        ProgressResetCallbackFunc progress_reset_callback,
-+        void *progress_opaque)
-+{
-+    s->progress_bytes_callback = progress_bytes_callback;
-+    s->progress_reset_callback = progress_reset_callback;
-+    s->progress_opaque = progress_opaque;
-+}
-+
- /*
-  * Copy range to target with a bounce buffer and return the bytes copied. If
-  * error occurred, return a negative error number
---
-.21.0

-[PULL 32/36] block: introduce backup-top filter driver
+Deleted patch
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Backup-top filter caches write operations and does copy-before-write
-operations.
-The driver will be used in backup instead of write-notifiers.
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Message-id: 20191001131409.14202-5-vsementsov@virtuozzo.com
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/Makefile.objs |   1 +
- block/backup-top.h  |  41 +++++++
- block/backup-top.c  | 281 ++++++++++++++++++++++++++++++++++++++++++++
-files changed, 323 insertions(+)
- create mode 100644 block/backup-top.h
- create mode 100644 block/backup-top.c
-diff --git a/block/Makefile.objs b/block/Makefile.objs
-index XXXXXXX..XXXXXXX 100644
---- a/block/Makefile.objs
-+++ b/block/Makefile.objs
-@@ -XXX,XX +XXX,XX @@ block-obj-y += block-copy.o
- block-obj-y += crypto.o
- block-obj-y += aio_task.o
-+block-obj-y += backup-top.o
- common-obj-y += stream.o
-diff --git a/block/backup-top.h b/block/backup-top.h
-new file mode 100644
-index XXXXXXX..XXXXXXX
---- /dev/null
-+++ b/block/backup-top.h
-@@ -XXX,XX +XXX,XX @@
-+/*
-+ * backup-top filter driver
-+ *
-+ * The driver performs Copy-Before-Write (CBW) operation: it is injected above
-+ * some node, and before each write it copies _old_ data to the target node.
-+ *
-+ * Copyright (c) 2018-2019 Virtuozzo International GmbH.
-+ *
-+ * Author:
-+ *  Sementsov-Ogievskiy Vladimir <vsementsov@virtuozzo.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/>.
-+ */
-+
-+#ifndef BACKUP_TOP_H
-+#define BACKUP_TOP_H
-+
-+#include "block/block_int.h"
-+#include "block/block-copy.h"
-+
-+BlockDriverState *bdrv_backup_top_append(BlockDriverState *source,
-+                                         BlockDriverState *target,
-+                                         const char *filter_node_name,
-+                                         uint64_t cluster_size,
-+                                         BdrvRequestFlags write_flags,
-+                                         BlockCopyState **bcs,
-+                                         Error **errp);
-+void bdrv_backup_top_drop(BlockDriverState *bs);
-+
-+#endif /* BACKUP_TOP_H */
-diff --git a/block/backup-top.c b/block/backup-top.c
-new file mode 100644
-index XXXXXXX..XXXXXXX
---- /dev/null
-+++ b/block/backup-top.c
-@@ -XXX,XX +XXX,XX @@
-+/*
-+ * backup-top filter driver
-+ *
-+ * The driver performs Copy-Before-Write (CBW) operation: it is injected above
-+ * some node, and before each write it copies _old_ data to the target node.
-+ *
-+ * Copyright (c) 2018-2019 Virtuozzo International GmbH.
-+ *
-+ * Author:
-+ *  Sementsov-Ogievskiy Vladimir <vsementsov@virtuozzo.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/>.
-+ */
-+
-+#include "qemu/osdep.h"
-+
-+#include "sysemu/block-backend.h"
-+#include "qemu/cutils.h"
-+#include "qapi/error.h"
-+#include "block/block_int.h"
-+#include "block/qdict.h"
-+#include "block/block-copy.h"
-+
-+#include "block/backup-top.h"
-+
-+typedef struct BDRVBackupTopState {
-+    BlockCopyState *bcs;
-+    BdrvChild *target;
-+    bool active;
-+} BDRVBackupTopState;
-+
-+static coroutine_fn int backup_top_co_preadv(
-+        BlockDriverState *bs, uint64_t offset, uint64_t bytes,
-+        QEMUIOVector *qiov, int flags)
-+{
-+    return bdrv_co_preadv(bs->backing, offset, bytes, qiov, flags);
-+}
-+
-+static coroutine_fn int backup_top_cbw(BlockDriverState *bs, uint64_t offset,
-+                                       uint64_t bytes)
-+{
-+    /*
-+     * Here we'd like to use block_copy(), but block-copy need to be moved to
-+     * use BdrvChildren to correctly use it in backup-top filter. It's a TODO.
-+     */
-+
-+    abort();
-+}
-+
-+static int coroutine_fn backup_top_co_pdiscard(BlockDriverState *bs,
-+                                               int64_t offset, int bytes)
-+{
-+    int ret = backup_top_cbw(bs, offset, bytes);
-+    if (ret < 0) {
-+        return ret;
-+    }
-+
-+    return bdrv_co_pdiscard(bs->backing, offset, bytes);
-+}
-+
-+static int coroutine_fn backup_top_co_pwrite_zeroes(BlockDriverState *bs,
-+        int64_t offset, int bytes, BdrvRequestFlags flags)
-+{
-+    int ret = backup_top_cbw(bs, offset, bytes);
-+    if (ret < 0) {
-+        return ret;
-+    }
-+
-+    return bdrv_co_pwrite_zeroes(bs->backing, offset, bytes, flags);
-+}
-+
-+static coroutine_fn int backup_top_co_pwritev(BlockDriverState *bs,
-+                                              uint64_t offset,
-+                                              uint64_t bytes,
-+                                              QEMUIOVector *qiov, int flags)
-+{
-+    if (!(flags & BDRV_REQ_WRITE_UNCHANGED)) {
-+        int ret = backup_top_cbw(bs, offset, bytes);
-+        if (ret < 0) {
-+            return ret;
-+        }
-+    }
-+
-+    return bdrv_co_pwritev(bs->backing, offset, bytes, qiov, flags);
-+}
-+
-+static int coroutine_fn backup_top_co_flush(BlockDriverState *bs)
-+{
-+    if (!bs->backing) {
-+        return 0;
-+    }
-+
-+    return bdrv_co_flush(bs->backing->bs);
-+}
-+
-+static void backup_top_refresh_filename(BlockDriverState *bs)
-+{
-+    if (bs->backing == NULL) {
-+        /*
-+         * we can be here after failed bdrv_attach_child in
-+         * bdrv_set_backing_hd
-+         */
-+        return;
-+    }
-+    pstrcpy(bs->exact_filename, sizeof(bs->exact_filename),
-+            bs->backing->bs->filename);
-+}
-+
-+static void backup_top_child_perm(BlockDriverState *bs, BdrvChild *c,
-+                                  const BdrvChildRole *role,
-+                                  BlockReopenQueue *reopen_queue,
-+                                  uint64_t perm, uint64_t shared,
-+                                  uint64_t *nperm, uint64_t *nshared)
-+{
-+    BDRVBackupTopState *s = bs->opaque;
-+
-+    if (!s->active) {
-+        /*
-+         * The filter node may be in process of bdrv_append(), which firstly do
-+         * bdrv_set_backing_hd() and then bdrv_replace_node(). This means that
-+         * we can't unshare BLK_PERM_WRITE during bdrv_append() operation. So,
-+         * let's require nothing during bdrv_append() and refresh permissions
-+         * after it (see bdrv_backup_top_append()).
-+         */
-+        *nperm = 0;
-+        *nshared = BLK_PERM_ALL;
-+        return;
-+    }
-+
-+    if (role == &child_file) {
-+        /*
-+         * Target child
-+         *
-+         * Share write to target (child_file), to not interfere
-+         * with guest writes to its disk which may be in target backing chain.
-+         */
-+        *nshared = BLK_PERM_ALL;
-+        *nperm = BLK_PERM_WRITE;
-+    } else {
-+        /* Source child */
-+        bdrv_filter_default_perms(bs, c, role, reopen_queue, perm, shared,
-+                                  nperm, nshared);
-+
-+        if (perm & BLK_PERM_WRITE) {
-+            *nperm = *nperm | BLK_PERM_CONSISTENT_READ;
-+        }
-+        *nshared &= ~BLK_PERM_WRITE;
-+    }
-+}
-+
-+BlockDriver bdrv_backup_top_filter = {
-+    .format_name = "backup-top",
-+    .instance_size = sizeof(BDRVBackupTopState),
-+
-+    .bdrv_co_preadv             = backup_top_co_preadv,
-+    .bdrv_co_pwritev            = backup_top_co_pwritev,
-+    .bdrv_co_pwrite_zeroes      = backup_top_co_pwrite_zeroes,
-+    .bdrv_co_pdiscard           = backup_top_co_pdiscard,
-+    .bdrv_co_flush              = backup_top_co_flush,
-+
-+    .bdrv_co_block_status       = bdrv_co_block_status_from_backing,
-+
-+    .bdrv_refresh_filename      = backup_top_refresh_filename,
-+
-+    .bdrv_child_perm            = backup_top_child_perm,
-+
-+    .is_filter = true,
-+};
-+
-+BlockDriverState *bdrv_backup_top_append(BlockDriverState *source,
-+                                         BlockDriverState *target,
-+                                         const char *filter_node_name,
-+                                         uint64_t cluster_size,
-+                                         BdrvRequestFlags write_flags,
-+                                         BlockCopyState **bcs,
-+                                         Error **errp)
-+{
-+    Error *local_err = NULL;
-+    BDRVBackupTopState *state;
-+    BlockDriverState *top = bdrv_new_open_driver(&bdrv_backup_top_filter,
-+                                                 filter_node_name,
-+                                                 BDRV_O_RDWR, errp);
-+
-+    if (!top) {
-+        return NULL;
-+    }
-+
-+    top->total_sectors = source->total_sectors;
-+    top->opaque = state = g_new0(BDRVBackupTopState, 1);
-+
-+    bdrv_ref(target);
-+    state->target = bdrv_attach_child(top, target, "target", &child_file, errp);
-+    if (!state->target) {
-+        bdrv_unref(target);
-+        bdrv_unref(top);
-+        return NULL;
-+    }
-+
-+    bdrv_drained_begin(source);
-+
-+    bdrv_ref(top);
-+    bdrv_append(top, source, &local_err);
-+    if (local_err) {
-+        error_prepend(&local_err, "Cannot append backup-top filter: ");
-+        goto append_failed;
-+    }
-+
-+    /*
-+     * bdrv_append() finished successfully, now we can require permissions
-+     * we want.
-+     */
-+    state->active = true;
-+    bdrv_child_refresh_perms(top, top->backing, &local_err);
-+    if (local_err) {
-+        error_prepend(&local_err,
-+                      "Cannot set permissions for backup-top filter: ");
-+        goto failed_after_append;
-+    }
-+
-+    /*
-+     * TODO: Create block-copy-state here (which will utilize @cluster_size and
-+     * @write_flags parameters which are unused now). For this, block-copy
-+     * should be refactored to use BdrvChildren.
-+     */
-+    state->bcs = NULL;
-+    if (!state->bcs) {
-+        error_setg(&local_err, "Cannot create block-copy-state");
-+        goto failed_after_append;
-+    }
-+    *bcs = state->bcs;
-+
-+    bdrv_drained_end(source);
-+
-+    return top;
-+
-+failed_after_append:
-+    state->active = false;
-+    bdrv_backup_top_drop(top);
-+
-+append_failed:
-+    bdrv_drained_end(source);
-+    bdrv_unref_child(top, state->target);
-+    bdrv_unref(top);
-+    error_propagate(errp, local_err);
-+
-+    return NULL;
-+}
-+
-+void bdrv_backup_top_drop(BlockDriverState *bs)
-+{
-+    BDRVBackupTopState *s = bs->opaque;
-+    AioContext *aio_context = bdrv_get_aio_context(bs);
-+
-+    block_copy_state_free(s->bcs);
-+
-+    aio_context_acquire(aio_context);
-+
-+    bdrv_drained_begin(bs);
-+
-+    s->active = false;
-+    bdrv_child_refresh_perms(bs, bs->backing, &error_abort);
-+    bdrv_replace_node(bs, backing_bs(bs), &error_abort);
-+    bdrv_set_backing_hd(bs, NULL, &error_abort);
-+
-+    bdrv_drained_end(bs);
-+
-+    bdrv_unref(bs);
-+
-+    aio_context_release(aio_context);
-+}
---
-.21.0

-[PULL 33/36] block/backup: use backup-top instead of write notifiers
+[PULL 1/2] block: fix crash on zero-length unaligned write and read
 From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Drop write notifiers and use filter node instead.
+Commit 7a3f542fbd "block/io: refactor padding" occasionally dropped
 aligning for zero-length request: bdrv_init_padding() blindly return
 false if bytes == 0, like there is nothing to align.
-= Changes =
+This leads the following command to crash:
-. Add filter-node-name argument for backup qmp api. We have to do it
+./qemu-io --image-opts -c 'write 1 0' \
-in this commit, as 257 needs to be fixed.
+  driver=blkdebug,align=512,image.driver=null-co,image.size=512
-. There are no more write notifiers here, so is_write_notifier
+>> qemu-io: block/io.c:1955: bdrv_aligned_pwritev: Assertion
-parameter is dropped from block-copy paths.
+    `(offset & (align - 1)) == 0' failed.
 >> Aborted (core dumped)
-. To sync with in-flight requests at job finish we now have drained
+Prior to 7a3f542fbd we does aligning of such zero requests. Instead of
-removing of the filter, we don't need rw-lock.
+recovering this behavior let's just do nothing on such requests as it
 is useless.
-. Block-copy is now using BdrvChildren instead of BlockBackends
+Note that driver may have special meaning of zero-length reqeusts, like
 qcow2_co_pwritev_compressed_part, so we can't skip any zero-length
 operation. But for unaligned ones, we can't pass it to driver anyway.
-. As backup-top owns these children, we also move block-copy state
+This commit also fixes crash in iotest 80 running with -nocache:
 into backup-top's ownership.
-= Iotest changes =
+./check -nocache -qcow2 80
-: op-blocker doesn't shoot now, as we set it on source, but then
+which crashes on same assertion due to trying to read empty extra data
-check on filter, when trying to start second backup.
+in qcow2_do_read_snapshots().
 To keep the test we instead can catch another collision: both jobs will
 get 'drive0' job-id, as job-id parameter is unspecified. To prevent
 interleaving with file-posix locks (as they are dependent on config)
 let's use another target for second backup.
-Also, it's obvious now that we'd like to drop this op-blocker at all
+Cc: qemu-stable@nongnu.org # v4.2
-and add a test-case for two backups from one node (to different
+Fixes: 7a3f542fbd
-destinations) actually works. But not in these series.
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Reviewed-by: Max Reitz <mreitz@redhat.com>
 Message-id: 20200206164245.17781-1-vsementsov@virtuozzo.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
  block/io.c | 28 +++++++++++++++++++++++++++-
 file changed, 27 insertions(+), 1 deletion(-)
-: Output changed: prepatch, "Node is in use" comes from bdrv_has_blk
+diff --git a/block/io.c b/block/io.c
 check inside qmp_blockdev_del. But we've dropped block-copy blk
 objects, so no more blk objects on source bs (job blk is on backup-top
 filter bs). New message is from op-blocker, which is the next check in
 qmp_blockdev_add.
 : The test wants to emulate guest write during backup. They should
 go to filter node, not to original source node, of course. Therefore we
 need to specify filter node name and use it.
 Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Message-id: 20191001131409.14202-6-vsementsov@virtuozzo.com
 Reviewed-by: Max Reitz <mreitz@redhat.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
  qapi/block-core.json       |   8 +-
  include/block/block-copy.h |  14 +-
  include/block/block_int.h  |   1 +
  block/backup-top.c         |  21 +--
  block/backup.c             |  73 +++------
  block/block-copy.c         |  81 +++-------
  block/replication.c        |   2 +-
  blockdev.c                 |   1 +
  tests/qemu-iotests/056     |   8 +-
  tests/qemu-iotests/141.out |   2 +-
  tests/qemu-iotests/257     |   7 +-
  tests/qemu-iotests/257.out | 306 ++++++++++++++++++-------------------
 files changed, 237 insertions(+), 287 deletions(-)
 diff --git a/qapi/block-core.json b/qapi/block-core.json
 index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
+--- a/block/io.c
-+++ b/qapi/block-core.json
++++ b/block/io.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ static bool bdrv_init_padding(BlockDriverState *bs,
- #                list without user intervention.
+         pad->tail = align - pad->tail;
  #                Defaults to true. (Since 2.12)
  #
 +# @filter-node-name: the node name that should be assigned to the
 +#                    filter driver that the backup job inserts into the graph
 +#                    above node specified by @drive. If this option is not given,
 +#                    a node name is autogenerated. (Since: 4.2)
 +#
  # Note: @on-source-error and @on-target-error only affect background
  # I/O.  If an error occurs during a guest write request, the device's
  # rerror/werror actions will be used.
@@ -XXX,XX +XXX,XX @@
              '*compress': 'bool',
              '*on-source-error': 'BlockdevOnError',
              '*on-target-error': 'BlockdevOnError',
 -            '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
 +            '*auto-finalize': 'bool', '*auto-dismiss': 'bool',
 +            '*filter-node-name': 'str' } }
  ##
  # @DriveBackup:
 diff --git a/include/block/block-copy.h b/include/block/block-copy.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/block/block-copy.h
 +++ b/include/block/block-copy.h
@@ -XXX,XX +XXX,XX @@ typedef struct BlockCopyInFlightReq {
  typedef void (*ProgressBytesCallbackFunc)(int64_t bytes, void *opaque);
  typedef void (*ProgressResetCallbackFunc)(void *opaque);
  typedef struct BlockCopyState {
 -    BlockBackend *source;
 -    BlockBackend *target;
 +    /*
 +     * BdrvChild objects are not owned or managed by block-copy. They are
 +     * provided by block-copy user and user is responsible for appropriate
 +     * permissions on these children.
 +     */
 +    BdrvChild *source;
 +    BdrvChild *target;
      BdrvDirtyBitmap *copy_bitmap;
      int64_t cluster_size;
      bool use_copy_range;
@@ -XXX,XX +XXX,XX @@ typedef struct BlockCopyState {
      void *progress_opaque;
  } BlockCopyState;
 -BlockCopyState *block_copy_state_new(BlockDriverState *source,
 -                                     BlockDriverState *target,
 +BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
                                       int64_t cluster_size,
                                       BdrvRequestFlags write_flags,
                                       Error **errp);
@@ -XXX,XX +XXX,XX @@ int64_t block_copy_reset_unallocated(BlockCopyState *s,
                                       int64_t offset, int64_t *count);
  int coroutine_fn block_copy(BlockCopyState *s, int64_t start, uint64_t bytes,
 -                            bool *error_is_read, bool is_write_notifier);
 +                            bool *error_is_read);
  #endif /* BLOCK_COPY_H */
 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 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
                              BdrvDirtyBitmap *sync_bitmap,
                              BitmapSyncMode bitmap_mode,
                              bool compress,
 +                            const char *filter_node_name,
                              BlockdevOnError on_source_error,
                              BlockdevOnError on_target_error,
                              int creation_flags,
 diff --git a/block/backup-top.c b/block/backup-top.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/backup-top.c
 +++ b/block/backup-top.c
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int backup_top_co_preadv(
  static coroutine_fn int backup_top_cbw(BlockDriverState *bs, uint64_t offset,
                                         uint64_t bytes)
  {
 -    /*
 -     * Here we'd like to use block_copy(), but block-copy need to be moved to
 -     * use BdrvChildren to correctly use it in backup-top filter. It's a TODO.
 -     */
 +    BDRVBackupTopState *s = bs->opaque;
 +    uint64_t end = QEMU_ALIGN_UP(offset + bytes, s->bcs->cluster_size);
 +    uint64_t off = QEMU_ALIGN_DOWN(offset, s->bcs->cluster_size);
 -    abort();
 +    return block_copy(s->bcs, off, end - off, NULL);
  }
  static int coroutine_fn backup_top_co_pdiscard(BlockDriverState *bs,
@@ -XXX,XX +XXX,XX @@ BlockDriverState *bdrv_backup_top_append(BlockDriverState *source,
          goto failed_after_append;
      }
--    /*
+-    if ((!pad->head && !pad->tail) || !bytes) {
--     * TODO: Create block-copy-state here (which will utilize @cluster_size and
++    if (!pad->head && !pad->tail) {
--     * @write_flags parameters which are unused now). For this, block-copy
+         return false;
 -     * should be refactored to use BdrvChildren.
 -     */
 -    state->bcs = NULL;
 -    if (!state->bcs) {
 -        error_setg(&local_err, "Cannot create block-copy-state");
 +    state->bcs = block_copy_state_new(top->backing, state->target,
 +                                      cluster_size, write_flags, &local_err);
 +    if (local_err) {
 +        error_prepend(&local_err, "Cannot create block-copy-state: ");
          goto failed_after_append;
      }
-     *bcs = state->bcs;
-diff --git a/block/backup.c b/block/backup.c
++    assert(bytes); /* Nothing good in aligning zero-length requests */
 index XXXXXXX..XXXXXXX 100644
 --- a/block/backup.c
 +++ b/block/backup.c
@@ -XXX,XX +XXX,XX @@
   * QEMU backup
   *
   * Copyright (C) 2013 Proxmox Server Solutions
 + * Copyright (c) 2019 Virtuozzo International GmbH.
   *
   * Authors:
   *  Dietmar Maurer (dietmar@proxmox.com)
@@ -XXX,XX +XXX,XX @@
  #include "qemu/bitmap.h"
  #include "qemu/error-report.h"
 +#include "block/backup-top.h"
 +
- #define BACKUP_CLUSTER_SIZE_DEFAULT (1 << 16)
+     sum = pad->head + bytes + pad->tail;
+     pad->buf_len = (sum > align && pad->head && pad->tail) ? 2 * align : align;
- typedef struct BackupBlockJob {
+     pad->buf = qemu_blockalign(bs, pad->buf_len);
-     BlockJob common;
+@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_preadv_part(BdrvChild *child,
-+    BlockDriverState *backup_top;
+         return ret;
      BlockDriverState *source_bs;
      BdrvDirtyBitmap *sync_bitmap;
@@ -XXX,XX +XXX,XX @@ typedef struct BackupBlockJob {
      BitmapSyncMode bitmap_mode;
      BlockdevOnError on_source_error;
      BlockdevOnError on_target_error;
 -    CoRwlock flush_rwlock;
      uint64_t len;
      uint64_t bytes_read;
      int64_t cluster_size;
 -    NotifierWithReturn before_write;
      BlockCopyState *bcs;
  } BackupBlockJob;
@@ -XXX,XX +XXX,XX @@ static void backup_progress_reset_callback(void *opaque)
  static int coroutine_fn backup_do_cow(BackupBlockJob *job,
                                        int64_t offset, uint64_t bytes,
 -                                      bool *error_is_read,
 -                                      bool is_write_notifier)
 +                                      bool *error_is_read)
  {
      int ret = 0;
      int64_t start, end; /* bytes */
 -    qemu_co_rwlock_rdlock(&job->flush_rwlock);
 -
      start = QEMU_ALIGN_DOWN(offset, job->cluster_size);
      end = QEMU_ALIGN_UP(bytes + offset, job->cluster_size);
      trace_backup_do_cow_enter(job, start, offset, bytes);
 -    ret = block_copy(job->bcs, start, end - start, error_is_read,
 -                     is_write_notifier);
 +    ret = block_copy(job->bcs, start, end - start, error_is_read);
      trace_backup_do_cow_return(job, offset, bytes, ret);
 -    qemu_co_rwlock_unlock(&job->flush_rwlock);
 -
      return ret;
  }
 -static int coroutine_fn backup_before_write_notify(
 -        NotifierWithReturn *notifier,
 -        void *opaque)
 -{
 -    BackupBlockJob *job = container_of(notifier, BackupBlockJob, before_write);
 -    BdrvTrackedRequest *req = opaque;
 -
 -    assert(req->bs == job->source_bs);
 -    assert(QEMU_IS_ALIGNED(req->offset, BDRV_SECTOR_SIZE));
 -    assert(QEMU_IS_ALIGNED(req->bytes, BDRV_SECTOR_SIZE));
 -
 -    return backup_do_cow(job, req->offset, req->bytes, NULL, true);
 -}
 -
  static void backup_cleanup_sync_bitmap(BackupBlockJob *job, int ret)
  {
      BdrvDirtyBitmap *bm;
@@ -XXX,XX +XXX,XX @@ static void backup_clean(Job *job)
  {
      BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);
 -    block_copy_state_free(s->bcs);
 +    bdrv_backup_top_drop(s->backup_top);
  }
  void backup_do_checkpoint(BlockJob *job, Error **errp)
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_loop(BackupBlockJob *job)
              if (yield_and_check(job)) {
                  goto out;
              }
 -            ret = backup_do_cow(job, offset,
 -                                job->cluster_size, &error_is_read, false);
 +            ret = backup_do_cow(job, offset, job->cluster_size, &error_is_read);
              if (ret < 0 && backup_error_action(job, error_is_read, -ret) ==
                             BLOCK_ERROR_ACTION_REPORT)
              {
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_run(Job *job, Error **errp)
      BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);
      int ret = 0;
 -    qemu_co_rwlock_init(&s->flush_rwlock);
 -
      backup_init_copy_bitmap(s);
 -    s->before_write.notify = backup_before_write_notify;
 -    bdrv_add_before_write_notifier(s->source_bs, &s->before_write);
 -
      if (s->sync_mode == MIRROR_SYNC_MODE_TOP) {
          int64_t offset = 0;
          int64_t count;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_run(Job *job, Error **errp)
      }
-  out:
++    if (bytes == 0 && !QEMU_IS_ALIGNED(offset, bs->bl.request_alignment)) {
--    notifier_with_return_remove(&s->before_write);
++        /*
--
++         * Aligning zero request is nonsense. Even if driver has special meaning
--    /* wait until pending backup_do_cow() calls have completed */
++         * of zero-length (like qcow2_co_pwritev_compressed_part), we can't pass
--    qemu_co_rwlock_wrlock(&s->flush_rwlock);
++         * it to driver due to request_alignment.
--    qemu_co_rwlock_unlock(&s->flush_rwlock);
++         *
--
++         * Still, no reason to return an error if someone do unaligned
-     return ret;
++         * zero-length read occasionally.
- }
++         */
++        return 0;
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
                    MirrorSyncMode sync_mode, BdrvDirtyBitmap *sync_bitmap,
                    BitmapSyncMode bitmap_mode,
                    bool compress,
 +                  const char *filter_node_name,
                    BlockdevOnError on_source_error,
                    BlockdevOnError on_target_error,
                    int creation_flags,
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
      BackupBlockJob *job = NULL;
      int64_t cluster_size;
      BdrvRequestFlags write_flags;
 +    BlockDriverState *backup_top = NULL;
 +    BlockCopyState *bcs = NULL;
      assert(bs);
      assert(target);
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
      write_flags = (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0) |
                    (compress ? BDRV_REQ_WRITE_COMPRESSED : 0),
 +    backup_top = bdrv_backup_top_append(bs, target, filter_node_name,
 +                                        cluster_size, write_flags, &bcs, errp);
 +    if (!backup_top) {
 +        goto error;
 +    }
 +
-     /* job->len is fixed, so we can't allow resize */
+     bdrv_inc_in_flight(bs);
--    job = block_job_create(job_id, &backup_job_driver, txn, bs, 0, BLK_PERM_ALL,
-+    job = block_job_create(job_id, &backup_job_driver, txn, backup_top,
+     /* Don't do copy-on-read if we read data before write operation */
-+                           0, BLK_PERM_ALL,
+@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child,
-                            speed, creation_flags, cb, opaque, errp);
+         return -ENOTSUP;
      if (!job) {
          goto error;
      }
-+    job->backup_top = backup_top;
++    if (bytes == 0 && !QEMU_IS_ALIGNED(offset, bs->bl.request_alignment)) {
-     job->source_bs = bs;
++        /*
-     job->on_source_error = on_source_error;
++         * Aligning zero request is nonsense. Even if driver has special meaning
-     job->on_target_error = on_target_error;
++         * of zero-length (like qcow2_co_pwritev_compressed_part), we can't pass
-     job->sync_mode = sync_mode;
++         * it to driver due to request_alignment.
-     job->sync_bitmap = sync_bitmap;
++         *
-     job->bitmap_mode = bitmap_mode;
++         * Still, no reason to return an error if someone do unaligned
--
++         * zero-length write occasionally.
--    job->bcs = block_copy_state_new(bs, target, cluster_size, write_flags,
++         */
--                                    errp);
++        return 0;
--    if (!job->bcs) {
++    }
--        goto error;
++
--    }
+     bdrv_inc_in_flight(bs);
 -
 +    job->bcs = bcs;
      job->cluster_size = cluster_size;
      job->len = len;
 -    block_copy_set_callbacks(job->bcs, backup_progress_bytes_callback,
 +    block_copy_set_callbacks(bcs, backup_progress_bytes_callback,
                               backup_progress_reset_callback, job);
 -    /* Required permissions are already taken by block-copy-state target */
 +    /* Required permissions are already taken by backup-top target */
      block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
                         &error_abort);
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
      if (job) {
          backup_clean(&job->common.job);
          job_early_fail(&job->common.job);
 +    } else if (backup_top) {
 +        bdrv_backup_top_drop(backup_top);
      }
      return NULL;
 diff --git a/block/block-copy.c b/block/block-copy.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/block-copy.c
 +++ b/block/block-copy.c
@@ -XXX,XX +XXX,XX @@ void block_copy_state_free(BlockCopyState *s)
          return;
      }
 -    bdrv_release_dirty_bitmap(blk_bs(s->source), s->copy_bitmap);
 -    blk_unref(s->source);
 -    blk_unref(s->target);
 +    bdrv_release_dirty_bitmap(s->source->bs, s->copy_bitmap);
      g_free(s);
  }
 -BlockCopyState *block_copy_state_new(BlockDriverState *source,
 -                                     BlockDriverState *target,
 +BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
                                       int64_t cluster_size,
                                       BdrvRequestFlags write_flags, Error **errp)
  {
      BlockCopyState *s;
 -    int ret;
 -    uint64_t no_resize = BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE |
 -                         BLK_PERM_WRITE_UNCHANGED | BLK_PERM_GRAPH_MOD;
      BdrvDirtyBitmap *copy_bitmap;
 +    uint32_t max_transfer =
 +            MIN_NON_ZERO(INT_MAX, MIN_NON_ZERO(source->bs->bl.max_transfer,
 +                                               target->bs->bl.max_transfer));
 -    copy_bitmap = bdrv_create_dirty_bitmap(source, cluster_size, NULL, errp);
 +    copy_bitmap = bdrv_create_dirty_bitmap(source->bs, cluster_size, NULL,
 +                                           errp);
      if (!copy_bitmap) {
          return NULL;
      }
@@ -XXX,XX +XXX,XX @@ BlockCopyState *block_copy_state_new(BlockDriverState *source,
      s = g_new(BlockCopyState, 1);
      *s = (BlockCopyState) {
 -        .source = blk_new(bdrv_get_aio_context(source),
 -                          BLK_PERM_CONSISTENT_READ, no_resize),
 -        .target = blk_new(bdrv_get_aio_context(target),
 -                          BLK_PERM_WRITE, no_resize),
 +        .source = source,
 +        .target = target,
          .copy_bitmap = copy_bitmap,
          .cluster_size = cluster_size,
          .len = bdrv_dirty_bitmap_size(copy_bitmap),
          .write_flags = write_flags,
      };
 -    s->copy_range_size = QEMU_ALIGN_DOWN(MIN(blk_get_max_transfer(s->source),
 -                                             blk_get_max_transfer(s->target)),
 -                                         s->cluster_size);
 +    s->copy_range_size = QEMU_ALIGN_DOWN(max_transfer, cluster_size),
      /*
-      * Set use_copy_range, consider the following:
+      * Align write if necessary by performing a read-modify-write cycle.
       * 1. Compression is not supported for copy_range.
@@ -XXX,XX +XXX,XX @@ BlockCopyState *block_copy_state_new(BlockDriverState *source,
      QLIST_INIT(&s->inflight_reqs);
 -    /*
 -     * We just allow aio context change on our block backends. block_copy() user
 -     * (now it's only backup) is responsible for source and target being in same
 -     * aio context.
 -     */
 -    blk_set_disable_request_queuing(s->source, true);
 -    blk_set_allow_aio_context_change(s->source, true);
 -    blk_set_disable_request_queuing(s->target, true);
 -    blk_set_allow_aio_context_change(s->target, true);
 -
 -    ret = blk_insert_bs(s->source, source, errp);
 -    if (ret < 0) {
 -        goto fail;
 -    }
 -
 -    ret = blk_insert_bs(s->target, target, errp);
 -    if (ret < 0) {
 -        goto fail;
 -    }
 -
      return s;
 -
 -fail:
 -    block_copy_state_free(s);
 -
 -    return NULL;
  }
  void block_copy_set_callbacks(
@@ -XXX,XX +XXX,XX @@ void block_copy_set_callbacks(
  static int coroutine_fn block_copy_with_bounce_buffer(BlockCopyState *s,
                                                        int64_t start,
                                                        int64_t end,
 -                                                      bool is_write_notifier,
                                                        bool *error_is_read,
                                                        void **bounce_buffer)
  {
      int ret;
      int nbytes;
 -    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
      assert(QEMU_IS_ALIGNED(start, s->cluster_size));
      bdrv_reset_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
      nbytes = MIN(s->cluster_size, s->len - start);
      if (!*bounce_buffer) {
 -        *bounce_buffer = blk_blockalign(s->source, s->cluster_size);
 +        *bounce_buffer = qemu_blockalign(s->source->bs, s->cluster_size);
      }
 -    ret = blk_co_pread(s->source, start, nbytes, *bounce_buffer, read_flags);
 +    ret = bdrv_co_pread(s->source, start, nbytes, *bounce_buffer, 0);
      if (ret < 0) {
          trace_block_copy_with_bounce_buffer_read_fail(s, start, ret);
          if (error_is_read) {
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn block_copy_with_bounce_buffer(BlockCopyState *s,
          goto fail;
      }
 -    ret = blk_co_pwrite(s->target, start, nbytes, *bounce_buffer,
 -                        s->write_flags);
 +    ret = bdrv_co_pwrite(s->target, start, nbytes, *bounce_buffer,
 +                         s->write_flags);
      if (ret < 0) {
          trace_block_copy_with_bounce_buffer_write_fail(s, start, ret);
          if (error_is_read) {
@@ -XXX,XX +XXX,XX @@ fail:
   */
  static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
                                                  int64_t start,
 -                                                int64_t end,
 -                                                bool is_write_notifier)
 +                                                int64_t end)
  {
      int ret;
      int nr_clusters;
      int nbytes;
 -    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
      assert(QEMU_IS_ALIGNED(s->copy_range_size, s->cluster_size));
      assert(QEMU_IS_ALIGNED(start, s->cluster_size));
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
      nr_clusters = DIV_ROUND_UP(nbytes, s->cluster_size);
      bdrv_reset_dirty_bitmap(s->copy_bitmap, start,
                              s->cluster_size * nr_clusters);
 -    ret = blk_co_copy_range(s->source, start, s->target, start, nbytes,
 -                            read_flags, s->write_flags);
 +    ret = bdrv_co_copy_range(s->source, start, s->target, start, nbytes,
 +                             0, s->write_flags);
      if (ret < 0) {
          trace_block_copy_with_offload_fail(s, start, ret);
          bdrv_set_dirty_bitmap(s->copy_bitmap, start,
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
  static int block_copy_is_cluster_allocated(BlockCopyState *s, int64_t offset,
                                             int64_t *pnum)
  {
 -    BlockDriverState *bs = blk_bs(s->source);
 +    BlockDriverState *bs = s->source->bs;
      int64_t count, total_count = 0;
      int64_t bytes = s->len - offset;
      int ret;
@@ -XXX,XX +XXX,XX @@ int64_t block_copy_reset_unallocated(BlockCopyState *s,
  int coroutine_fn block_copy(BlockCopyState *s,
                              int64_t start, uint64_t bytes,
 -                            bool *error_is_read,
 -                            bool is_write_notifier)
 +                            bool *error_is_read)
  {
      int ret = 0;
      int64_t end = bytes + start; /* bytes */
@@ -XXX,XX +XXX,XX @@ int coroutine_fn block_copy(BlockCopyState *s,
       * block_copy() user is responsible for keeping source and target in same
       * aio context
       */
 -    assert(blk_get_aio_context(s->source) == blk_get_aio_context(s->target));
 +    assert(bdrv_get_aio_context(s->source->bs) ==
 +           bdrv_get_aio_context(s->target->bs));
      assert(QEMU_IS_ALIGNED(start, s->cluster_size));
      assert(QEMU_IS_ALIGNED(end, s->cluster_size));
@@ -XXX,XX +XXX,XX @@ int coroutine_fn block_copy(BlockCopyState *s,
          trace_block_copy_process(s, start);
          if (s->use_copy_range) {
 -            ret = block_copy_with_offload(s, start, dirty_end,
 -                                          is_write_notifier);
 +            ret = block_copy_with_offload(s, start, dirty_end);
              if (ret < 0) {
                  s->use_copy_range = false;
              }
          }
          if (!s->use_copy_range) {
              ret = block_copy_with_bounce_buffer(s, start, dirty_end,
 -                                                is_write_notifier,
                                                  error_is_read, &bounce_buffer);
          }
          if (ret < 0) {
 diff --git a/block/replication.c b/block/replication.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/replication.c
 +++ b/block/replication.c
@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
          s->backup_job = backup_job_create(
                                  NULL, s->secondary_disk->bs, s->hidden_disk->bs,
 -                                0, MIRROR_SYNC_MODE_NONE, NULL, 0, false,
 +                                0, MIRROR_SYNC_MODE_NONE, NULL, 0, false, NULL,
                                  BLOCKDEV_ON_ERROR_REPORT,
                                  BLOCKDEV_ON_ERROR_REPORT, JOB_INTERNAL,
                                  backup_job_completed, bs, NULL, &local_err);
 diff --git a/blockdev.c b/blockdev.c
 index XXXXXXX..XXXXXXX 100644
 --- a/blockdev.c
 +++ b/blockdev.c
@@ -XXX,XX +XXX,XX @@ static BlockJob *do_backup_common(BackupCommon *backup,
      job = backup_job_create(backup->job_id, bs, target_bs, backup->speed,
                              backup->sync, bmap, backup->bitmap_mode,
                              backup->compress,
 +                            backup->filter_node_name,
                              backup->on_source_error,
                              backup->on_target_error,
                              job_flags, NULL, NULL, txn, errp);
 diff --git a/tests/qemu-iotests/056 b/tests/qemu-iotests/056
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/056
 +++ b/tests/qemu-iotests/056
@@ -XXX,XX +XXX,XX @@ class BackupTest(iotests.QMPTestCase):
          self.vm = iotests.VM()
          self.test_img = img_create('test')
          self.dest_img = img_create('dest')
 +        self.dest_img2 = img_create('dest2')
          self.ref_img = img_create('ref')
          self.vm.add_drive(self.test_img)
          self.vm.launch()
@@ -XXX,XX +XXX,XX @@ class BackupTest(iotests.QMPTestCase):
          self.vm.shutdown()
          try_remove(self.test_img)
          try_remove(self.dest_img)
 +        try_remove(self.dest_img2)
          try_remove(self.ref_img)
      def hmp_io_writes(self, drive, patterns):
@@ -XXX,XX +XXX,XX @@ class BackupTest(iotests.QMPTestCase):
          res = self.vm.qmp('query-block-jobs')
          self.assert_qmp(res, 'return[0]/status', 'concluded')
          # Leave zombie job un-dismissed, observe a failure:
 -        res = self.qmp_backup_and_wait(serror="Node 'drive0' is busy: block device is in use by block job: backup",
 +        res = self.qmp_backup_and_wait(serror="Job ID 'drive0' already in use",
                                         device='drive0', format=iotests.imgfmt,
 -                                       sync='full', target=self.dest_img,
 +                                       sync='full', target=self.dest_img2,
                                         auto_dismiss=False)
          self.assertEqual(res, False)
          # OK, dismiss the zombie.
@@ -XXX,XX +XXX,XX @@ class BackupTest(iotests.QMPTestCase):
          self.assert_qmp(res, 'return', [])
          # Ensure it's really gone.
          self.qmp_backup_and_wait(device='drive0', format=iotests.imgfmt,
 -                                 sync='full', target=self.dest_img,
 +                                 sync='full', target=self.dest_img2,
                                   auto_dismiss=False)
      def dismissal_failure(self, dismissal_opt):
 diff --git a/tests/qemu-iotests/141.out b/tests/qemu-iotests/141.out
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/141.out
 +++ b/tests/qemu-iotests/141.out
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/m.
  Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT
  {"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"}}
 -{"error": {"class": "GenericError", "desc": "Node drv0 is in use"}}
 +{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: node is used as backing hd of 'NODE_NAME'"}}
  {"return": {}}
  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "job0"}}
  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 0, "speed": 0, "type": "backup"}}
 diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/257
 +++ b/tests/qemu-iotests/257
@@ -XXX,XX +XXX,XX @@ def blockdev_backup(vm, device, target, sync, **kwargs):
                          device=device,
                          target=target,
                          sync=sync,
 +                        filter_node_name='backup-top',
                          **kwargs)
      return result
@@ -XXX,XX +XXX,XX @@ def backup(drive, n, filepath, sync, **kwargs):
                               job_id=job_id, **kwargs)
      return job_id
 -def perform_writes(drive, n):
 +def perform_writes(drive, n, filter_node_name=None):
      log("--- Write #{:d} ---\n".format(n))
      for pattern in GROUPS[n].patterns:
          cmd = "write -P{:s} 0x{:07x} 0x{:x}".format(
@@ -XXX,XX +XXX,XX @@ def perform_writes(drive, n):
              pattern.offset,
              pattern.size)
          log(cmd)
 -        log(drive.vm.hmp_qemu_io(drive.node, cmd))
 +        log(drive.vm.hmp_qemu_io(filter_node_name or drive.node, cmd))
      bitmaps = drive.vm.query_bitmaps()
      log({'bitmaps': bitmaps}, indent=2)
      log('')
@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
              """Issue writes while the job is open to test bitmap divergence."""
              # Note: when `failure` is 'intermediate', this isn't called.
              log('')
 -            bitmaps = perform_writes(drive0, 2)
 +            bitmaps = perform_writes(drive0, 2, filter_node_name='backup-top')
              # Named bitmap (static, should be unchanged)
              ebitmap.compare(vm.get_bitmap(drive0.node, 'bitmap0',
                                            bitmaps=bitmaps))
 diff --git a/tests/qemu-iotests/257.out b/tests/qemu-iotests/257.out
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/257.out
 +++ b/tests/qemu-iotests/257.out
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
  {"return": {}}
  {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
  {"data": {"device": "backup_1", "error": "Input/output error", "len": 393216, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
  {"return": {}}
  {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
  {"data": {"device": "backup_1", "error": "Input/output error", "len": 393216, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
  {"return": {}}
  {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
  {"data": {"device": "backup_1", "error": "Input/output error", "len": 393216, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 13 dirty sectors; have 13. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 13 dirty sectors; have 13. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
  {"return": {}}
  {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
  {"data": {"device": "backup_1", "error": "Input/output error", "len": 67108864, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
  {"return": {}}
  {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
  {"data": {"device": "backup_1", "error": "Input/output error", "len": 67108864, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 1014 dirty sectors; have 1014. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 1014 dirty sectors; have 1014. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
  {"return": {}}
  {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
  {"data": {"device": "backup_1", "error": "Input/output error", "len": 458752, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
  {"return": {}}
  {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
  {"data": {"device": "backup_1", "error": "Input/output error", "len": 458752, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
  {"return": {}}
  {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
  {"return": {}}
  {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
  {"return": {}}
  --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
  {"return": {}}
  {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
  {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
  {"return": {}}
  {}
 -{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 +{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
  {"return": {}}
  {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
  {"return": {}}
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
  -- Sync mode incremental tests --
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'incremental' sync mode"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'incremental' sync mode"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'incremental' sync mode"}}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'incremental' sync mode"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be 'on-success' when using sync mode 'incremental'"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be 'on-success' when using sync mode 'incremental'"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be 'on-success' when using sync mode 'incremental'"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be 'on-success' when using sync mode 'incremental'"}}
  -- Sync mode bitmap tests --
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'bitmap' sync mode"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'bitmap' sync mode"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'bitmap' sync mode"}}
 -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'bitmap' sync mode"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be given when providing a bitmap"}}
  -- Sync mode full tests --
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap sync mode 'never' has no meaningful effect when combined with sync mode 'full'"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be given when providing a bitmap"}}
  -- Sync mode top tests --
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap sync mode 'never' has no meaningful effect when combined with sync mode 'top'"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be given when providing a bitmap"}}
  -- Sync mode none tests --
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "sync mode 'none' does not produce meaningful bitmap outputs"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "sync mode 'none' does not produce meaningful bitmap outputs"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "sync mode 'none' does not produce meaningful bitmap outputs"}}
 -{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 +{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
  {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be given when providing a bitmap"}}
 --
-.21.0
+.24.1

-[PULL 34/36] nbd: add empty .bdrv_reopen_prepare
+Deleted patch
-From: Maxim Levitsky <mlevitsk@redhat.com>
-Fixes commit job / qemu-img commit, when
-commiting qcow2 file which is based on nbd export.
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1718727
-Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-id: 20190930213820.29777-2-mlevitsk@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/nbd.c | 15 +++++++++++++++
-file changed, 15 insertions(+)
-diff --git a/block/nbd.c b/block/nbd.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/nbd.c
-+++ b/block/nbd.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nbd_client_co_block_status(
-         BDRV_BLOCK_OFFSET_VALID;
- }
-+static int nbd_client_reopen_prepare(BDRVReopenState *state,
-+                                     BlockReopenQueue *queue, Error **errp)
-+{
-+    BDRVNBDState *s = (BDRVNBDState *)state->bs->opaque;
-+
-+    if ((state->flags & BDRV_O_RDWR) && (s->info.flags & NBD_FLAG_READ_ONLY)) {
-+        error_setg(errp, "Can't reopen read-only NBD mount as read/write");
-+        return -EACCES;
-+    }
-+    return 0;
-+}
-+
- static void nbd_client_close(BlockDriverState *bs)
- {
-     BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_nbd = {
-     .instance_size              = sizeof(BDRVNBDState),
-     .bdrv_parse_filename        = nbd_parse_filename,
-     .bdrv_file_open             = nbd_open,
-+    .bdrv_reopen_prepare        = nbd_client_reopen_prepare,
-     .bdrv_co_preadv             = nbd_client_co_preadv,
-     .bdrv_co_pwritev            = nbd_client_co_pwritev,
-     .bdrv_co_pwrite_zeroes      = nbd_client_co_pwrite_zeroes,
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_nbd_tcp = {
-     .instance_size              = sizeof(BDRVNBDState),
-     .bdrv_parse_filename        = nbd_parse_filename,
-     .bdrv_file_open             = nbd_open,
-+    .bdrv_reopen_prepare        = nbd_client_reopen_prepare,
-     .bdrv_co_preadv             = nbd_client_co_preadv,
-     .bdrv_co_pwritev            = nbd_client_co_pwritev,
-     .bdrv_co_pwrite_zeroes      = nbd_client_co_pwrite_zeroes,
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_nbd_unix = {
-     .instance_size              = sizeof(BDRVNBDState),
-     .bdrv_parse_filename        = nbd_parse_filename,
-     .bdrv_file_open             = nbd_open,
-+    .bdrv_reopen_prepare        = nbd_client_reopen_prepare,
-     .bdrv_co_preadv             = nbd_client_co_preadv,
-     .bdrv_co_pwritev            = nbd_client_co_pwritev,
-     .bdrv_co_pwrite_zeroes      = nbd_client_co_pwrite_zeroes,
---
-.21.0

-[PULL 35/36] tests: fix I/O test for hosts defaulting to LUKSv2
+Deleted patch
-From: Daniel P. Berrangé <berrange@redhat.com>
-Some distros are now defaulting to LUKS version 2 which QEMU cannot
-process. For our I/O test that validates interoperability between the
-kernel/cryptsetup and QEMU, we need to explicitly ask for version 1
-of the LUKS format.
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Message-id: 20190927101155.25896-1-berrange@redhat.com
-Tested-by: Maxim Levitsky <mlevitsk@redhat.com>
-Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/149     |  2 +-
- tests/qemu-iotests/149.out | 44 +++++++++++++++++++-------------------
-files changed, 23 insertions(+), 23 deletions(-)
-diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/149
-+++ b/tests/qemu-iotests/149
-@@ -XXX,XX +XXX,XX @@ def cryptsetup_format(config):
-     (password, slot) = config.first_password()
--    args = ["luksFormat"]
-+    args = ["luksFormat", "--type", "luks1"]
-     cipher = config.cipher + "-" + config.mode + "-" + config.ivgen
-     if config.ivgen_hash is not None:
-         cipher = cipher + ":" + config.ivgen_hash
-diff --git a/tests/qemu-iotests/149.out b/tests/qemu-iotests/149.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/149.out
-+++ b/tests/qemu-iotests/149.out
-@@ -XXX,XX +XXX,XX @@
- # Create image
- truncate TEST_DIR/luks-aes-256-xts-plain64-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha1.img qiotest-145-aes-256-xts-plain64-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha1.img
- # Create image
- truncate TEST_DIR/luks-twofish-256-xts-plain64-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher twofish-xts-plain64 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-twofish-256-xts-plain64-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher twofish-xts-plain64 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-twofish-256-xts-plain64-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-256-xts-plain64-sha1.img qiotest-145-twofish-256-xts-plain64-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-twofish-256-xts-plain64-sha1.img
- # Create image
- truncate TEST_DIR/luks-serpent-256-xts-plain64-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher serpent-xts-plain64 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpent-256-xts-plain64-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher serpent-xts-plain64 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpent-256-xts-plain64-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-256-xts-plain64-sha1.img qiotest-145-serpent-256-xts-plain64-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-serpent-256-xts-plain64-sha1.img
- # Create image
- truncate TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher cast5-cbc-plain64 --key-size 128 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher cast5-cbc-plain64 --key-size 128 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img qiotest-145-cast5-128-cbc-plain64-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ Skipping cast6-256-xts-plain64-sha1 in blacklist
- # Create image
- truncate TEST_DIR/luks-aes-256-cbc-plain-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-cbc-plain --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-plain-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-cbc-plain --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-plain-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain-sha1.img qiotest-145-aes-256-cbc-plain-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-cbc-plain-sha1.img
- # Create image
- truncate TEST_DIR/luks-aes-256-cbc-plain64-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-cbc-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-plain64-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-cbc-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-plain64-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha1.img qiotest-145-aes-256-cbc-plain64-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-cbc-plain64-sha1.img
- # Create image
- truncate TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-cbc-essiv:sha256 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-cbc-essiv:sha256 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img qiotest-145-aes-256-cbc-essiv-sha256-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img
- # Create image
- truncate TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-xts-essiv:sha256 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-essiv:sha256 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img qiotest-145-aes-256-xts-essiv-sha256-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img
- # Create image
- truncate TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img qiotest-145-aes-128-xts-plain64-sha256-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img
- # Create image
- truncate TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 384 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 384 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img qiotest-145-aes-192-xts-plain64-sha256-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img
- # Create image
- truncate TEST_DIR/luks-twofish-128-xts-plain64-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher twofish-xts-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-twofish-128-xts-plain64-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher twofish-xts-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-twofish-128-xts-plain64-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-128-xts-plain64-sha1.img qiotest-145-twofish-128-xts-plain64-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ Skipping twofish-192-xts-plain64-sha1 in blacklist
- # Create image
- truncate TEST_DIR/luks-serpent-128-xts-plain64-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher serpent-xts-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpent-128-xts-plain64-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher serpent-xts-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpent-128-xts-plain64-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-128-xts-plain64-sha1.img qiotest-145-serpent-128-xts-plain64-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-serpent-128-xts-plain64-sha1.img
- # Create image
- truncate TEST_DIR/luks-serpent-192-xts-plain64-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher serpent-xts-plain64 --key-size 384 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpent-192-xts-plain64-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher serpent-xts-plain64 --key-size 384 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpent-192-xts-plain64-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-192-xts-plain64-sha1.img qiotest-145-serpent-192-xts-plain64-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ Skipping cast6-192-xts-plain64-sha1 in blacklist
- # Create image
- truncate TEST_DIR/luks-aes-256-xts-plain64-sha224.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 --hash sha224 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha224.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 512 --hash sha224 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha224.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha224.img qiotest-145-aes-256-xts-plain64-sha224
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha224.img
- # Create image
- truncate TEST_DIR/luks-aes-256-xts-plain64-sha256.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 --hash sha256 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha256.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 512 --hash sha256 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha256.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha256.img qiotest-145-aes-256-xts-plain64-sha256
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha256.img
- # Create image
- truncate TEST_DIR/luks-aes-256-xts-plain64-sha384.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 --hash sha384 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha384.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 512 --hash sha384 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha384.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha384.img qiotest-145-aes-256-xts-plain64-sha384
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha384.img
- # Create image
- truncate TEST_DIR/luks-aes-256-xts-plain64-sha512.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 --hash sha512 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha512.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 512 --hash sha512 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha512.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha512.img qiotest-145-aes-256-xts-plain64-sha512
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha512.img
- # Create image
- truncate TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 --hash ripemd160 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 512 --hash ripemd160 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img qiotest-145-aes-256-xts-plain64-ripemd160
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img
- # Create image
- truncate TEST_DIR/luks-aes-256-xts-plain-sha1-pwslot3.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain --key-size 512 --hash sha1 --key-slot 3 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain-sha1-pwslot3.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain --key-size 512 --hash sha1 --key-slot 3 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain-sha1-pwslot3.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain-sha1-pwslot3.img qiotest-145-aes-256-xts-plain-sha1-pwslot3
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain-sha1-pwslot3.img
- # Create image
- truncate TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img
- # Add password slot 1
- sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img --key-slot 1 --key-file - --iter-time 10 TEST_DIR/passwd.txt
- # Add password slot 2
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img
- # Create image
- truncate TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-cbc-essiv:sha256 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-cbc-essiv:sha256 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img qiotest-145-aes-256-cbc-essiv-auto-sha1
- # Write test pattern 0xa7
-@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img
- # Create image
- truncate TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img --size 4194304MB
- # Format image
--sudo cryptsetup -q -v luksFormat --cipher aes-cbc-plain64:sha256 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img
-+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-cbc-plain64:sha256 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img
- # Open dev
- sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img qiotest-145-aes-256-cbc-plain64-sha256-sha1
- # Write test pattern 0xa7
---
-.21.0

-[PULL 36/36] iotests/162: Fix for newer Linux 5.3+
+[PULL 2/2] hw/core: Allow setting 'virtio-blk-device.scsi' property on OSX host
-Linux 5.3 has made 0.0.0.0/8 a working IPv4 subnet.  As such, "42" is
+From: Philippe Mathieu-Daudé <philmd@redhat.com>
 now a valid host, and the connection to it will (hopefully) time out
 over a long period rather than quickly return with EINVAL.
-So let us use a negative integer for testing that NBD will not crash
+Commit ed65fd1a2750 ("virtio-blk: switch off scsi-passthrough by
-when it receives integer hosts.  This way, the connection will again
+default") changed the default value of the 'scsi' property of
-fail quickly and reliably.
+virtio-blk, which is only available on Linux hosts. It also added
 an unconditional compat entry for 2.4 or earlier machines.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Trying to set this property on a pre-2.5 machine on OSX, we get:
-Message-id: 20191002174052.5773-1-mreitz@redhat.com
-Reviewed-by: Eric Blake <eblake@redhat.com>
+   Unexpected error in object_property_find() at qom/object.c:1201:
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+   qemu-system-x86_64: -device virtio-blk-pci,id=scsi0,drive=drive0: can't apply global virtio-blk-device.scsi=true: Property '.scsi' not found
 Fix this error by marking the property optional.
 Fixes: ed65fd1a27 ("virtio-blk: switch off scsi-passthrough by default")
 Suggested-by: Cornelia Huck <cohuck@redhat.com>
 Reviewed-by: Cornelia Huck <cohuck@redhat.com>
 Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
 Message-id: 20200207001404.1739-1-philmd@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- tests/qemu-iotests/162     | 2 +-
+ hw/core/machine.c | 3 ++-
- tests/qemu-iotests/162.out | 2 +-
+file changed, 2 insertions(+), 1 deletion(-)
 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
+diff --git a/hw/core/machine.c b/hw/core/machine.c
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/162
 +++ b/tests/qemu-iotests/162
@@ -XXX,XX +XXX,XX @@ echo '=== NBD ==='
  # NBD expects all of its arguments to be strings
  # So this should not crash
 -$QEMU_IMG info 'json:{"driver": "nbd", "host": 42}'
 +$QEMU_IMG info 'json:{"driver": "nbd", "host": -1}'
  # And this should not treat @port as if it had not been specified
  # (We need to set up a server here, because the error message for "Connection
 diff --git a/tests/qemu-iotests/162.out b/tests/qemu-iotests/162.out
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/162.out
+--- a/hw/core/machine.c
-+++ b/tests/qemu-iotests/162.out
++++ b/hw/core/machine.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ GlobalProperty hw_compat_2_5[] = {
- QA output created by 162
+ const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5);
- === NBD ===
+ GlobalProperty hw_compat_2_4[] = {
--qemu-img: Could not open 'json:{"driver": "nbd", "host": 42}': Failed to connect socket: Invalid argument
+-    { "virtio-blk-device", "scsi", "true" },
-+qemu-img: Could not open 'json:{"driver": "nbd", "host": -1}': address resolution failed for -1:10809: Name or service not known
++    /* Optional because the 'scsi' property is Linux-only */
- image: nbd://localhost:PORT
++    { "virtio-blk-device", "scsi", "true", .optional = true },
- image: nbd+unix://?socket=42
+     { "e1000", "extra_mac_registers", "off" },
+     { "virtio-pci", "x-disable-pcie", "on" },
      { "virtio-pci", "migrate-extra", "off" },
 --
-.21.0
+.24.1

The following changes since commit 98b2e3c9ab3abfe476a2b02f8f51813edb90e72d:

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-10-08 16:08:35 +0100)

are available in the Git repository at:

https://github.com/XanClic/qemu.git tags/pull-block-2019-10-10

for you to fetch changes up to 35f05b2e2ee59e077bf949057dc0959ddd6e5249:

iotests/162: Fix for newer Linux 5.3+ (2019-10-10 12:13:23 +0200)

----------------------------------------------------------------
Block patches:
- Parallelized request handling for qcow2
- Backup job refactoring to use a filter node instead of before-write
  notifiers
- Add discard accounting information to file-posix nodes
- Allow trivial reopening of nbd nodes
- Some iotest fixes

----------------------------------------------------------------
Anton Nefedov (9):
  qapi: group BlockDeviceStats fields
  qapi: add unmap to BlockDeviceStats
  block: add empty account cookie type
  ide: account UNMAP (TRIM) operations
  scsi: store unmap offset and nb_sectors in request struct
  scsi: move unmap error checking to the complete callback
  scsi: account unmap operations
  file-posix: account discard operations
  qapi: query-blockstat: add driver specific file-posix stats

Daniel P. Berrangé (1):
  tests: fix I/O test for hosts defaulting to LUKSv2

Max Reitz (4):
  iotests: Fix 125 for growth_mode = metadata
  iotests: Disable 125 on broken XFS versions
  iotests: Use stat -c %b in 125
  iotests/162: Fix for newer Linux 5.3+

Maxim Levitsky (1):
  nbd: add empty .bdrv_reopen_prepare

Vladimir Sementsov-Ogievskiy (21):
  qemu-iotests: ignore leaks on failure paths in 026
  block: introduce aio task pool
  block/qcow2: refactor qcow2_co_preadv_part
  block/qcow2: refactor qcow2_co_pwritev_part
  block/qcow2: introduce parallel subrequest handling in read and write
  block/backup: fix max_transfer handling for copy_range
  block/backup: fix backup_cow_with_offload for last cluster
  block/backup: split shareable copying part from backup_do_cow
  block/backup: improve comment about image fleecing
  block/backup: introduce BlockCopyState
  block/backup: fix block-comment style
  block: move block_copy from block/backup.c to separate file
  block: teach bdrv_debug_breakpoint skip filters with backing
  iotests: prepare 124 and 257 bitmap querying for backup-top filter
  iotests: 257: drop unused Drive.device field
  iotests: 257: drop device_add
  block/backup: move in-flight requests handling from backup to
    block-copy
  block/backup: move write_flags calculation inside backup_job_create
  block/block-copy: split block_copy_set_callbacks function
  block: introduce backup-top filter driver
  block/backup: use backup-top instead of write notifiers

-- 
2.21.0

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

Upcoming asynchronous handling of sub-parts of qcow2 requests will
change number of leaked clusters and even make it racy. As a
preparation, ignore leaks on failure parts in 026.

It's not trivial to just grep or substitute qemu-img output for such
thing. Instead do better: 3 is a error code of qemu-img check, if only
leaks are found. Catch this case and print success output.

Suggested-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190916175324.18478-2-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/026             |  6 +--
 tests/qemu-iotests/026.out         | 80 ++++++++----------------------
 tests/qemu-iotests/026.out.nocache | 80 ++++++++----------------------
 tests/qemu-iotests/common.rc       | 17 +++++++
 4 files changed, 60 insertions(+), 123 deletions(-)

diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026
@@ -XXX,XX +XXX,XX @@ if [ "$event" == "l2_load" ]; then
     $QEMU_IO -c "read $vmstate 0 128k " "$BLKDBG_TEST_IMG" | _filter_qemu_io
 fi
 
-_check_test_img 2>&1 | grep -v "refcount=1 reference=0"
+_check_test_img_ignore_leaks 2>&1 | grep -v "refcount=1 reference=0"
 
 done
 done
@@ -XXX,XX +XXX,XX @@ echo
 echo "Event: $event; errno: $errno; imm: $imm; once: $once; write $vmstate"
 $QEMU_IO -c "write $vmstate 0 64M" "$BLKDBG_TEST_IMG" | _filter_qemu_io
 
-_check_test_img 2>&1 | grep -v "refcount=1 reference=0"
+_check_test_img_ignore_leaks 2>&1 | grep -v "refcount=1 reference=0"
 
 done
 done
@@ -XXX,XX +XXX,XX @@ echo
 echo "Event: $event; errno: $errno; imm: $imm; once: $once"
 $QEMU_IO -c "write -b 0 64k" "$BLKDBG_TEST_IMG" | _filter_qemu_io
 
-_check_test_img 2>&1 | grep -v "refcount=1 reference=0"
+_check_test_img_ignore_leaks 2>&1 | grep -v "refcount=1 reference=0"
 
 done
 done
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 @@ Event: l1_update; errno: 5; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l1_update; errno: 28; imm: off; once: on; write
@@ -XXX,XX +XXX,XX @@ Event: l1_update; errno: 28; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l2_load; errno: 5; imm: off; once: on; write
@@ -XXX,XX +XXX,XX @@ Event: l2_update; errno: 5; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l2_update; errno: 28; imm: off; once: on; write
@@ -XXX,XX +XXX,XX @@ Event: l2_update; errno: 28; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+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: on; write
@@ -XXX,XX +XXX,XX @@ Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b
 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.
-This means waste of disk space, but no harm to data.
+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: on; write
@@ -XXX,XX +XXX,XX @@ Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b
 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.
-This means waste of disk space, but no harm to data.
+No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: write_aio; errno: 5; imm: off; once: on; write
@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+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: on; write
@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+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: on; write
@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+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: on; write
@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+No errors were found on the image.
 
 === L1 growth tests ===
 
@@ -XXX,XX +XXX,XX @@ Event: l1_grow_activate_table; errno: 5; imm: off; once: off
 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.
-This means waste of disk space, but no harm to data.
+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: on
@@ -XXX,XX +XXX,XX @@ Event: l1_grow_activate_table; errno: 28; imm: off; once: off
 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.
-This means waste of disk space, but no harm to data.
+No errors were found on the image.
 
 === Avoid cluster leaks after temporary failure ===
 
diff --git a/tests/qemu-iotests/026.out.nocache b/tests/qemu-iotests/026.out.nocache
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/026.out.nocache
+++ b/tests/qemu-iotests/026.out.nocache
@@ -XXX,XX +XXX,XX @@ Event: l1_update; errno: 5; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l1_update; errno: 28; imm: off; once: on; write 
@@ -XXX,XX +XXX,XX @@ Event: l1_update; errno: 28; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l2_load; errno: 5; imm: off; once: on; write 
@@ -XXX,XX +XXX,XX @@ qemu-io: Failed to flush the L2 table cache: Input/output error
 qemu-io: Failed to flush the refcount block cache: Input/output error
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-
-127 leaked clusters were found on the image.
-This means waste of disk space, but no harm to data.
+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 -b
@@ -XXX,XX +XXX,XX @@ qemu-io: Failed to flush the L2 table cache: Input/output error
 qemu-io: Failed to flush the refcount block cache: Input/output error
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-
-127 leaked clusters were found on the image.
-This means waste of disk space, but no harm to data.
+No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l2_update; errno: 28; imm: off; once: on; write 
@@ -XXX,XX +XXX,XX @@ 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
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-
-127 leaked clusters were found on the image.
-This means waste of disk space, but no harm to data.
+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 -b
@@ -XXX,XX +XXX,XX @@ 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
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-
-127 leaked clusters were found on the image.
-This means waste of disk space, but no harm to data.
+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: on; write 
@@ -XXX,XX +XXX,XX @@ Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b
 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.
-This means waste of disk space, but no harm to data.
+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: on; write 
@@ -XXX,XX +XXX,XX @@ Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b
 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.
-This means waste of disk space, but no harm to data.
+No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: write_aio; errno: 5; imm: off; once: on; write 
@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+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: on; write 
@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+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: on; write 
@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+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: on; write 
@@ -XXX,XX +XXX,XX @@ Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write
 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.
-This means waste of disk space, but no harm to data.
+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 -b
 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.
-This means waste of disk space, but no harm to data.
+No errors were found on the image.
 
 === L1 growth tests ===
 
@@ -XXX,XX +XXX,XX @@ Event: l1_grow_activate_table; errno: 5; imm: off; once: off
 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.
-This means waste of disk space, but no harm to data.
+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: on
@@ -XXX,XX +XXX,XX @@ Event: l1_grow_activate_table; errno: 28; imm: off; once: off
 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.
-This means waste of disk space, but no harm to data.
+No errors were found on the image.
 
 === Avoid cluster leaks after temporary failure ===
 
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ _check_test_img()
             $QEMU_IMG check "$@" -f $IMGFMT "$TEST_IMG" 2>&1
         fi
     ) | _filter_testdir | _filter_qemu_img_check
+
+    # return real qemu_img check status, to analyze in
+    # _check_test_img_ignore_leaks
+    return ${PIPESTATUS[0]}
+}
+
+_check_test_img_ignore_leaks()
+{
+    out=$(_check_test_img "$@")
+    status=$?
+    if [ $status = 3 ]; then
+        # This must correspond to success output in dump_human_image_check()
+        echo "No errors were found on the image."
+        return 0
+    fi
+    echo "$out"
+    return $status
 }
 
 _img_info()
-- 
2.21.0

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

Common interface for aio task loops. To be used for improving
performance of synchronous io loops in qcow2, block-stream,
copy-on-read, and may be other places.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190916175324.18478-3-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/Makefile.objs      |   2 +
 include/block/aio_task.h |  54 +++++++++++++++++
 block/aio_task.c         | 124 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 180 insertions(+)
 create mode 100644 include/block/aio_task.h
 create mode 100644 block/aio_task.c

diff --git a/block/Makefile.objs b/block/Makefile.objs
index XXXXXXX..XXXXXXX 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -XXX,XX +XXX,XX @@ block-obj-y += throttle.o copy-on-read.o
 
 block-obj-y += crypto.o
 
+block-obj-y += aio_task.o
+
 common-obj-y += stream.o
 
 nfs.o-libs         := $(LIBNFS_LIBS)
diff --git a/include/block/aio_task.h b/include/block/aio_task.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/include/block/aio_task.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * Aio tasks loops
+ *
+ * Copyright (c) 2019 Virtuozzo International GmbH.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef BLOCK_AIO_TASK_H
+#define BLOCK_AIO_TASK_H
+
+#include "qemu/coroutine.h"
+
+typedef struct AioTaskPool AioTaskPool;
+typedef struct AioTask AioTask;
+typedef int coroutine_fn (*AioTaskFunc)(AioTask *task);
+struct AioTask {
+    AioTaskPool *pool;
+    AioTaskFunc func;
+    int ret;
+};
+
+AioTaskPool *coroutine_fn aio_task_pool_new(int max_busy_tasks);
+void aio_task_pool_free(AioTaskPool *);
+
+/* error code of failed task or 0 if all is OK */
+int aio_task_pool_status(AioTaskPool *pool);
+
+bool aio_task_pool_empty(AioTaskPool *pool);
+
+/* User provides filled @task, however task->pool will be set automatically */
+void coroutine_fn aio_task_pool_start_task(AioTaskPool *pool, AioTask *task);
+
+void coroutine_fn aio_task_pool_wait_slot(AioTaskPool *pool);
+void coroutine_fn aio_task_pool_wait_one(AioTaskPool *pool);
+void coroutine_fn aio_task_pool_wait_all(AioTaskPool *pool);
+
+#endif /* BLOCK_AIO_TASK_H */
diff --git a/block/aio_task.c b/block/aio_task.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/block/aio_task.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * Aio tasks loops
+ *
+ * Copyright (c) 2019 Virtuozzo International GmbH.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "qemu/osdep.h"
+#include "block/aio.h"
+#include "block/aio_task.h"
+
+struct AioTaskPool {
+    Coroutine *main_co;
+    int status;
+    int max_busy_tasks;
+    int busy_tasks;
+    bool waiting;
+};
+
+static void coroutine_fn aio_task_co(void *opaque)
+{
+    AioTask *task = opaque;
+    AioTaskPool *pool = task->pool;
+
+    assert(pool->busy_tasks < pool->max_busy_tasks);
+    pool->busy_tasks++;
+
+    task->ret = task->func(task);
+
+    pool->busy_tasks--;
+
+    if (task->ret < 0 && pool->status == 0) {
+        pool->status = task->ret;
+    }
+
+    g_free(task);
+
+    if (pool->waiting) {
+        pool->waiting = false;
+        aio_co_wake(pool->main_co);
+    }
+}
+
+void coroutine_fn aio_task_pool_wait_one(AioTaskPool *pool)
+{
+    assert(pool->busy_tasks > 0);
+    assert(qemu_coroutine_self() == pool->main_co);
+
+    pool->waiting = true;
+    qemu_coroutine_yield();
+
+    assert(!pool->waiting);
+    assert(pool->busy_tasks < pool->max_busy_tasks);
+}
+
+void coroutine_fn aio_task_pool_wait_slot(AioTaskPool *pool)
+{
+    if (pool->busy_tasks < pool->max_busy_tasks) {
+        return;
+    }
+
+    aio_task_pool_wait_one(pool);
+}
+
+void coroutine_fn aio_task_pool_wait_all(AioTaskPool *pool)
+{
+    while (pool->busy_tasks > 0) {
+        aio_task_pool_wait_one(pool);
+    }
+}
+
+void coroutine_fn aio_task_pool_start_task(AioTaskPool *pool, AioTask *task)
+{
+    aio_task_pool_wait_slot(pool);
+
+    task->pool = pool;
+    qemu_coroutine_enter(qemu_coroutine_create(aio_task_co, task));
+}
+
+AioTaskPool *coroutine_fn aio_task_pool_new(int max_busy_tasks)
+{
+    AioTaskPool *pool = g_new0(AioTaskPool, 1);
+
+    pool->main_co = qemu_coroutine_self();
+    pool->max_busy_tasks = max_busy_tasks;
+
+    return pool;
+}
+
+void aio_task_pool_free(AioTaskPool *pool)
+{
+    g_free(pool);
+}
+
+int aio_task_pool_status(AioTaskPool *pool)
+{
+    if (!pool) {
+        return 0; /* Sugar for lazy allocation of aio pool */
+    }
+
+    return pool->status;
+}
+
+bool aio_task_pool_empty(AioTaskPool *pool)
+{
+    return pool->busy_tasks == 0;
+}
-- 
2.21.0

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

Further patch will run partial requests of iterations of
qcow2_co_preadv in parallel for performance reasons. To prepare for
this, separate part which may be parallelized into separate function
(qcow2_co_preadv_task).

While being here, also separate encrypted clusters reading to own
function, like it is done for compressed reading.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190916175324.18478-4-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2.c | 209 +++++++++++++++++++++++++++-----------------------
 1 file changed, 113 insertions(+), 96 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 @@ out:
     return ret;
 }
 
+static coroutine_fn int
+qcow2_co_preadv_encrypted(BlockDriverState *bs,
+                           uint64_t file_cluster_offset,
+                           uint64_t offset,
+                           uint64_t bytes,
+                           QEMUIOVector *qiov,
+                           uint64_t qiov_offset)
+{
+    int ret;
+    BDRVQcow2State *s = bs->opaque;
+    uint8_t *buf;
+
+    assert(bs->encrypted && s->crypto);
+    assert(bytes <= QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size);
+
+    /*
+     * For encrypted images, read everything into a temporary
+     * contiguous buffer on which the AES functions can work.
+     * Also, decryption in a separate buffer is better as it
+     * prevents the guest from learning information about the
+     * encrypted nature of the virtual disk.
+     */
+
+    buf = qemu_try_blockalign(s->data_file->bs, bytes);
+    if (buf == NULL) {
+        return -ENOMEM;
+    }
+
+    BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
+    ret = bdrv_co_pread(s->data_file,
+                        file_cluster_offset + offset_into_cluster(s, offset),
+                        bytes, buf, 0);
+    if (ret < 0) {
+        goto fail;
+    }
+
+    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
+    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
+    if (qcow2_co_decrypt(bs,
+                         file_cluster_offset + offset_into_cluster(s, offset),
+                         offset, buf, bytes) < 0)
+    {
+        ret = -EIO;
+        goto fail;
+    }
+    qemu_iovec_from_buf(qiov, qiov_offset, buf, bytes);
+
+fail:
+    qemu_vfree(buf);
+
+    return ret;
+}
+
+static coroutine_fn int qcow2_co_preadv_task(BlockDriverState *bs,
+                                             QCow2ClusterType cluster_type,
+                                             uint64_t file_cluster_offset,
+                                             uint64_t offset, uint64_t bytes,
+                                             QEMUIOVector *qiov,
+                                             size_t qiov_offset)
+{
+    BDRVQcow2State *s = bs->opaque;
+    int offset_in_cluster = offset_into_cluster(s, offset);
+
+    switch (cluster_type) {
+    case QCOW2_CLUSTER_ZERO_PLAIN:
+    case QCOW2_CLUSTER_ZERO_ALLOC:
+        /* Both zero types are handled in qcow2_co_preadv_part */
+        g_assert_not_reached();
+
+    case QCOW2_CLUSTER_UNALLOCATED:
+        assert(bs->backing); /* otherwise handled in qcow2_co_preadv_part */
+
+        BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
+        return bdrv_co_preadv_part(bs->backing, offset, bytes,
+                                   qiov, qiov_offset, 0);
+
+    case QCOW2_CLUSTER_COMPRESSED:
+        return qcow2_co_preadv_compressed(bs, file_cluster_offset,
+                                          offset, bytes, qiov, qiov_offset);
+
+    case QCOW2_CLUSTER_NORMAL:
+        if ((file_cluster_offset & 511) != 0) {
+            return -EIO;
+        }
+
+        if (bs->encrypted) {
+            return qcow2_co_preadv_encrypted(bs, file_cluster_offset,
+                                             offset, bytes, qiov, qiov_offset);
+        }
+
+        BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
+        return bdrv_co_preadv_part(s->data_file,
+                                   file_cluster_offset + offset_in_cluster,
+                                   bytes, qiov, qiov_offset, 0);
+
+    default:
+        g_assert_not_reached();
+    }
+
+    g_assert_not_reached();
+}
+
 static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
                                              uint64_t offset, uint64_t bytes,
                                              QEMUIOVector *qiov,
                                              size_t qiov_offset, int flags)
 {
     BDRVQcow2State *s = bs->opaque;
-    int offset_in_cluster;
     int ret;
     unsigned int cur_bytes; /* number of bytes in current iteration */
     uint64_t cluster_offset = 0;
-    uint8_t *cluster_data = NULL;
 
     while (bytes != 0) {
 
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
         ret = qcow2_get_cluster_offset(bs, offset, &cur_bytes, &cluster_offset);
         qemu_co_mutex_unlock(&s->lock);
         if (ret < 0) {
-            goto fail;
+            return ret;
         }
 
-        offset_in_cluster = offset_into_cluster(s, offset);
-
-        switch (ret) {
-        case QCOW2_CLUSTER_UNALLOCATED:
-
-            if (bs->backing) {
-                BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
-                ret = bdrv_co_preadv_part(bs->backing, offset, cur_bytes,
-                                          qiov, qiov_offset, 0);
-                if (ret < 0) {
-                    goto fail;
-                }
-            } else {
-                /* Note: in this case, no need to wait */
-                qemu_iovec_memset(qiov, qiov_offset, 0, cur_bytes);
-            }
-            break;
-
-        case QCOW2_CLUSTER_ZERO_PLAIN:
-        case QCOW2_CLUSTER_ZERO_ALLOC:
+        if (ret == QCOW2_CLUSTER_ZERO_PLAIN ||
+            ret == QCOW2_CLUSTER_ZERO_ALLOC ||
+            (ret == QCOW2_CLUSTER_UNALLOCATED && !bs->backing))
+        {
             qemu_iovec_memset(qiov, qiov_offset, 0, cur_bytes);
-            break;
-
-        case QCOW2_CLUSTER_COMPRESSED:
-            ret = qcow2_co_preadv_compressed(bs, cluster_offset,
-                                             offset, cur_bytes,
-                                             qiov, qiov_offset);
+        } else {
+            ret = qcow2_co_preadv_task(bs, ret,
+                                       cluster_offset, offset, cur_bytes,
+                                       qiov, qiov_offset);
             if (ret < 0) {
-                goto fail;
-            }
-
-            break;
-
-        case QCOW2_CLUSTER_NORMAL:
-            if ((cluster_offset & 511) != 0) {
-                ret = -EIO;
-                goto fail;
-            }
-
-            if (bs->encrypted) {
-                assert(s->crypto);
-
-                /*
-                 * For encrypted images, read everything into a temporary
-                 * contiguous buffer on which the AES functions can work.
-                 */
-                if (!cluster_data) {
-                    cluster_data =
-                        qemu_try_blockalign(s->data_file->bs,
-                                            QCOW_MAX_CRYPT_CLUSTERS
-                                            * s->cluster_size);
-                    if (cluster_data == NULL) {
-                        ret = -ENOMEM;
-                        goto fail;
-                    }
-                }
-
-                assert(cur_bytes <= QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size);
-
-                BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
-                ret = bdrv_co_pread(s->data_file,
-                                    cluster_offset + offset_in_cluster,
-                                    cur_bytes, cluster_data, 0);
-                if (ret < 0) {
-                    goto fail;
-                }
-
-                assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
-                assert(QEMU_IS_ALIGNED(cur_bytes, BDRV_SECTOR_SIZE));
-                if (qcow2_co_decrypt(bs, cluster_offset + offset_in_cluster,
-                                     offset,
-                                     cluster_data, cur_bytes) < 0) {
-                    ret = -EIO;
-                    goto fail;
-                }
-                qemu_iovec_from_buf(qiov, qiov_offset, cluster_data, cur_bytes);
-            } else {
-                BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
-                ret = bdrv_co_preadv_part(s->data_file,
-                                          cluster_offset + offset_in_cluster,
-                                          cur_bytes, qiov, qiov_offset, 0);
-                if (ret < 0) {
-                    goto fail;
-                }
+                return ret;
             }
-            break;
-
-        default:
-            g_assert_not_reached();
-            ret = -EIO;
-            goto fail;
         }
 
         bytes -= cur_bytes;
         offset += cur_bytes;
         qiov_offset += cur_bytes;
     }
-    ret = 0;
-
-fail:
-    qemu_vfree(cluster_data);
 
-    return ret;
+    return 0;
 }
 
 /* Check if it's possible to merge a write request with the writing of
-- 
2.21.0

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

Similarly to previous commit, prepare for parallelizing write-loop
iterations.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190916175324.18478-5-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2.c | 154 +++++++++++++++++++++++++++++---------------------
 1 file changed, 90 insertions(+), 64 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 handle_alloc_space(BlockDriverState *bs, QCowL2Meta *l2meta)
     return 0;
 }
 
+/*
+ * qcow2_co_pwritev_task
+ * Called with s->lock unlocked
+ * l2meta  - if not NULL, qcow2_co_pwritev_task() will consume it. Caller must
+ *           not use it somehow after qcow2_co_pwritev_task() call
+ */
+static coroutine_fn int qcow2_co_pwritev_task(BlockDriverState *bs,
+                                              uint64_t file_cluster_offset,
+                                              uint64_t offset, uint64_t bytes,
+                                              QEMUIOVector *qiov,
+                                              uint64_t qiov_offset,
+                                              QCowL2Meta *l2meta)
+{
+    int ret;
+    BDRVQcow2State *s = bs->opaque;
+    void *crypt_buf = NULL;
+    int offset_in_cluster = offset_into_cluster(s, offset);
+    QEMUIOVector encrypted_qiov;
+
+    if (bs->encrypted) {
+        assert(s->crypto);
+        assert(bytes <= QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size);
+        crypt_buf = qemu_try_blockalign(bs->file->bs, bytes);
+        if (crypt_buf == NULL) {
+            ret = -ENOMEM;
+            goto out_unlocked;
+        }
+        qemu_iovec_to_buf(qiov, qiov_offset, crypt_buf, bytes);
+
+        if (qcow2_co_encrypt(bs, file_cluster_offset + offset_in_cluster,
+                             offset, crypt_buf, bytes) < 0)
+        {
+            ret = -EIO;
+            goto out_unlocked;
+        }
+
+        qemu_iovec_init_buf(&encrypted_qiov, crypt_buf, bytes);
+        qiov = &encrypted_qiov;
+        qiov_offset = 0;
+    }
+
+    /* Try to efficiently initialize the physical space with zeroes */
+    ret = handle_alloc_space(bs, l2meta);
+    if (ret < 0) {
+        goto out_unlocked;
+    }
+
+    /*
+     * If we need to do COW, check if it's possible to merge the
+     * writing of the guest data together with that of the COW regions.
+     * If it's not possible (or not necessary) then write the
+     * guest data now.
+     */
+    if (!merge_cow(offset, bytes, qiov, qiov_offset, l2meta)) {
+        BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
+        trace_qcow2_writev_data(qemu_coroutine_self(),
+                                file_cluster_offset + offset_in_cluster);
+        ret = bdrv_co_pwritev_part(s->data_file,
+                                   file_cluster_offset + offset_in_cluster,
+                                   bytes, qiov, qiov_offset, 0);
+        if (ret < 0) {
+            goto out_unlocked;
+        }
+    }
+
+    qemu_co_mutex_lock(&s->lock);
+
+    ret = qcow2_handle_l2meta(bs, &l2meta, true);
+    goto out_locked;
+
+out_unlocked:
+    qemu_co_mutex_lock(&s->lock);
+
+out_locked:
+    qcow2_handle_l2meta(bs, &l2meta, false);
+    qemu_co_mutex_unlock(&s->lock);
+
+    qemu_vfree(crypt_buf);
+
+    return ret;
+}
+
 static coroutine_fn int qcow2_co_pwritev_part(
         BlockDriverState *bs, uint64_t offset, uint64_t bytes,
         QEMUIOVector *qiov, size_t qiov_offset, int flags)
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_pwritev_part(
     int ret;
     unsigned int cur_bytes; /* number of sectors in current iteration */
     uint64_t cluster_offset;
-    QEMUIOVector encrypted_qiov;
-    uint64_t bytes_done = 0;
-    uint8_t *cluster_data = NULL;
     QCowL2Meta *l2meta = NULL;
 
     trace_qcow2_writev_start_req(qemu_coroutine_self(), offset, bytes);
 
-    qemu_co_mutex_lock(&s->lock);
-
     while (bytes != 0) {
 
         l2meta = NULL;
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_pwritev_part(
                             - offset_in_cluster);
         }
 
+        qemu_co_mutex_lock(&s->lock);
+
         ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,
                                          &cluster_offset, &l2meta);
         if (ret < 0) {
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_pwritev_part(
 
         qemu_co_mutex_unlock(&s->lock);
 
-        if (bs->encrypted) {
-            assert(s->crypto);
-            if (!cluster_data) {
-                cluster_data = qemu_try_blockalign(bs->file->bs,
-                                                   QCOW_MAX_CRYPT_CLUSTERS
-                                                   * s->cluster_size);
-                if (cluster_data == NULL) {
-                    ret = -ENOMEM;
-                    goto out_unlocked;
-                }
-            }
-
-            assert(cur_bytes <= QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size);
-            qemu_iovec_to_buf(qiov, qiov_offset + bytes_done,
-                              cluster_data, cur_bytes);
-
-            if (qcow2_co_encrypt(bs, cluster_offset + offset_in_cluster, offset,
-                                 cluster_data, cur_bytes) < 0) {
-                ret = -EIO;
-                goto out_unlocked;
-            }
-
-            qemu_iovec_init_buf(&encrypted_qiov, cluster_data, cur_bytes);
-        }
-
-        /* Try to efficiently initialize the physical space with zeroes */
-        ret = handle_alloc_space(bs, l2meta);
+        ret = qcow2_co_pwritev_task(bs, cluster_offset, offset, cur_bytes,
+                                    qiov, qiov_offset, l2meta);
+        l2meta = NULL; /* l2meta is consumed by qcow2_co_pwritev_task() */
         if (ret < 0) {
-            goto out_unlocked;
-        }
-
-        /* If we need to do COW, check if it's possible to merge the
-         * writing of the guest data together with that of the COW regions.
-         * If it's not possible (or not necessary) then write the
-         * guest data now. */
-        if (!merge_cow(offset, cur_bytes,
-                       bs->encrypted ? &encrypted_qiov : qiov,
-                       bs->encrypted ? 0 : qiov_offset + bytes_done, l2meta))
-        {
-            BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
-            trace_qcow2_writev_data(qemu_coroutine_self(),
-                                    cluster_offset + offset_in_cluster);
-            ret = bdrv_co_pwritev_part(
-                    s->data_file, cluster_offset + offset_in_cluster, cur_bytes,
-                    bs->encrypted ? &encrypted_qiov : qiov,
-                    bs->encrypted ? 0 : qiov_offset + bytes_done, 0);
-            if (ret < 0) {
-                goto out_unlocked;
-            }
-        }
-
-        qemu_co_mutex_lock(&s->lock);
-
-        ret = qcow2_handle_l2meta(bs, &l2meta, true);
-        if (ret) {
-            goto out_locked;
+            goto fail_nometa;
         }
 
         bytes -= cur_bytes;
         offset += cur_bytes;
-        bytes_done += cur_bytes;
+        qiov_offset += cur_bytes;
         trace_qcow2_writev_done_part(qemu_coroutine_self(), cur_bytes);
     }
     ret = 0;
-    goto out_locked;
 
-out_unlocked:
     qemu_co_mutex_lock(&s->lock);
 
 out_locked:
@@ -XXX,XX +XXX,XX @@ out_locked:
 
     qemu_co_mutex_unlock(&s->lock);
 
-    qemu_vfree(cluster_data);
+fail_nometa:
     trace_qcow2_writev_done_req(qemu_coroutine_self(), ret);
 
     return ret;
-- 
2.21.0

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

It improves performance for fragmented qcow2 images.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190916175324.18478-6-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2.h      |   3 ++
 block/qcow2.c      | 125 ++++++++++++++++++++++++++++++++++++++++-----
 block/trace-events |   1 +
 3 files changed, 117 insertions(+), 12 deletions(-)

diff --git a/block/qcow2.h b/block/qcow2.h
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -XXX,XX +XXX,XX @@
 #define QCOW2_MAX_BITMAPS 65535
 #define QCOW2_MAX_BITMAP_DIRECTORY_SIZE (1024 * QCOW2_MAX_BITMAPS)
 
+/* Maximum of parallel sub-request per guest request */
+#define QCOW2_MAX_WORKERS 8
+
 /* indicate that the refcount of the referenced cluster is exactly one. */
 #define QCOW_OFLAG_COPIED     (1ULL << 63)
 /* indicate that the cluster is compressed (they never have the copied flag) */
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 @@
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qapi-visit-block-core.h"
 #include "crypto.h"
+#include "block/aio_task.h"
 
 /*
   Differences with QCOW:
@@ -XXX,XX +XXX,XX @@ fail:
     return ret;
 }
 
+typedef struct Qcow2AioTask {
+    AioTask task;
+
+    BlockDriverState *bs;
+    QCow2ClusterType cluster_type; /* only for read */
+    uint64_t file_cluster_offset;
+    uint64_t offset;
+    uint64_t bytes;
+    QEMUIOVector *qiov;
+    uint64_t qiov_offset;
+    QCowL2Meta *l2meta; /* only for write */
+} Qcow2AioTask;
+
+static coroutine_fn int qcow2_co_preadv_task_entry(AioTask *task);
+static coroutine_fn int qcow2_add_task(BlockDriverState *bs,
+                                       AioTaskPool *pool,
+                                       AioTaskFunc func,
+                                       QCow2ClusterType cluster_type,
+                                       uint64_t file_cluster_offset,
+                                       uint64_t offset,
+                                       uint64_t bytes,
+                                       QEMUIOVector *qiov,
+                                       size_t qiov_offset,
+                                       QCowL2Meta *l2meta)
+{
+    Qcow2AioTask local_task;
+    Qcow2AioTask *task = pool ? g_new(Qcow2AioTask, 1) : &local_task;
+
+    *task = (Qcow2AioTask) {
+        .task.func = func,
+        .bs = bs,
+        .cluster_type = cluster_type,
+        .qiov = qiov,
+        .file_cluster_offset = file_cluster_offset,
+        .offset = offset,
+        .bytes = bytes,
+        .qiov_offset = qiov_offset,
+        .l2meta = l2meta,
+    };
+
+    trace_qcow2_add_task(qemu_coroutine_self(), bs, pool,
+                         func == qcow2_co_preadv_task_entry ? "read" : "write",
+                         cluster_type, file_cluster_offset, offset, bytes,
+                         qiov, qiov_offset);
+
+    if (!pool) {
+        return func(&task->task);
+    }
+
+    aio_task_pool_start_task(pool, &task->task);
+
+    return 0;
+}
+
 static coroutine_fn int qcow2_co_preadv_task(BlockDriverState *bs,
                                              QCow2ClusterType cluster_type,
                                              uint64_t file_cluster_offset,
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_task(BlockDriverState *bs,
     g_assert_not_reached();
 }
 
+static coroutine_fn int qcow2_co_preadv_task_entry(AioTask *task)
+{
+    Qcow2AioTask *t = container_of(task, Qcow2AioTask, task);
+
+    assert(!t->l2meta);
+
+    return qcow2_co_preadv_task(t->bs, t->cluster_type, t->file_cluster_offset,
+                                t->offset, t->bytes, t->qiov, t->qiov_offset);
+}
+
 static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
                                              uint64_t offset, uint64_t bytes,
                                              QEMUIOVector *qiov,
                                              size_t qiov_offset, int flags)
 {
     BDRVQcow2State *s = bs->opaque;
-    int ret;
+    int ret = 0;
     unsigned int cur_bytes; /* number of bytes in current iteration */
     uint64_t cluster_offset = 0;
+    AioTaskPool *aio = NULL;
 
-    while (bytes != 0) {
-
+    while (bytes != 0 && aio_task_pool_status(aio) == 0) {
         /* prepare next request */
         cur_bytes = MIN(bytes, INT_MAX);
         if (s->crypto) {
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
         ret = qcow2_get_cluster_offset(bs, offset, &cur_bytes, &cluster_offset);
         qemu_co_mutex_unlock(&s->lock);
         if (ret < 0) {
-            return ret;
+            goto out;
         }
 
         if (ret == QCOW2_CLUSTER_ZERO_PLAIN ||
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
         {
             qemu_iovec_memset(qiov, qiov_offset, 0, cur_bytes);
         } else {
-            ret = qcow2_co_preadv_task(bs, ret,
-                                       cluster_offset, offset, cur_bytes,
-                                       qiov, qiov_offset);
+            if (!aio && cur_bytes != bytes) {
+                aio = aio_task_pool_new(QCOW2_MAX_WORKERS);
+            }
+            ret = qcow2_add_task(bs, aio, qcow2_co_preadv_task_entry, ret,
+                                 cluster_offset, offset, cur_bytes,
+                                 qiov, qiov_offset, NULL);
             if (ret < 0) {
-                return ret;
+                goto out;
             }
         }
 
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
         qiov_offset += cur_bytes;
     }
 
-    return 0;
+out:
+    if (aio) {
+        aio_task_pool_wait_all(aio);
+        if (ret == 0) {
+            ret = aio_task_pool_status(aio);
+        }
+        g_free(aio);
+    }
+
+    return ret;
 }
 
 /* Check if it's possible to merge a write request with the writing of
@@ -XXX,XX +XXX,XX @@ out_locked:
     return ret;
 }
 
+static coroutine_fn int qcow2_co_pwritev_task_entry(AioTask *task)
+{
+    Qcow2AioTask *t = container_of(task, Qcow2AioTask, task);
+
+    assert(!t->cluster_type);
+
+    return qcow2_co_pwritev_task(t->bs, t->file_cluster_offset,
+                                 t->offset, t->bytes, t->qiov, t->qiov_offset,
+                                 t->l2meta);
+}
+
 static coroutine_fn int qcow2_co_pwritev_part(
         BlockDriverState *bs, uint64_t offset, uint64_t bytes,
         QEMUIOVector *qiov, size_t qiov_offset, int flags)
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_pwritev_part(
     unsigned int cur_bytes; /* number of sectors in current iteration */
     uint64_t cluster_offset;
     QCowL2Meta *l2meta = NULL;
+    AioTaskPool *aio = NULL;
 
     trace_qcow2_writev_start_req(qemu_coroutine_self(), offset, bytes);
 
-    while (bytes != 0) {
+    while (bytes != 0 && aio_task_pool_status(aio) == 0) {
 
         l2meta = NULL;
 
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_pwritev_part(
 
         qemu_co_mutex_unlock(&s->lock);
 
-        ret = qcow2_co_pwritev_task(bs, cluster_offset, offset, cur_bytes,
-                                    qiov, qiov_offset, l2meta);
+        if (!aio && cur_bytes != bytes) {
+            aio = aio_task_pool_new(QCOW2_MAX_WORKERS);
+        }
+        ret = qcow2_add_task(bs, aio, qcow2_co_pwritev_task_entry, 0,
+                             cluster_offset, offset, cur_bytes,
+                             qiov, qiov_offset, l2meta);
         l2meta = NULL; /* l2meta is consumed by qcow2_co_pwritev_task() */
         if (ret < 0) {
             goto fail_nometa;
@@ -XXX,XX +XXX,XX @@ out_locked:
     qemu_co_mutex_unlock(&s->lock);
 
 fail_nometa:
+    if (aio) {
+        aio_task_pool_wait_all(aio);
+        if (ret == 0) {
+            ret = aio_task_pool_status(aio);
+        }
+        g_free(aio);
+    }
+
     trace_qcow2_writev_done_req(qemu_coroutine_self(), ret);
 
     return ret;
diff --git a/block/trace-events b/block/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -XXX,XX +XXX,XX @@ file_paio_submit(void *acb, void *opaque, int64_t offset, int count, int type) "
 file_copy_file_range(void *bs, int src, int64_t src_off, int dst, int64_t dst_off, int64_t bytes, int flags, int64_t ret) "bs %p src_fd %d offset %"PRIu64" dst_fd %d offset %"PRIu64" bytes %"PRIu64" flags %d ret %"PRId64
 
 # qcow2.c
+qcow2_add_task(void *co, void *bs, void *pool, const char *action, int cluster_type, uint64_t file_cluster_offset, uint64_t offset, uint64_t bytes, void *qiov, size_t qiov_offset) "co %p bs %p pool %p: %s: cluster_type %d file_cluster_offset %" PRIu64 " offset %" PRIu64 " bytes %" PRIu64 " qiov %p qiov_offset %zu"
 qcow2_writev_start_req(void *co, int64_t offset, int bytes) "co %p offset 0x%" PRIx64 " bytes %d"
 qcow2_writev_done_req(void *co, int ret) "co %p ret %d"
 qcow2_writev_start_part(void *co) "co %p"
-- 
2.21.0

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

Of course, QEMU_ALIGN_UP is a typo, it should be QEMU_ALIGN_DOWN, as we
are trying to find aligned size which satisfy both source and target.
Also, don't ignore too small max_transfer. In this case seems safer to
disable copy_range.

Fixes: 9ded4a0114968e
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190920142056.12778-2-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/backup.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 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 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
     job->cluster_size = cluster_size;
     job->copy_bitmap = copy_bitmap;
     copy_bitmap = NULL;
-    job->use_copy_range = !compress; /* compression isn't supported for it */
     job->copy_range_size = MIN_NON_ZERO(blk_get_max_transfer(job->common.blk),
                                         blk_get_max_transfer(job->target));
-    job->copy_range_size = MAX(job->cluster_size,
-                               QEMU_ALIGN_UP(job->copy_range_size,
-                                             job->cluster_size));
+    job->copy_range_size = QEMU_ALIGN_DOWN(job->copy_range_size,
+                                           job->cluster_size);
+    /*
+     * Set use_copy_range, consider the following:
+     * 1. Compression is not supported for copy_range.
+     * 2. copy_range does not respect max_transfer (it's a TODO), so we factor
+     *    that in here. If max_transfer is smaller than the job->cluster_size,
+     *    we do not use copy_range (in that case it's zero after aligning down
+     *    above).
+     */
+    job->use_copy_range = !compress && job->copy_range_size > 0;
 
     /* Required permissions are already taken with target's blk_new() */
     block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
-- 
2.21.0

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

We shouldn't try to copy bytes beyond EOF. Fix it.

Fixes: 9ded4a0114968e
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20190920142056.12778-3-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/backup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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_offload(BackupBlockJob *job,
 
     assert(QEMU_IS_ALIGNED(job->copy_range_size, job->cluster_size));
     assert(QEMU_IS_ALIGNED(start, job->cluster_size));
-    nbytes = MIN(job->copy_range_size, end - start);
+    nbytes = MIN(job->copy_range_size, MIN(end, job->len) - start);
     nr_clusters = DIV_ROUND_UP(nbytes, job->cluster_size);
     bdrv_reset_dirty_bitmap(job->copy_bitmap, start,
                             job->cluster_size * nr_clusters);
-- 
2.21.0

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

Split copying logic which will be shared with backup-top filter.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190920142056.12778-4-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/backup.c | 47 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 15 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 int64_t backup_bitmap_reset_unallocated(BackupBlockJob *s,
     return ret;
 }
 
-static int coroutine_fn backup_do_cow(BackupBlockJob *job,
-                                      int64_t offset, uint64_t bytes,
-                                      bool *error_is_read,
-                                      bool is_write_notifier)
+static int coroutine_fn backup_do_copy(BackupBlockJob *job,
+                                       int64_t start, uint64_t bytes,
+                                       bool *error_is_read,
+                                       bool is_write_notifier)
 {
-    CowRequest cow_request;
     int ret = 0;
-    int64_t start, end; /* bytes */
+    int64_t end = bytes + start; /* bytes */
     void *bounce_buffer = NULL;
     int64_t status_bytes;
 
-    qemu_co_rwlock_rdlock(&job->flush_rwlock);
-
-    start = QEMU_ALIGN_DOWN(offset, job->cluster_size);
-    end = QEMU_ALIGN_UP(bytes + offset, job->cluster_size);
-
-    trace_backup_do_cow_enter(job, start, offset, bytes);
-
-    wait_for_overlapping_requests(job, start, end);
-    cow_request_begin(&cow_request, job, start, end);
+    assert(QEMU_IS_ALIGNED(start, job->cluster_size));
+    assert(QEMU_IS_ALIGNED(end, job->cluster_size));
 
     while (start < end) {
         int64_t dirty_end;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_cow(BackupBlockJob *job,
         qemu_vfree(bounce_buffer);
     }
 
+    return ret;
+}
+
+static int coroutine_fn backup_do_cow(BackupBlockJob *job,
+                                      int64_t offset, uint64_t bytes,
+                                      bool *error_is_read,
+                                      bool is_write_notifier)
+{
+    CowRequest cow_request;
+    int ret = 0;
+    int64_t start, end; /* bytes */
+
+    qemu_co_rwlock_rdlock(&job->flush_rwlock);
+
+    start = QEMU_ALIGN_DOWN(offset, job->cluster_size);
+    end = QEMU_ALIGN_UP(bytes + offset, job->cluster_size);
+
+    trace_backup_do_cow_enter(job, start, offset, bytes);
+
+    wait_for_overlapping_requests(job, start, end);
+    cow_request_begin(&cow_request, job, start, end);
+
+    ret = backup_do_copy(job, start, end - start, error_is_read,
+                         is_write_notifier);
+
     cow_request_end(&cow_request);
 
     trace_backup_do_cow_return(job, offset, bytes, ret);
-- 
2.21.0

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

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190920142056.12778-5-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/backup.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 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 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
     job->bitmap_mode = bitmap_mode;
 
     /*
-     * Set write flags:
-     * 1. Detect image-fleecing (and similar) schemes
-     * 2. Handle compression
+     * If source is in backing chain of target assume that target is going to be
+     * used for "image fleecing", i.e. it should represent a kind of snapshot of
+     * source at backup-start point in time. And target is going to be read by
+     * somebody (for example, used as NBD export) during backup job.
+     *
+     * In this case, we need to add BDRV_REQ_SERIALISING write flag to avoid
+     * intersection of backup writes and third party reads from target,
+     * otherwise reading from target we may occasionally read already updated by
+     * guest data.
+     *
+     * For more information see commit f8d59dfb40bb and test
+     * tests/qemu-iotests/222
      */
     job->write_flags =
         (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0) |
-- 
2.21.0

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

Split copying code part from backup to "block-copy", including separate
state structure and function renaming. This is needed to share it with
backup-top filter driver in further commits.

Notes:

1. As BlockCopyState keeps own BlockBackend objects, remaining
job->common.blk users only use it to get bs by blk_bs() call, so clear
job->commen.blk permissions set in block_job_create and add
job->source_bs to be used instead of blk_bs(job->common.blk), to keep
it more clear which bs we use when introduce backup-top filter in
further commit.

2. Rename s/initializing_bitmap/skip_unallocated/ to sound a bit better
as interface to BlockCopyState

3. Split is not very clean: there left some duplicated fields, backup
code uses some BlockCopyState fields directly, let's postpone it for
further improvements and keep this comment simpler for review.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190920142056.12778-6-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/backup.c     | 370 ++++++++++++++++++++++++++++-----------------
 block/trace-events |  12 +-
 2 files changed, 239 insertions(+), 143 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 @@ typedef struct CowRequest {
     CoQueue wait_queue; /* coroutines blocked on this request */
 } CowRequest;
 
+typedef void (*ProgressBytesCallbackFunc)(int64_t bytes, void *opaque);
+typedef void (*ProgressResetCallbackFunc)(void *opaque);
+typedef struct BlockCopyState {
+    BlockBackend *source;
+    BlockBackend *target;
+    BdrvDirtyBitmap *copy_bitmap;
+    int64_t cluster_size;
+    bool use_copy_range;
+    int64_t copy_range_size;
+    uint64_t len;
+
+    BdrvRequestFlags write_flags;
+
+    /*
+     * skip_unallocated:
+     *
+     * Used by sync=top jobs, which first scan the source node for unallocated
+     * areas and clear them in the copy_bitmap.  During this process, the bitmap
+     * is thus not fully initialized: It may still have bits set for areas that
+     * are unallocated and should actually not be copied.
+     *
+     * This is indicated by skip_unallocated.
+     *
+     * In this case, block_copy() will query the source’s allocation status,
+     * skip unallocated regions, clear them in the copy_bitmap, and invoke
+     * block_copy_reset_unallocated() every time it does.
+     */
+    bool skip_unallocated;
+
+    /* progress_bytes_callback: called when some copying progress is done. */
+    ProgressBytesCallbackFunc progress_bytes_callback;
+
+    /*
+     * progress_reset_callback: called when some bytes reset from copy_bitmap
+     * (see @skip_unallocated above). The callee is assumed to recalculate how
+     * many bytes remain based on the dirty bit count of copy_bitmap.
+     */
+    ProgressResetCallbackFunc progress_reset_callback;
+    void *progress_opaque;
+} BlockCopyState;
+
 typedef struct BackupBlockJob {
     BlockJob common;
-    BlockBackend *target;
+    BlockDriverState *source_bs;
 
     BdrvDirtyBitmap *sync_bitmap;
-    BdrvDirtyBitmap *copy_bitmap;
 
     MirrorSyncMode sync_mode;
     BitmapSyncMode bitmap_mode;
@@ -XXX,XX +XXX,XX @@ typedef struct BackupBlockJob {
     NotifierWithReturn before_write;
     QLIST_HEAD(, CowRequest) inflight_reqs;
 
-    bool use_copy_range;
-    int64_t copy_range_size;
-
-    BdrvRequestFlags write_flags;
-    bool initializing_bitmap;
+    BlockCopyState *bcs;
 } BackupBlockJob;
 
 static const BlockJobDriver backup_job_driver;
@@ -XXX,XX +XXX,XX @@ static void cow_request_end(CowRequest *req)
     qemu_co_queue_restart_all(&req->wait_queue);
 }
 
+static void block_copy_state_free(BlockCopyState *s)
+{
+    if (!s) {
+        return;
+    }
+
+    bdrv_release_dirty_bitmap(blk_bs(s->source), s->copy_bitmap);
+    blk_unref(s->source);
+    blk_unref(s->target);
+    g_free(s);
+}
+
+static BlockCopyState *block_copy_state_new(
+        BlockDriverState *source, BlockDriverState *target,
+        int64_t cluster_size, BdrvRequestFlags write_flags,
+        ProgressBytesCallbackFunc progress_bytes_callback,
+        ProgressResetCallbackFunc progress_reset_callback,
+        void *progress_opaque, Error **errp)
+{
+    BlockCopyState *s;
+    int ret;
+    uint64_t no_resize = BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE |
+                         BLK_PERM_WRITE_UNCHANGED | BLK_PERM_GRAPH_MOD;
+    BdrvDirtyBitmap *copy_bitmap;
+
+    copy_bitmap = bdrv_create_dirty_bitmap(source, cluster_size, NULL, errp);
+    if (!copy_bitmap) {
+        return NULL;
+    }
+    bdrv_disable_dirty_bitmap(copy_bitmap);
+
+    s = g_new(BlockCopyState, 1);
+    *s = (BlockCopyState) {
+        .source = blk_new(bdrv_get_aio_context(source),
+                          BLK_PERM_CONSISTENT_READ, no_resize),
+        .target = blk_new(bdrv_get_aio_context(target),
+                          BLK_PERM_WRITE, no_resize),
+        .copy_bitmap = copy_bitmap,
+        .cluster_size = cluster_size,
+        .len = bdrv_dirty_bitmap_size(copy_bitmap),
+        .write_flags = write_flags,
+        .progress_bytes_callback = progress_bytes_callback,
+        .progress_reset_callback = progress_reset_callback,
+        .progress_opaque = progress_opaque,
+    };
+
+    s->copy_range_size = QEMU_ALIGN_DOWN(MIN(blk_get_max_transfer(s->source),
+                                             blk_get_max_transfer(s->target)),
+                                         s->cluster_size);
+    /*
+     * Set use_copy_range, consider the following:
+     * 1. Compression is not supported for copy_range.
+     * 2. copy_range does not respect max_transfer (it's a TODO), so we factor
+     *    that in here. If max_transfer is smaller than the job->cluster_size,
+     *    we do not use copy_range (in that case it's zero after aligning down
+     *    above).
+     */
+    s->use_copy_range =
+        !(write_flags & BDRV_REQ_WRITE_COMPRESSED) && s->copy_range_size > 0;
+
+    /*
+     * We just allow aio context change on our block backends. block_copy() user
+     * (now it's only backup) is responsible for source and target being in same
+     * aio context.
+     */
+    blk_set_disable_request_queuing(s->source, true);
+    blk_set_allow_aio_context_change(s->source, true);
+    blk_set_disable_request_queuing(s->target, true);
+    blk_set_allow_aio_context_change(s->target, true);
+
+    ret = blk_insert_bs(s->source, source, errp);
+    if (ret < 0) {
+        goto fail;
+    }
+
+    ret = blk_insert_bs(s->target, target, errp);
+    if (ret < 0) {
+        goto fail;
+    }
+
+    return s;
+
+fail:
+    block_copy_state_free(s);
+
+    return NULL;
+}
+
 /* Copy range to target with a bounce buffer and return the bytes copied. If
  * error occurred, return a negative error number */
-static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
+static int coroutine_fn block_copy_with_bounce_buffer(BlockCopyState *s,
                                                       int64_t start,
                                                       int64_t end,
                                                       bool is_write_notifier,
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
                                                       void **bounce_buffer)
 {
     int ret;
-    BlockBackend *blk = job->common.blk;
     int nbytes;
     int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
 
-    assert(QEMU_IS_ALIGNED(start, job->cluster_size));
-    bdrv_reset_dirty_bitmap(job->copy_bitmap, start, job->cluster_size);
-    nbytes = MIN(job->cluster_size, job->len - start);
+    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
+    bdrv_reset_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
+    nbytes = MIN(s->cluster_size, s->len - start);
     if (!*bounce_buffer) {
-        *bounce_buffer = blk_blockalign(blk, job->cluster_size);
+        *bounce_buffer = blk_blockalign(s->source, s->cluster_size);
     }
 
-    ret = blk_co_pread(blk, start, nbytes, *bounce_buffer, read_flags);
+    ret = blk_co_pread(s->source, start, nbytes, *bounce_buffer, read_flags);
     if (ret < 0) {
-        trace_backup_do_cow_read_fail(job, start, ret);
+        trace_block_copy_with_bounce_buffer_read_fail(s, start, ret);
         if (error_is_read) {
             *error_is_read = true;
         }
         goto fail;
     }
 
-    ret = blk_co_pwrite(job->target, start, nbytes, *bounce_buffer,
-                        job->write_flags);
+    ret = blk_co_pwrite(s->target, start, nbytes, *bounce_buffer,
+                        s->write_flags);
     if (ret < 0) {
-        trace_backup_do_cow_write_fail(job, start, ret);
+        trace_block_copy_with_bounce_buffer_write_fail(s, start, ret);
         if (error_is_read) {
             *error_is_read = false;
         }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
 
     return nbytes;
 fail:
-    bdrv_set_dirty_bitmap(job->copy_bitmap, start, job->cluster_size);
+    bdrv_set_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
     return ret;
 
 }
 
 /* Copy range to target and return the bytes copied. If error occurred, return a
  * negative error number. */
-static int coroutine_fn backup_cow_with_offload(BackupBlockJob *job,
+static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
                                                 int64_t start,
                                                 int64_t end,
                                                 bool is_write_notifier)
 {
     int ret;
     int nr_clusters;
-    BlockBackend *blk = job->common.blk;
     int nbytes;
     int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
 
-    assert(QEMU_IS_ALIGNED(job->copy_range_size, job->cluster_size));
-    assert(QEMU_IS_ALIGNED(start, job->cluster_size));
-    nbytes = MIN(job->copy_range_size, MIN(end, job->len) - start);
-    nr_clusters = DIV_ROUND_UP(nbytes, job->cluster_size);
-    bdrv_reset_dirty_bitmap(job->copy_bitmap, start,
-                            job->cluster_size * nr_clusters);
-    ret = blk_co_copy_range(blk, start, job->target, start, nbytes,
-                            read_flags, job->write_flags);
+    assert(QEMU_IS_ALIGNED(s->copy_range_size, s->cluster_size));
+    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
+    nbytes = MIN(s->copy_range_size, MIN(end, s->len) - start);
+    nr_clusters = DIV_ROUND_UP(nbytes, s->cluster_size);
+    bdrv_reset_dirty_bitmap(s->copy_bitmap, start,
+                            s->cluster_size * nr_clusters);
+    ret = blk_co_copy_range(s->source, start, s->target, start, nbytes,
+                            read_flags, s->write_flags);
     if (ret < 0) {
-        trace_backup_do_cow_copy_range_fail(job, start, ret);
-        bdrv_set_dirty_bitmap(job->copy_bitmap, start,
-                              job->cluster_size * nr_clusters);
+        trace_block_copy_with_offload_fail(s, start, ret);
+        bdrv_set_dirty_bitmap(s->copy_bitmap, start,
+                              s->cluster_size * nr_clusters);
         return ret;
     }
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_offload(BackupBlockJob *job,
  * Check if the cluster starting at offset is allocated or not.
  * return via pnum the number of contiguous clusters sharing this allocation.
  */
-static int backup_is_cluster_allocated(BackupBlockJob *s, int64_t offset,
-                                       int64_t *pnum)
+static int block_copy_is_cluster_allocated(BlockCopyState *s, int64_t offset,
+                                           int64_t *pnum)
 {
-    BlockDriverState *bs = blk_bs(s->common.blk);
+    BlockDriverState *bs = blk_bs(s->source);
     int64_t count, total_count = 0;
     int64_t bytes = s->len - offset;
     int ret;
@@ -XXX,XX +XXX,XX @@ static int backup_is_cluster_allocated(BackupBlockJob *s, int64_t offset,
  * @return 0 when the cluster at @offset was unallocated,
  *         1 otherwise, and -ret on error.
  */
-static int64_t backup_bitmap_reset_unallocated(BackupBlockJob *s,
-                                               int64_t offset, int64_t *count)
+static int64_t block_copy_reset_unallocated(BlockCopyState *s,
+                                            int64_t offset, int64_t *count)
 {
     int ret;
-    int64_t clusters, bytes, estimate;
+    int64_t clusters, bytes;
 
-    ret = backup_is_cluster_allocated(s, offset, &clusters);
+    ret = block_copy_is_cluster_allocated(s, offset, &clusters);
     if (ret < 0) {
         return ret;
     }
@@ -XXX,XX +XXX,XX @@ static int64_t backup_bitmap_reset_unallocated(BackupBlockJob *s,
 
     if (!ret) {
         bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes);
-        estimate = bdrv_get_dirty_count(s->copy_bitmap);
-        job_progress_set_remaining(&s->common.job, estimate);
+        s->progress_reset_callback(s->progress_opaque);
     }
 
     *count = bytes;
     return ret;
 }
 
-static int coroutine_fn backup_do_copy(BackupBlockJob *job,
-                                       int64_t start, uint64_t bytes,
-                                       bool *error_is_read,
-                                       bool is_write_notifier)
+static int coroutine_fn block_copy(BlockCopyState *s,
+                                   int64_t start, uint64_t bytes,
+                                   bool *error_is_read,
+                                   bool is_write_notifier)
 {
     int ret = 0;
     int64_t end = bytes + start; /* bytes */
     void *bounce_buffer = NULL;
     int64_t status_bytes;
 
-    assert(QEMU_IS_ALIGNED(start, job->cluster_size));
-    assert(QEMU_IS_ALIGNED(end, job->cluster_size));
+    /*
+     * block_copy() user is responsible for keeping source and target in same
+     * aio context
+     */
+    assert(blk_get_aio_context(s->source) == blk_get_aio_context(s->target));
+
+    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
+    assert(QEMU_IS_ALIGNED(end, s->cluster_size));
 
     while (start < end) {
         int64_t dirty_end;
 
-        if (!bdrv_dirty_bitmap_get(job->copy_bitmap, start)) {
-            trace_backup_do_cow_skip(job, start);
-            start += job->cluster_size;
+        if (!bdrv_dirty_bitmap_get(s->copy_bitmap, start)) {
+            trace_block_copy_skip(s, start);
+            start += s->cluster_size;
             continue; /* already copied */
         }
 
-        dirty_end = bdrv_dirty_bitmap_next_zero(job->copy_bitmap, start,
+        dirty_end = bdrv_dirty_bitmap_next_zero(s->copy_bitmap, start,
                                                 (end - start));
         if (dirty_end < 0) {
             dirty_end = end;
         }
 
-        if (job->initializing_bitmap) {
-            ret = backup_bitmap_reset_unallocated(job, start, &status_bytes);
+        if (s->skip_unallocated) {
+            ret = block_copy_reset_unallocated(s, start, &status_bytes);
             if (ret == 0) {
-                trace_backup_do_cow_skip_range(job, start, status_bytes);
+                trace_block_copy_skip_range(s, start, status_bytes);
                 start += status_bytes;
                 continue;
             }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_copy(BackupBlockJob *job,
             dirty_end = MIN(dirty_end, start + status_bytes);
         }
 
-        trace_backup_do_cow_process(job, start);
+        trace_block_copy_process(s, start);
 
-        if (job->use_copy_range) {
-            ret = backup_cow_with_offload(job, start, dirty_end,
+        if (s->use_copy_range) {
+            ret = block_copy_with_offload(s, start, dirty_end,
                                           is_write_notifier);
             if (ret < 0) {
-                job->use_copy_range = false;
+                s->use_copy_range = false;
             }
         }
-        if (!job->use_copy_range) {
-            ret = backup_cow_with_bounce_buffer(job, start, dirty_end,
+        if (!s->use_copy_range) {
+            ret = block_copy_with_bounce_buffer(s, start, dirty_end,
                                                 is_write_notifier,
                                                 error_is_read, &bounce_buffer);
         }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_copy(BackupBlockJob *job,
             break;
         }
 
-        /* Publish progress, guest I/O counts as progress too.  Note that the
-         * offset field is an opaque progress value, it is not a disk offset.
-         */
         start += ret;
-        job->bytes_read += ret;
-        job_progress_update(&job->common.job, ret);
+        s->progress_bytes_callback(ret, s->progress_opaque);
         ret = 0;
     }
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_copy(BackupBlockJob *job,
     return ret;
 }
 
+static void backup_progress_bytes_callback(int64_t bytes, void *opaque)
+{
+    BackupBlockJob *s = opaque;
+
+    s->bytes_read += bytes;
+    job_progress_update(&s->common.job, bytes);
+}
+
+static void backup_progress_reset_callback(void *opaque)
+{
+    BackupBlockJob *s = opaque;
+    uint64_t estimate = bdrv_get_dirty_count(s->bcs->copy_bitmap);
+
+    job_progress_set_remaining(&s->common.job, estimate);
+}
+
 static int coroutine_fn backup_do_cow(BackupBlockJob *job,
                                       int64_t offset, uint64_t bytes,
                                       bool *error_is_read,
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_cow(BackupBlockJob *job,
     wait_for_overlapping_requests(job, start, end);
     cow_request_begin(&cow_request, job, start, end);
 
-    ret = backup_do_copy(job, start, end - start, error_is_read,
-                         is_write_notifier);
+    ret = block_copy(job->bcs, start, end - start, error_is_read,
+                     is_write_notifier);
 
     cow_request_end(&cow_request);
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_before_write_notify(
     BackupBlockJob *job = container_of(notifier, BackupBlockJob, before_write);
     BdrvTrackedRequest *req = opaque;
 
-    assert(req->bs == blk_bs(job->common.blk));
+    assert(req->bs == job->source_bs);
     assert(QEMU_IS_ALIGNED(req->offset, BDRV_SECTOR_SIZE));
     assert(QEMU_IS_ALIGNED(req->bytes, BDRV_SECTOR_SIZE));
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_before_write_notify(
 static void backup_cleanup_sync_bitmap(BackupBlockJob *job, int ret)
 {
     BdrvDirtyBitmap *bm;
-    BlockDriverState *bs = blk_bs(job->common.blk);
     bool sync = (((ret == 0) || (job->bitmap_mode == BITMAP_SYNC_MODE_ALWAYS)) \
                  && (job->bitmap_mode != BITMAP_SYNC_MODE_NEVER));
 
@@ -XXX,XX +XXX,XX @@ static void backup_cleanup_sync_bitmap(BackupBlockJob *job, int ret)
          * We succeeded, or we always intended to sync the bitmap.
          * Delete this bitmap and install the child.
          */
-        bm = bdrv_dirty_bitmap_abdicate(bs, job->sync_bitmap, NULL);
+        bm = bdrv_dirty_bitmap_abdicate(job->source_bs, job->sync_bitmap, NULL);
     } else {
         /*
          * We failed, or we never intended to sync the bitmap anyway.
          * Merge the successor back into the parent, keeping all data.
          */
-        bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
+        bm = bdrv_reclaim_dirty_bitmap(job->source_bs, job->sync_bitmap, NULL);
     }
 
     assert(bm);
 
     if (ret < 0 && job->bitmap_mode == BITMAP_SYNC_MODE_ALWAYS) {
         /* If we failed and synced, merge in the bits we didn't copy: */
-        bdrv_dirty_bitmap_merge_internal(bm, job->copy_bitmap,
+        bdrv_dirty_bitmap_merge_internal(bm, job->bcs->copy_bitmap,
                                          NULL, true);
     }
 }
@@ -XXX,XX +XXX,XX @@ static void backup_abort(Job *job)
 static void backup_clean(Job *job)
 {
     BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);
-    BlockDriverState *bs = blk_bs(s->common.blk);
 
-    if (s->copy_bitmap) {
-        bdrv_release_dirty_bitmap(bs, s->copy_bitmap);
-        s->copy_bitmap = NULL;
-    }
-
-    assert(s->target);
-    blk_unref(s->target);
-    s->target = NULL;
+    block_copy_state_free(s->bcs);
 }
 
 void backup_do_checkpoint(BlockJob *job, Error **errp)
@@ -XXX,XX +XXX,XX @@ void backup_do_checkpoint(BlockJob *job, Error **errp)
         return;
     }
 
-    bdrv_set_dirty_bitmap(backup_job->copy_bitmap, 0, backup_job->len);
+    bdrv_set_dirty_bitmap(backup_job->bcs->copy_bitmap, 0, backup_job->len);
 }
 
 static BlockErrorAction backup_error_action(BackupBlockJob *job,
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_loop(BackupBlockJob *job)
     BdrvDirtyBitmapIter *bdbi;
     int ret = 0;
 
-    bdbi = bdrv_dirty_iter_new(job->copy_bitmap);
+    bdbi = bdrv_dirty_iter_new(job->bcs->copy_bitmap);
     while ((offset = bdrv_dirty_iter_next(bdbi)) != -1) {
         do {
             if (yield_and_check(job)) {
@@ -XXX,XX +XXX,XX @@ static void backup_init_copy_bitmap(BackupBlockJob *job)
     uint64_t estimate;
 
     if (job->sync_mode == MIRROR_SYNC_MODE_BITMAP) {
-        ret = bdrv_dirty_bitmap_merge_internal(job->copy_bitmap,
+        ret = bdrv_dirty_bitmap_merge_internal(job->bcs->copy_bitmap,
                                                job->sync_bitmap,
                                                NULL, true);
         assert(ret);
@@ -XXX,XX +XXX,XX @@ static void backup_init_copy_bitmap(BackupBlockJob *job)
              * We can't hog the coroutine to initialize this thoroughly.
              * Set a flag and resume work when we are able to yield safely.
              */
-            job->initializing_bitmap = true;
+            job->bcs->skip_unallocated = true;
         }
-        bdrv_set_dirty_bitmap(job->copy_bitmap, 0, job->len);
+        bdrv_set_dirty_bitmap(job->bcs->copy_bitmap, 0, job->len);
     }
 
-    estimate = bdrv_get_dirty_count(job->copy_bitmap);
+    estimate = bdrv_get_dirty_count(job->bcs->copy_bitmap);
     job_progress_set_remaining(&job->common.job, estimate);
 }
 
 static int coroutine_fn backup_run(Job *job, Error **errp)
 {
     BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);
-    BlockDriverState *bs = blk_bs(s->common.blk);
     int ret = 0;
 
     QLIST_INIT(&s->inflight_reqs);
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_run(Job *job, Error **errp)
     backup_init_copy_bitmap(s);
 
     s->before_write.notify = backup_before_write_notify;
-    bdrv_add_before_write_notifier(bs, &s->before_write);
+    bdrv_add_before_write_notifier(s->source_bs, &s->before_write);
 
     if (s->sync_mode == MIRROR_SYNC_MODE_TOP) {
         int64_t offset = 0;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_run(Job *job, Error **errp)
                 goto out;
             }
 
-            ret = backup_bitmap_reset_unallocated(s, offset, &count);
+            ret = block_copy_reset_unallocated(s->bcs, offset, &count);
             if (ret < 0) {
                 goto out;
             }
 
             offset += count;
         }
-        s->initializing_bitmap = false;
+        s->bcs->skip_unallocated = false;
     }
 
     if (s->sync_mode == MIRROR_SYNC_MODE_NONE) {
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
 {
     int64_t len;
     BackupBlockJob *job = NULL;
-    int ret;
     int64_t cluster_size;
-    BdrvDirtyBitmap *copy_bitmap = NULL;
+    BdrvRequestFlags write_flags;
 
     assert(bs);
     assert(target);
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
         goto error;
     }
 
-    copy_bitmap = bdrv_create_dirty_bitmap(bs, cluster_size, NULL, errp);
-    if (!copy_bitmap) {
-        goto error;
-    }
-    bdrv_disable_dirty_bitmap(copy_bitmap);
-
     /* job->len is fixed, so we can't allow resize */
-    job = block_job_create(job_id, &backup_job_driver, txn, bs,
-                           BLK_PERM_CONSISTENT_READ,
-                           BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE |
-                           BLK_PERM_WRITE_UNCHANGED | BLK_PERM_GRAPH_MOD,
+    job = block_job_create(job_id, &backup_job_driver, txn, bs, 0, BLK_PERM_ALL,
                            speed, creation_flags, cb, opaque, errp);
     if (!job) {
         goto error;
     }
 
-    /* The target must match the source in size, so no resize here either */
-    job->target = blk_new(job->common.job.aio_context,
-                          BLK_PERM_WRITE,
-                          BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE |
-                          BLK_PERM_WRITE_UNCHANGED | BLK_PERM_GRAPH_MOD);
-    ret = blk_insert_bs(job->target, target, errp);
-    if (ret < 0) {
-        goto error;
-    }
-    blk_set_disable_request_queuing(job->target, true);
-
+    job->source_bs = bs;
     job->on_source_error = on_source_error;
     job->on_target_error = on_target_error;
     job->sync_mode = sync_mode;
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
      * For more information see commit f8d59dfb40bb and test
      * tests/qemu-iotests/222
      */
-    job->write_flags =
-        (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0) |
-        (compress ? BDRV_REQ_WRITE_COMPRESSED : 0);
+    write_flags = (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0) |
+                  (compress ? BDRV_REQ_WRITE_COMPRESSED : 0),
+
+    job->bcs = block_copy_state_new(bs, target, cluster_size, write_flags,
+                                    backup_progress_bytes_callback,
+                                    backup_progress_reset_callback, job, errp);
+    if (!job->bcs) {
+        goto error;
+    }
 
     job->cluster_size = cluster_size;
-    job->copy_bitmap = copy_bitmap;
-    copy_bitmap = NULL;
-    job->copy_range_size = MIN_NON_ZERO(blk_get_max_transfer(job->common.blk),
-                                        blk_get_max_transfer(job->target));
-    job->copy_range_size = QEMU_ALIGN_DOWN(job->copy_range_size,
-                                           job->cluster_size);
-    /*
-     * Set use_copy_range, consider the following:
-     * 1. Compression is not supported for copy_range.
-     * 2. copy_range does not respect max_transfer (it's a TODO), so we factor
-     *    that in here. If max_transfer is smaller than the job->cluster_size,
-     *    we do not use copy_range (in that case it's zero after aligning down
-     *    above).
-     */
-    job->use_copy_range = !compress && job->copy_range_size > 0;
 
-    /* Required permissions are already taken with target's blk_new() */
+    /* Required permissions are already taken by block-copy-state target */
     block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
                        &error_abort);
     job->len = len;
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
     return &job->common;
 
  error:
-    if (copy_bitmap) {
-        assert(!job || !job->copy_bitmap);
-        bdrv_release_dirty_bitmap(bs, copy_bitmap);
-    }
     if (sync_bitmap) {
         bdrv_reclaim_dirty_bitmap(bs, sync_bitmap, NULL);
     }
diff --git a/block/trace-events b/block/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -XXX,XX +XXX,XX @@ mirror_yield_in_flight(void *s, int64_t offset, int in_flight) "s %p offset %" P
 # backup.c
 backup_do_cow_enter(void *job, int64_t start, int64_t offset, uint64_t bytes) "job %p start %" PRId64 " offset %" PRId64 " bytes %" PRIu64
 backup_do_cow_return(void *job, int64_t offset, uint64_t bytes, int ret) "job %p offset %" PRId64 " bytes %" PRIu64 " ret %d"
-backup_do_cow_skip(void *job, int64_t start) "job %p start %"PRId64
-backup_do_cow_skip_range(void *job, int64_t start, uint64_t bytes) "job %p start %"PRId64" bytes %"PRId64
-backup_do_cow_process(void *job, int64_t start) "job %p start %"PRId64
-backup_do_cow_read_fail(void *job, int64_t start, int ret) "job %p start %"PRId64" ret %d"
-backup_do_cow_write_fail(void *job, int64_t start, int ret) "job %p start %"PRId64" ret %d"
-backup_do_cow_copy_range_fail(void *job, int64_t start, int ret) "job %p start %"PRId64" ret %d"
+block_copy_skip(void *bcs, int64_t start) "bcs %p start %"PRId64
+block_copy_skip_range(void *bcs, int64_t start, uint64_t bytes) "bcs %p start %"PRId64" bytes %"PRId64
+block_copy_process(void *bcs, int64_t start) "bcs %p start %"PRId64
+block_copy_with_bounce_buffer_read_fail(void *bcs, int64_t start, int ret) "bcs %p start %"PRId64" ret %d"
+block_copy_with_bounce_buffer_write_fail(void *bcs, int64_t start, int ret) "bcs %p start %"PRId64" ret %d"
+block_copy_with_offload_fail(void *bcs, int64_t start, int ret) "bcs %p start %"PRId64" ret %d"
 
 # ../blockdev.c
 qmp_block_job_cancel(void *job) "job %p"
-- 
2.21.0

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

We need to fix comment style around block-copy functions before further
moving them to separate file to satisfy checkpatch. But do more: fix
all comments style. Also, seems like doubled first asterisk is not
forbidden, but drop it too for consistency.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190920142056.12778-7-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/backup.c | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 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 @@ fail:
     return NULL;
 }
 
-/* Copy range to target with a bounce buffer and return the bytes copied. If
- * error occurred, return a negative error number */
+/*
+ * Copy range to target with a bounce buffer and return the bytes copied. If
+ * error occurred, return a negative error number
+ */
 static int coroutine_fn block_copy_with_bounce_buffer(BlockCopyState *s,
                                                       int64_t start,
                                                       int64_t end,
@@ -XXX,XX +XXX,XX @@ fail:
 
 }
 
-/* Copy range to target and return the bytes copied. If error occurred, return a
- * negative error number. */
+/*
+ * Copy range to target and return the bytes copied. If error occurred, return a
+ * negative error number.
+ */
 static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
                                                 int64_t start,
                                                 int64_t end,
@@ -XXX,XX +XXX,XX @@ static int block_copy_is_cluster_allocated(BlockCopyState *s, int64_t offset,
     }
 }
 
-/**
+/*
  * Reset bits in copy_bitmap starting at offset if they represent unallocated
  * data in the image. May reset subsequent contiguous bits.
  * @return 0 when the cluster at @offset was unallocated,
@@ -XXX,XX +XXX,XX @@ static bool coroutine_fn yield_and_check(BackupBlockJob *job)
         return true;
     }
 
-    /* We need to yield even for delay_ns = 0 so that bdrv_drain_all() can
-     * return. Without a yield, the VM would not reboot. */
+    /*
+     * We need to yield even for delay_ns = 0 so that bdrv_drain_all() can
+     * return. Without a yield, the VM would not reboot.
+     */
     delay_ns = block_job_ratelimit_get_delay(&job->common, job->bytes_read);
     job->bytes_read = 0;
     job_sleep_ns(&job->common.job, delay_ns);
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_run(Job *job, Error **errp)
     }
 
     if (s->sync_mode == MIRROR_SYNC_MODE_NONE) {
-        /* All bits are set in copy_bitmap to allow any cluster to be copied.
-         * This does not actually require them to be copied. */
+        /*
+         * All bits are set in copy_bitmap to allow any cluster to be copied.
+         * This does not actually require them to be copied.
+         */
         while (!job_is_cancelled(job)) {
-            /* Yield until the job is cancelled.  We just let our before_write
-             * notify callback service CoW requests. */
+            /*
+             * Yield until the job is cancelled.  We just let our before_write
+             * notify callback service CoW requests.
+             */
             job_yield(job);
         }
     } else {
-- 
2.21.0

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

Split block_copy to separate file, to be cleanly shared with backup-top
filter driver in further commits.

It's a clean movement, the only change is drop "static" from interface
functions.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190920142056.12778-8-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/Makefile.objs        |   1 +
 include/block/block-copy.h |  76 ++++++++
 block/backup.c             | 355 +------------------------------------
 block/block-copy.c         | 333 ++++++++++++++++++++++++++++++++++
 block/trace-events         |   2 +
 5 files changed, 413 insertions(+), 354 deletions(-)
 create mode 100644 include/block/block-copy.h
 create mode 100644 block/block-copy.c

diff --git a/block/Makefile.objs b/block/Makefile.objs
index XXXXXXX..XXXXXXX 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -XXX,XX +XXX,XX @@ block-obj-y += write-threshold.o
 block-obj-y += backup.o
 block-obj-$(CONFIG_REPLICATION) += replication.o
 block-obj-y += throttle.o copy-on-read.o
+block-obj-y += block-copy.o
 
 block-obj-y += crypto.o
 
diff --git a/include/block/block-copy.h b/include/block/block-copy.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/include/block/block-copy.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * block_copy API
+ *
+ * Copyright (C) 2013 Proxmox Server Solutions
+ * Copyright (c) 2019 Virtuozzo International GmbH.
+ *
+ * Authors:
+ *  Dietmar Maurer (dietmar@proxmox.com)
+ *  Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef BLOCK_COPY_H
+#define BLOCK_COPY_H
+
+#include "block/block.h"
+
+typedef void (*ProgressBytesCallbackFunc)(int64_t bytes, void *opaque);
+typedef void (*ProgressResetCallbackFunc)(void *opaque);
+typedef struct BlockCopyState {
+    BlockBackend *source;
+    BlockBackend *target;
+    BdrvDirtyBitmap *copy_bitmap;
+    int64_t cluster_size;
+    bool use_copy_range;
+    int64_t copy_range_size;
+    uint64_t len;
+
+    BdrvRequestFlags write_flags;
+
+    /*
+     * skip_unallocated:
+     *
+     * Used by sync=top jobs, which first scan the source node for unallocated
+     * areas and clear them in the copy_bitmap.  During this process, the bitmap
+     * is thus not fully initialized: It may still have bits set for areas that
+     * are unallocated and should actually not be copied.
+     *
+     * This is indicated by skip_unallocated.
+     *
+     * In this case, block_copy() will query the source’s allocation status,
+     * skip unallocated regions, clear them in the copy_bitmap, and invoke
+     * block_copy_reset_unallocated() every time it does.
+     */
+    bool skip_unallocated;
+
+    /* progress_bytes_callback: called when some copying progress is done. */
+    ProgressBytesCallbackFunc progress_bytes_callback;
+
+    /*
+     * progress_reset_callback: called when some bytes reset from copy_bitmap
+     * (see @skip_unallocated above). The callee is assumed to recalculate how
+     * many bytes remain based on the dirty bit count of copy_bitmap.
+     */
+    ProgressResetCallbackFunc progress_reset_callback;
+    void *progress_opaque;
+} BlockCopyState;
+
+BlockCopyState *block_copy_state_new(
+        BlockDriverState *source, BlockDriverState *target,
+        int64_t cluster_size, BdrvRequestFlags write_flags,
+        ProgressBytesCallbackFunc progress_bytes_callback,
+        ProgressResetCallbackFunc progress_reset_callback,
+        void *progress_opaque, Error **errp);
+
+void block_copy_state_free(BlockCopyState *s);
+
+int64_t block_copy_reset_unallocated(BlockCopyState *s,
+                                     int64_t offset, int64_t *count);
+
+int coroutine_fn block_copy(BlockCopyState *s, int64_t start, uint64_t bytes,
+                            bool *error_is_read, bool is_write_notifier);
+
+#endif /* BLOCK_COPY_H */
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 @@
 #include "block/block_int.h"
 #include "block/blockjob_int.h"
 #include "block/block_backup.h"
+#include "block/block-copy.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/ratelimit.h"
@@ -XXX,XX +XXX,XX @@ typedef struct CowRequest {
     CoQueue wait_queue; /* coroutines blocked on this request */
 } CowRequest;
 
-typedef void (*ProgressBytesCallbackFunc)(int64_t bytes, void *opaque);
-typedef void (*ProgressResetCallbackFunc)(void *opaque);
-typedef struct BlockCopyState {
-    BlockBackend *source;
-    BlockBackend *target;
-    BdrvDirtyBitmap *copy_bitmap;
-    int64_t cluster_size;
-    bool use_copy_range;
-    int64_t copy_range_size;
-    uint64_t len;
-
-    BdrvRequestFlags write_flags;
-
-    /*
-     * skip_unallocated:
-     *
-     * Used by sync=top jobs, which first scan the source node for unallocated
-     * areas and clear them in the copy_bitmap.  During this process, the bitmap
-     * is thus not fully initialized: It may still have bits set for areas that
-     * are unallocated and should actually not be copied.
-     *
-     * This is indicated by skip_unallocated.
-     *
-     * In this case, block_copy() will query the source’s allocation status,
-     * skip unallocated regions, clear them in the copy_bitmap, and invoke
-     * block_copy_reset_unallocated() every time it does.
-     */
-    bool skip_unallocated;
-
-    /* progress_bytes_callback: called when some copying progress is done. */
-    ProgressBytesCallbackFunc progress_bytes_callback;
-
-    /*
-     * progress_reset_callback: called when some bytes reset from copy_bitmap
-     * (see @skip_unallocated above). The callee is assumed to recalculate how
-     * many bytes remain based on the dirty bit count of copy_bitmap.
-     */
-    ProgressResetCallbackFunc progress_reset_callback;
-    void *progress_opaque;
-} BlockCopyState;
-
 typedef struct BackupBlockJob {
     BlockJob common;
     BlockDriverState *source_bs;
@@ -XXX,XX +XXX,XX @@ static void cow_request_end(CowRequest *req)
     qemu_co_queue_restart_all(&req->wait_queue);
 }
 
-static void block_copy_state_free(BlockCopyState *s)
-{
-    if (!s) {
-        return;
-    }
-
-    bdrv_release_dirty_bitmap(blk_bs(s->source), s->copy_bitmap);
-    blk_unref(s->source);
-    blk_unref(s->target);
-    g_free(s);
-}
-
-static BlockCopyState *block_copy_state_new(
-        BlockDriverState *source, BlockDriverState *target,
-        int64_t cluster_size, BdrvRequestFlags write_flags,
-        ProgressBytesCallbackFunc progress_bytes_callback,
-        ProgressResetCallbackFunc progress_reset_callback,
-        void *progress_opaque, Error **errp)
-{
-    BlockCopyState *s;
-    int ret;
-    uint64_t no_resize = BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE |
-                         BLK_PERM_WRITE_UNCHANGED | BLK_PERM_GRAPH_MOD;
-    BdrvDirtyBitmap *copy_bitmap;
-
-    copy_bitmap = bdrv_create_dirty_bitmap(source, cluster_size, NULL, errp);
-    if (!copy_bitmap) {
-        return NULL;
-    }
-    bdrv_disable_dirty_bitmap(copy_bitmap);
-
-    s = g_new(BlockCopyState, 1);
-    *s = (BlockCopyState) {
-        .source = blk_new(bdrv_get_aio_context(source),
-                          BLK_PERM_CONSISTENT_READ, no_resize),
-        .target = blk_new(bdrv_get_aio_context(target),
-                          BLK_PERM_WRITE, no_resize),
-        .copy_bitmap = copy_bitmap,
-        .cluster_size = cluster_size,
-        .len = bdrv_dirty_bitmap_size(copy_bitmap),
-        .write_flags = write_flags,
-        .progress_bytes_callback = progress_bytes_callback,
-        .progress_reset_callback = progress_reset_callback,
-        .progress_opaque = progress_opaque,
-    };
-
-    s->copy_range_size = QEMU_ALIGN_DOWN(MIN(blk_get_max_transfer(s->source),
-                                             blk_get_max_transfer(s->target)),
-                                         s->cluster_size);
-    /*
-     * Set use_copy_range, consider the following:
-     * 1. Compression is not supported for copy_range.
-     * 2. copy_range does not respect max_transfer (it's a TODO), so we factor
-     *    that in here. If max_transfer is smaller than the job->cluster_size,
-     *    we do not use copy_range (in that case it's zero after aligning down
-     *    above).
-     */
-    s->use_copy_range =
-        !(write_flags & BDRV_REQ_WRITE_COMPRESSED) && s->copy_range_size > 0;
-
-    /*
-     * We just allow aio context change on our block backends. block_copy() user
-     * (now it's only backup) is responsible for source and target being in same
-     * aio context.
-     */
-    blk_set_disable_request_queuing(s->source, true);
-    blk_set_allow_aio_context_change(s->source, true);
-    blk_set_disable_request_queuing(s->target, true);
-    blk_set_allow_aio_context_change(s->target, true);
-
-    ret = blk_insert_bs(s->source, source, errp);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    ret = blk_insert_bs(s->target, target, errp);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    return s;
-
-fail:
-    block_copy_state_free(s);
-
-    return NULL;
-}
-
-/*
- * Copy range to target with a bounce buffer and return the bytes copied. If
- * error occurred, return a negative error number
- */
-static int coroutine_fn block_copy_with_bounce_buffer(BlockCopyState *s,
-                                                      int64_t start,
-                                                      int64_t end,
-                                                      bool is_write_notifier,
-                                                      bool *error_is_read,
-                                                      void **bounce_buffer)
-{
-    int ret;
-    int nbytes;
-    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
-
-    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
-    bdrv_reset_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
-    nbytes = MIN(s->cluster_size, s->len - start);
-    if (!*bounce_buffer) {
-        *bounce_buffer = blk_blockalign(s->source, s->cluster_size);
-    }
-
-    ret = blk_co_pread(s->source, start, nbytes, *bounce_buffer, read_flags);
-    if (ret < 0) {
-        trace_block_copy_with_bounce_buffer_read_fail(s, start, ret);
-        if (error_is_read) {
-            *error_is_read = true;
-        }
-        goto fail;
-    }
-
-    ret = blk_co_pwrite(s->target, start, nbytes, *bounce_buffer,
-                        s->write_flags);
-    if (ret < 0) {
-        trace_block_copy_with_bounce_buffer_write_fail(s, start, ret);
-        if (error_is_read) {
-            *error_is_read = false;
-        }
-        goto fail;
-    }
-
-    return nbytes;
-fail:
-    bdrv_set_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
-    return ret;
-
-}
-
-/*
- * Copy range to target and return the bytes copied. If error occurred, return a
- * negative error number.
- */
-static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
-                                                int64_t start,
-                                                int64_t end,
-                                                bool is_write_notifier)
-{
-    int ret;
-    int nr_clusters;
-    int nbytes;
-    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
-
-    assert(QEMU_IS_ALIGNED(s->copy_range_size, s->cluster_size));
-    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
-    nbytes = MIN(s->copy_range_size, MIN(end, s->len) - start);
-    nr_clusters = DIV_ROUND_UP(nbytes, s->cluster_size);
-    bdrv_reset_dirty_bitmap(s->copy_bitmap, start,
-                            s->cluster_size * nr_clusters);
-    ret = blk_co_copy_range(s->source, start, s->target, start, nbytes,
-                            read_flags, s->write_flags);
-    if (ret < 0) {
-        trace_block_copy_with_offload_fail(s, start, ret);
-        bdrv_set_dirty_bitmap(s->copy_bitmap, start,
-                              s->cluster_size * nr_clusters);
-        return ret;
-    }
-
-    return nbytes;
-}
-
-/*
- * Check if the cluster starting at offset is allocated or not.
- * return via pnum the number of contiguous clusters sharing this allocation.
- */
-static int block_copy_is_cluster_allocated(BlockCopyState *s, int64_t offset,
-                                           int64_t *pnum)
-{
-    BlockDriverState *bs = blk_bs(s->source);
-    int64_t count, total_count = 0;
-    int64_t bytes = s->len - offset;
-    int ret;
-
-    assert(QEMU_IS_ALIGNED(offset, s->cluster_size));
-
-    while (true) {
-        ret = bdrv_is_allocated(bs, offset, bytes, &count);
-        if (ret < 0) {
-            return ret;
-        }
-
-        total_count += count;
-
-        if (ret || count == 0) {
-            /*
-             * ret: partial segment(s) are considered allocated.
-             * otherwise: unallocated tail is treated as an entire segment.
-             */
-            *pnum = DIV_ROUND_UP(total_count, s->cluster_size);
-            return ret;
-        }
-
-        /* Unallocated segment(s) with uncertain following segment(s) */
-        if (total_count >= s->cluster_size) {
-            *pnum = total_count / s->cluster_size;
-            return 0;
-        }
-
-        offset += count;
-        bytes -= count;
-    }
-}
-
-/*
- * Reset bits in copy_bitmap starting at offset if they represent unallocated
- * data in the image. May reset subsequent contiguous bits.
- * @return 0 when the cluster at @offset was unallocated,
- *         1 otherwise, and -ret on error.
- */
-static int64_t block_copy_reset_unallocated(BlockCopyState *s,
-                                            int64_t offset, int64_t *count)
-{
-    int ret;
-    int64_t clusters, bytes;
-
-    ret = block_copy_is_cluster_allocated(s, offset, &clusters);
-    if (ret < 0) {
-        return ret;
-    }
-
-    bytes = clusters * s->cluster_size;
-
-    if (!ret) {
-        bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes);
-        s->progress_reset_callback(s->progress_opaque);
-    }
-
-    *count = bytes;
-    return ret;
-}
-
-static int coroutine_fn block_copy(BlockCopyState *s,
-                                   int64_t start, uint64_t bytes,
-                                   bool *error_is_read,
-                                   bool is_write_notifier)
-{
-    int ret = 0;
-    int64_t end = bytes + start; /* bytes */
-    void *bounce_buffer = NULL;
-    int64_t status_bytes;
-
-    /*
-     * block_copy() user is responsible for keeping source and target in same
-     * aio context
-     */
-    assert(blk_get_aio_context(s->source) == blk_get_aio_context(s->target));
-
-    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
-    assert(QEMU_IS_ALIGNED(end, s->cluster_size));
-
-    while (start < end) {
-        int64_t dirty_end;
-
-        if (!bdrv_dirty_bitmap_get(s->copy_bitmap, start)) {
-            trace_block_copy_skip(s, start);
-            start += s->cluster_size;
-            continue; /* already copied */
-        }
-
-        dirty_end = bdrv_dirty_bitmap_next_zero(s->copy_bitmap, start,
-                                                (end - start));
-        if (dirty_end < 0) {
-            dirty_end = end;
-        }
-
-        if (s->skip_unallocated) {
-            ret = block_copy_reset_unallocated(s, start, &status_bytes);
-            if (ret == 0) {
-                trace_block_copy_skip_range(s, start, status_bytes);
-                start += status_bytes;
-                continue;
-            }
-            /* Clamp to known allocated region */
-            dirty_end = MIN(dirty_end, start + status_bytes);
-        }
-
-        trace_block_copy_process(s, start);
-
-        if (s->use_copy_range) {
-            ret = block_copy_with_offload(s, start, dirty_end,
-                                          is_write_notifier);
-            if (ret < 0) {
-                s->use_copy_range = false;
-            }
-        }
-        if (!s->use_copy_range) {
-            ret = block_copy_with_bounce_buffer(s, start, dirty_end,
-                                                is_write_notifier,
-                                                error_is_read, &bounce_buffer);
-        }
-        if (ret < 0) {
-            break;
-        }
-
-        start += ret;
-        s->progress_bytes_callback(ret, s->progress_opaque);
-        ret = 0;
-    }
-
-    if (bounce_buffer) {
-        qemu_vfree(bounce_buffer);
-    }
-
-    return ret;
-}
-
 static void backup_progress_bytes_callback(int64_t bytes, void *opaque)
 {
     BackupBlockJob *s = opaque;
diff --git a/block/block-copy.c b/block/block-copy.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/block/block-copy.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * block_copy API
+ *
+ * Copyright (C) 2013 Proxmox Server Solutions
+ * Copyright (c) 2019 Virtuozzo International GmbH.
+ *
+ * Authors:
+ *  Dietmar Maurer (dietmar@proxmox.com)
+ *  Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+
+#include "trace.h"
+#include "qapi/error.h"
+#include "block/block-copy.h"
+#include "sysemu/block-backend.h"
+
+void block_copy_state_free(BlockCopyState *s)
+{
+    if (!s) {
+        return;
+    }
+
+    bdrv_release_dirty_bitmap(blk_bs(s->source), s->copy_bitmap);
+    blk_unref(s->source);
+    blk_unref(s->target);
+    g_free(s);
+}
+
+BlockCopyState *block_copy_state_new(
+        BlockDriverState *source, BlockDriverState *target,
+        int64_t cluster_size, BdrvRequestFlags write_flags,
+        ProgressBytesCallbackFunc progress_bytes_callback,
+        ProgressResetCallbackFunc progress_reset_callback,
+        void *progress_opaque, Error **errp)
+{
+    BlockCopyState *s;
+    int ret;
+    uint64_t no_resize = BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE |
+                         BLK_PERM_WRITE_UNCHANGED | BLK_PERM_GRAPH_MOD;
+    BdrvDirtyBitmap *copy_bitmap;
+
+    copy_bitmap = bdrv_create_dirty_bitmap(source, cluster_size, NULL, errp);
+    if (!copy_bitmap) {
+        return NULL;
+    }
+    bdrv_disable_dirty_bitmap(copy_bitmap);
+
+    s = g_new(BlockCopyState, 1);
+    *s = (BlockCopyState) {
+        .source = blk_new(bdrv_get_aio_context(source),
+                          BLK_PERM_CONSISTENT_READ, no_resize),
+        .target = blk_new(bdrv_get_aio_context(target),
+                          BLK_PERM_WRITE, no_resize),
+        .copy_bitmap = copy_bitmap,
+        .cluster_size = cluster_size,
+        .len = bdrv_dirty_bitmap_size(copy_bitmap),
+        .write_flags = write_flags,
+        .progress_bytes_callback = progress_bytes_callback,
+        .progress_reset_callback = progress_reset_callback,
+        .progress_opaque = progress_opaque,
+    };
+
+    s->copy_range_size = QEMU_ALIGN_DOWN(MIN(blk_get_max_transfer(s->source),
+                                             blk_get_max_transfer(s->target)),
+                                         s->cluster_size);
+    /*
+     * Set use_copy_range, consider the following:
+     * 1. Compression is not supported for copy_range.
+     * 2. copy_range does not respect max_transfer (it's a TODO), so we factor
+     *    that in here. If max_transfer is smaller than the job->cluster_size,
+     *    we do not use copy_range (in that case it's zero after aligning down
+     *    above).
+     */
+    s->use_copy_range =
+        !(write_flags & BDRV_REQ_WRITE_COMPRESSED) && s->copy_range_size > 0;
+
+    /*
+     * We just allow aio context change on our block backends. block_copy() user
+     * (now it's only backup) is responsible for source and target being in same
+     * aio context.
+     */
+    blk_set_disable_request_queuing(s->source, true);
+    blk_set_allow_aio_context_change(s->source, true);
+    blk_set_disable_request_queuing(s->target, true);
+    blk_set_allow_aio_context_change(s->target, true);
+
+    ret = blk_insert_bs(s->source, source, errp);
+    if (ret < 0) {
+        goto fail;
+    }
+
+    ret = blk_insert_bs(s->target, target, errp);
+    if (ret < 0) {
+        goto fail;
+    }
+
+    return s;
+
+fail:
+    block_copy_state_free(s);
+
+    return NULL;
+}
+
+/*
+ * Copy range to target with a bounce buffer and return the bytes copied. If
+ * error occurred, return a negative error number
+ */
+static int coroutine_fn block_copy_with_bounce_buffer(BlockCopyState *s,
+                                                      int64_t start,
+                                                      int64_t end,
+                                                      bool is_write_notifier,
+                                                      bool *error_is_read,
+                                                      void **bounce_buffer)
+{
+    int ret;
+    int nbytes;
+    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
+
+    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
+    bdrv_reset_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
+    nbytes = MIN(s->cluster_size, s->len - start);
+    if (!*bounce_buffer) {
+        *bounce_buffer = blk_blockalign(s->source, s->cluster_size);
+    }
+
+    ret = blk_co_pread(s->source, start, nbytes, *bounce_buffer, read_flags);
+    if (ret < 0) {
+        trace_block_copy_with_bounce_buffer_read_fail(s, start, ret);
+        if (error_is_read) {
+            *error_is_read = true;
+        }
+        goto fail;
+    }
+
+    ret = blk_co_pwrite(s->target, start, nbytes, *bounce_buffer,
+                        s->write_flags);
+    if (ret < 0) {
+        trace_block_copy_with_bounce_buffer_write_fail(s, start, ret);
+        if (error_is_read) {
+            *error_is_read = false;
+        }
+        goto fail;
+    }
+
+    return nbytes;
+fail:
+    bdrv_set_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
+    return ret;
+
+}
+
+/*
+ * Copy range to target and return the bytes copied. If error occurred, return a
+ * negative error number.
+ */
+static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
+                                                int64_t start,
+                                                int64_t end,
+                                                bool is_write_notifier)
+{
+    int ret;
+    int nr_clusters;
+    int nbytes;
+    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
+
+    assert(QEMU_IS_ALIGNED(s->copy_range_size, s->cluster_size));
+    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
+    nbytes = MIN(s->copy_range_size, MIN(end, s->len) - start);
+    nr_clusters = DIV_ROUND_UP(nbytes, s->cluster_size);
+    bdrv_reset_dirty_bitmap(s->copy_bitmap, start,
+                            s->cluster_size * nr_clusters);
+    ret = blk_co_copy_range(s->source, start, s->target, start, nbytes,
+                            read_flags, s->write_flags);
+    if (ret < 0) {
+        trace_block_copy_with_offload_fail(s, start, ret);
+        bdrv_set_dirty_bitmap(s->copy_bitmap, start,
+                              s->cluster_size * nr_clusters);
+        return ret;
+    }
+
+    return nbytes;
+}
+
+/*
+ * Check if the cluster starting at offset is allocated or not.
+ * return via pnum the number of contiguous clusters sharing this allocation.
+ */
+static int block_copy_is_cluster_allocated(BlockCopyState *s, int64_t offset,
+                                           int64_t *pnum)
+{
+    BlockDriverState *bs = blk_bs(s->source);
+    int64_t count, total_count = 0;
+    int64_t bytes = s->len - offset;
+    int ret;
+
+    assert(QEMU_IS_ALIGNED(offset, s->cluster_size));
+
+    while (true) {
+        ret = bdrv_is_allocated(bs, offset, bytes, &count);
+        if (ret < 0) {
+            return ret;
+        }
+
+        total_count += count;
+
+        if (ret || count == 0) {
+            /*
+             * ret: partial segment(s) are considered allocated.
+             * otherwise: unallocated tail is treated as an entire segment.
+             */
+            *pnum = DIV_ROUND_UP(total_count, s->cluster_size);
+            return ret;
+        }
+
+        /* Unallocated segment(s) with uncertain following segment(s) */
+        if (total_count >= s->cluster_size) {
+            *pnum = total_count / s->cluster_size;
+            return 0;
+        }
+
+        offset += count;
+        bytes -= count;
+    }
+}
+
+/*
+ * Reset bits in copy_bitmap starting at offset if they represent unallocated
+ * data in the image. May reset subsequent contiguous bits.
+ * @return 0 when the cluster at @offset was unallocated,
+ *         1 otherwise, and -ret on error.
+ */
+int64_t block_copy_reset_unallocated(BlockCopyState *s,
+                                     int64_t offset, int64_t *count)
+{
+    int ret;
+    int64_t clusters, bytes;
+
+    ret = block_copy_is_cluster_allocated(s, offset, &clusters);
+    if (ret < 0) {
+        return ret;
+    }
+
+    bytes = clusters * s->cluster_size;
+
+    if (!ret) {
+        bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes);
+        s->progress_reset_callback(s->progress_opaque);
+    }
+
+    *count = bytes;
+    return ret;
+}
+
+int coroutine_fn block_copy(BlockCopyState *s,
+                            int64_t start, uint64_t bytes,
+                            bool *error_is_read,
+                            bool is_write_notifier)
+{
+    int ret = 0;
+    int64_t end = bytes + start; /* bytes */
+    void *bounce_buffer = NULL;
+    int64_t status_bytes;
+
+    /*
+     * block_copy() user is responsible for keeping source and target in same
+     * aio context
+     */
+    assert(blk_get_aio_context(s->source) == blk_get_aio_context(s->target));
+
+    assert(QEMU_IS_ALIGNED(start, s->cluster_size));
+    assert(QEMU_IS_ALIGNED(end, s->cluster_size));
+
+    while (start < end) {
+        int64_t dirty_end;
+
+        if (!bdrv_dirty_bitmap_get(s->copy_bitmap, start)) {
+            trace_block_copy_skip(s, start);
+            start += s->cluster_size;
+            continue; /* already copied */
+        }
+
+        dirty_end = bdrv_dirty_bitmap_next_zero(s->copy_bitmap, start,
+                                                (end - start));
+        if (dirty_end < 0) {
+            dirty_end = end;
+        }
+
+        if (s->skip_unallocated) {
+            ret = block_copy_reset_unallocated(s, start, &status_bytes);
+            if (ret == 0) {
+                trace_block_copy_skip_range(s, start, status_bytes);
+                start += status_bytes;
+                continue;
+            }
+            /* Clamp to known allocated region */
+            dirty_end = MIN(dirty_end, start + status_bytes);
+        }
+
+        trace_block_copy_process(s, start);
+
+        if (s->use_copy_range) {
+            ret = block_copy_with_offload(s, start, dirty_end,
+                                          is_write_notifier);
+            if (ret < 0) {
+                s->use_copy_range = false;
+            }
+        }
+        if (!s->use_copy_range) {
+            ret = block_copy_with_bounce_buffer(s, start, dirty_end,
+                                                is_write_notifier,
+                                                error_is_read, &bounce_buffer);
+        }
+        if (ret < 0) {
+            break;
+        }
+
+        start += ret;
+        s->progress_bytes_callback(ret, s->progress_opaque);
+        ret = 0;
+    }
+
+    if (bounce_buffer) {
+        qemu_vfree(bounce_buffer);
+    }
+
+    return ret;
+}
diff --git a/block/trace-events b/block/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -XXX,XX +XXX,XX @@ mirror_yield_in_flight(void *s, int64_t offset, int in_flight) "s %p offset %" P
 # backup.c
 backup_do_cow_enter(void *job, int64_t start, int64_t offset, uint64_t bytes) "job %p start %" PRId64 " offset %" PRId64 " bytes %" PRIu64
 backup_do_cow_return(void *job, int64_t offset, uint64_t bytes, int ret) "job %p offset %" PRId64 " bytes %" PRIu64 " ret %d"
+
+# block-copy.c
 block_copy_skip(void *bcs, int64_t start) "bcs %p start %"PRId64
 block_copy_skip_range(void *bcs, int64_t start, uint64_t bytes) "bcs %p start %"PRId64" bytes %"PRId64
 block_copy_process(void *bcs, int64_t start) "bcs %p start %"PRId64
-- 
2.21.0

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

Teach bdrv_debug_breakpoint and bdrv_debug_remove_breakpoint skip
filters with backing. This is needed to implement and use in backup job
it's own backup_top filter driver (like mirror already has one), and
without this improvement, breakpoint removal will fail at least in 55
iotest.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190920142056.12778-9-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block.c | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 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_debug_event(BlockDriverState *bs, BlkdebugEvent event)
     bs->drv->bdrv_debug_event(bs, event);
 }
 
-int bdrv_debug_breakpoint(BlockDriverState *bs, const char *event,
-                          const char *tag)
+static BlockDriverState *bdrv_find_debug_node(BlockDriverState *bs)
 {
     while (bs && bs->drv && !bs->drv->bdrv_debug_breakpoint) {
-        bs = bs->file ? bs->file->bs : NULL;
+        if (bs->file) {
+            bs = bs->file->bs;
+            continue;
+        }
+
+        if (bs->drv->is_filter && bs->backing) {
+            bs = bs->backing->bs;
+            continue;
+        }
+
+        break;
     }
 
     if (bs && bs->drv && bs->drv->bdrv_debug_breakpoint) {
+        assert(bs->drv->bdrv_debug_remove_breakpoint);
+        return bs;
+    }
+
+    return NULL;
+}
+
+int bdrv_debug_breakpoint(BlockDriverState *bs, const char *event,
+                          const char *tag)
+{
+    bs = bdrv_find_debug_node(bs);
+    if (bs) {
         return bs->drv->bdrv_debug_breakpoint(bs, event, tag);
     }
 
@@ -XXX,XX +XXX,XX @@ int bdrv_debug_breakpoint(BlockDriverState *bs, const char *event,
 
 int bdrv_debug_remove_breakpoint(BlockDriverState *bs, const char *tag)
 {
-    while (bs && bs->drv && !bs->drv->bdrv_debug_remove_breakpoint) {
-        bs = bs->file ? bs->file->bs : NULL;
-    }
-
-    if (bs && bs->drv && bs->drv->bdrv_debug_remove_breakpoint) {
+    bs = bdrv_find_debug_node(bs);
+    if (bs) {
         return bs->drv->bdrv_debug_remove_breakpoint(bs, tag);
     }
 
-- 
2.21.0

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

After backup-top filter appearing it's not possible to see dirty
bitmaps in top node, so use node-name instead.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190920142056.12778-10-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/124        |  83 ++++----
 tests/qemu-iotests/257        |  49 ++---
 tests/qemu-iotests/257.out    | 364 +++++++++++++---------------------
 tests/qemu-iotests/iotests.py |  27 +++
 4 files changed, 219 insertions(+), 304 deletions(-)

diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/124
+++ b/tests/qemu-iotests/124
@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackupBase(iotests.QMPTestCase):
         # Create a base image with a distinctive patterning
         drive0 = self.add_node('drive0')
         self.img_create(drive0['file'], drive0['fmt'])
-        self.vm.add_drive(drive0['file'])
+        self.vm.add_drive(drive0['file'], opts='node-name=node0')
         self.write_default_pattern(drive0['file'])
         self.vm.launch()
 
@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackup(TestIncrementalBackupBase):
                             ('0xfe', '16M', '256k'),
                             ('0x64', '32736k', '64k')))
         # Check the dirty bitmap stats
-        result = self.vm.qmp('query-block')
-        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/name', 'bitmap0')
-        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/count', 458752)
-        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/granularity', 65536)
-        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/status', 'active')
-        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/persistent', False)
+        self.assertTrue(self.vm.check_bitmap_status(
+            'node0', bitmap0.name, {
+                'name': 'bitmap0',
+                'count': 458752,
+                'granularity': 65536,
+                'status': 'active',
+                'persistent': False
+            }))
 
         # Prepare a cluster_size=128k backup target without a backing file.
         (target, _) = bitmap0.new_target()
@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
         """
 
         drive0 = self.drives[0]
-        # NB: The blkdebug script here looks for a "flush, read, read" pattern.
-        # The flush occurs in hmp_io_writes, the first read in device_add, and
-        # the last read during the block job.
+        # NB: The blkdebug script here looks for a "flush, read" pattern.
+        # The flush occurs in hmp_io_writes, and the read during the block job.
         result = self.vm.qmp('blockdev-add',
                              node_name=drive0['id'],
                              driver=drive0['fmt'],
@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
                                      'event': 'flush_to_disk',
                                      'state': 1,
                                      'new_state': 2
-                                 },{
-                                     'event': 'read_aio',
-                                     'state': 2,
-                                     'new_state': 3
                                  }],
                                  'inject-error': [{
                                      'event': 'read_aio',
                                      'errno': 5,
-                                     'state': 3,
+                                     'state': 2,
                                      'immediately': False,
                                      'once': True
                                  }],
@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
                                           ('0xfe', '16M', '256k'),
                                           ('0x64', '32736k', '64k')))
 
-        # For the purposes of query-block visibility of bitmaps, add a drive
-        # frontend after we've written data; otherwise we can't use hmp-io
-        result = self.vm.qmp("device_add",
-                             id="device0",
-                             drive=drive0['id'],
-                             driver="virtio-blk")
-        self.assert_qmp(result, 'return', {})
-
         # Bitmap Status Check
-        query = self.vm.qmp('query-block')
-        ret = [bmap for bmap in query['return'][0]['dirty-bitmaps']
-               if bmap.get('name') == bitmap.name][0]
-        self.assert_qmp(ret, 'count', 458752)
-        self.assert_qmp(ret, 'granularity', 65536)
-        self.assert_qmp(ret, 'status', 'active')
-        self.assert_qmp(ret, 'busy', False)
-        self.assert_qmp(ret, 'recording', True)
+        self.assertTrue(self.vm.check_bitmap_status(
+            drive0['id'], bitmap.name, {
+                'count': 458752,
+                'granularity': 65536,
+                'status': 'active',
+                'busy': False,
+                'recording': True
+            }))
 
         # Start backup
         parent, _ = bitmap.last_target()
@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
                                         'operation': 'read'})
 
         # Bitmap Status Check
-        query = self.vm.qmp('query-block')
-        ret = [bmap for bmap in query['return'][0]['dirty-bitmaps']
-               if bmap.get('name') == bitmap.name][0]
-        self.assert_qmp(ret, 'count', 458752)
-        self.assert_qmp(ret, 'granularity', 65536)
-        self.assert_qmp(ret, 'status', 'frozen')
-        self.assert_qmp(ret, 'busy', True)
-        self.assert_qmp(ret, 'recording', True)
+        self.assertTrue(self.vm.check_bitmap_status(
+            drive0['id'], bitmap.name, {
+                'count': 458752,
+                'granularity': 65536,
+                'status': 'frozen',
+                'busy': True,
+                'recording': True
+            }))
 
         # Resume and check incremental backup for consistency
         res = self.vm.qmp('block-job-resume', device=bitmap.drive['id'])
@@ -XXX,XX +XXX,XX @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
         self.wait_qmp_backup(bitmap.drive['id'])
 
         # Bitmap Status Check
-        query = self.vm.qmp('query-block')
-        ret = [bmap for bmap in query['return'][0]['dirty-bitmaps']
-               if bmap.get('name') == bitmap.name][0]
-        self.assert_qmp(ret, 'count', 0)
-        self.assert_qmp(ret, 'granularity', 65536)
-        self.assert_qmp(ret, 'status', 'active')
-        self.assert_qmp(ret, 'busy', False)
-        self.assert_qmp(ret, 'recording', True)
+        self.assertTrue(self.vm.check_bitmap_status(
+            drive0['id'], bitmap.name, {
+                'count': 0,
+                'granularity': 65536,
+                'status': 'active',
+                'busy': False,
+                'recording': True
+            }))
 
         # Finalize / Cleanup
         self.make_reference_backup(bitmap)
diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/257
+++ b/tests/qemu-iotests/257
@@ -XXX,XX +XXX,XX @@ class Drive:
         self.size = size
         self.node = name
 
-def query_bitmaps(vm):
-    res = vm.qmp("query-block")
-    return {"bitmaps": {device['device'] or device['qdev']:
-                        device.get('dirty-bitmaps', []) for
-                        device in res['return']}}
-
-def get_bitmap(bitmaps, drivename, name, recording=None):
-    """
-    get a specific bitmap from the object returned by query_bitmaps.
-    :param recording: If specified, filter results by the specified value.
-    """
-    for bitmap in bitmaps['bitmaps'][drivename]:
-        if bitmap.get('name', '') == name:
-            if recording is None:
-                return bitmap
-            elif bitmap.get('recording') == recording:
-                return bitmap
-    return None
-
 def blockdev_backup(vm, device, target, sync, **kwargs):
     # Strip any arguments explicitly nulled by the caller:
     kwargs = {key: val for key, val in kwargs.items() if val is not None}
@@ -XXX,XX +XXX,XX @@ def perform_writes(drive, n):
             pattern.size)
         log(cmd)
         log(drive.vm.hmp_qemu_io(drive.name, cmd))
-    bitmaps = query_bitmaps(drive.vm)
-    log(bitmaps, indent=2)
+    bitmaps = drive.vm.query_bitmaps()
+    log({'bitmaps': bitmaps}, indent=2)
     log('')
     return bitmaps
 
@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
         # 1 - Writes and Reference Backup
         bitmaps = perform_writes(drive0, 1)
         ebitmap.dirty_group(1)
-        bitmap = get_bitmap(bitmaps, drive0.device, 'bitmap0')
+        bitmap = vm.get_bitmap(drive0.node, 'bitmap0', bitmaps=bitmaps)
         ebitmap.compare(bitmap)
         reference_backup(drive0, 1, fbackup1)
 
@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
             log('')
             bitmaps = perform_writes(drive0, 2)
             # Named bitmap (static, should be unchanged)
-            ebitmap.compare(get_bitmap(bitmaps, drive0.device, 'bitmap0'))
+            ebitmap.compare(vm.get_bitmap(drive0.node, 'bitmap0',
+                                          bitmaps=bitmaps))
             # Anonymous bitmap (dynamic, shows new writes)
             anonymous = EmulatedBitmap()
             anonymous.dirty_group(2)
-            anonymous.compare(get_bitmap(bitmaps, drive0.device, '',
-                                         recording=True))
+            anonymous.compare(vm.get_bitmap(drive0.node, '', recording=True,
+                                            bitmaps=bitmaps))
 
             # Simulate the order in which this will happen:
             # group 1 gets cleared first, then group two gets written.
@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
         vm.run_job(job, auto_dismiss=True, auto_finalize=False,
                    pre_finalize=_callback,
                    cancel=(failure == 'simulated'))
-        bitmaps = query_bitmaps(vm)
-        log(bitmaps, indent=2)
+        bitmaps = vm.query_bitmaps()
+        log({'bitmaps': bitmaps}, indent=2)
         log('')
 
         if bsync_mode == 'always' and failure == 'intermediate':
@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
                 ebitmap.clear()
                 ebitmap.dirty_bits(range(fail_bit, SIZE // GRANULARITY))
 
-        ebitmap.compare(get_bitmap(bitmaps, drive0.device, 'bitmap0'))
+        ebitmap.compare(vm.get_bitmap(drive0.node, 'bitmap0', bitmaps=bitmaps))
 
         # 2 - Writes and Reference Backup
         bitmaps = perform_writes(drive0, 3)
         ebitmap.dirty_group(3)
-        ebitmap.compare(get_bitmap(bitmaps, drive0.device, 'bitmap0'))
+        ebitmap.compare(vm.get_bitmap(drive0.node, 'bitmap0', bitmaps=bitmaps))
         reference_backup(drive0, 2, fbackup2)
 
         # 2 - Bitmap Backup (In failure modes, this is a recovery.)
         job = backup(drive0, 2, bsync2, "bitmap",
                      bitmap="bitmap0", bitmap_mode=bsync_mode)
         vm.run_job(job, auto_dismiss=True, auto_finalize=False)
-        bitmaps = query_bitmaps(vm)
-        log(bitmaps, indent=2)
+        bitmaps = vm.query_bitmaps()
+        log({'bitmaps': bitmaps}, indent=2)
         log('')
         if bsync_mode != 'never':
             ebitmap.clear()
-        ebitmap.compare(get_bitmap(bitmaps, drive0.device, 'bitmap0'))
+        ebitmap.compare(vm.get_bitmap(drive0.node, 'bitmap0', bitmaps=bitmaps))
 
         log('--- Cleanup ---\n')
         vm.qmp_log("block-dirty-bitmap-remove",
                    node=drive0.name, name="bitmap0")
-        log(query_bitmaps(vm), indent=2)
+        bitmaps = vm.query_bitmaps()
+        log({'bitmaps': bitmaps}, indent=2)
         vm.shutdown()
         log('')
 
diff --git a/tests/qemu-iotests/257.out b/tests/qemu-iotests/257.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/257.out
+++ b/tests/qemu-iotests/257.out
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 393216, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 655360,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 983040,
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"data": {"device": "backup_2", "len": 983040, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 983040,
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 393216, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 917504,
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"data": {"device": "backup_2", "len": 917504, "offset": 917504, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 917504,
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 393216, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 655360,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 983040,
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"data": {"device": "backup_2", "len": 983040, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 983040,
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 393216, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 655360,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 983040,
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"data": {"device": "backup_2", "len": 983040, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 393216, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 917504,
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"data": {"device": "backup_2", "len": 917504, "offset": 917504, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 393216, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 458752,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 786432,
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 393216, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 458752,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 786432,
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 393216, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 327680,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 851968,
@@ -XXX,XX +XXX,XX @@ expecting 13 dirty sectors; have 13. OK!
 {"data": {"device": "backup_2", "len": 851968, "offset": 851968, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 393216, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 458752,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 786432,
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 655360,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 983040,
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"data": {"device": "backup_2", "len": 983040, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 67108864, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 917504,
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"data": {"device": "backup_2", "len": 917504, "offset": 917504, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 458752,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 786432,
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 458752,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 786432,
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 67108864, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 66125824,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 66453504,
@@ -XXX,XX +XXX,XX @@ expecting 1014 dirty sectors; have 1014. OK!
 {"data": {"device": "backup_2", "len": 66453504, "offset": 66453504, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 458752,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 786432,
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 458752, "offset": 458752, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 655360,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 983040,
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"data": {"device": "backup_2", "len": 983040, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 458752, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 917504,
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"data": {"device": "backup_2", "len": 917504, "offset": 917504, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 458752, "offset": 458752, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 458752,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 786432,
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 458752, "offset": 458752, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 458752,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 786432,
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 458752, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 917504,
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"data": {"device": "backup_2", "len": 917504, "offset": 917504, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
@@ -XXX,XX +XXX,XX @@ write -P0x6f 0x2000000 0x10000
 write -P0x76 0x3ff0000 0x10000
 {"return": ""}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Reference Backup #0 ---
@@ -XXX,XX +XXX,XX @@ write -P0x69 0x3fe0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 393216,
@@ -XXX,XX +XXX,XX @@ write -P0x67 0x3fe0000 0x20000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 7 dirty sectors; have 7. OK!
 {"data": {"device": "backup_1", "len": 458752, "offset": 458752, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 458752,
@@ -XXX,XX +XXX,XX @@ write -P0xdd 0x3fc0000 0x10000
 {"return": ""}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 786432,
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"data": {"device": "backup_2", "len": 786432, "offset": 786432, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {
   "bitmaps": {
-    "device0": [
+    "drive0": [
       {
         "busy": false,
         "count": 0,
@@ -XXX,XX +XXX,XX @@ expecting 0 dirty sectors; have 0. OK!
 {"execute": "block-dirty-bitmap-remove", "arguments": {"name": "bitmap0", "node": "drive0"}}
 {"return": {}}
 {
-  "bitmaps": {
-    "device0": []
-  }
+  "bitmaps": {}
 }
 
 --- Verification ---
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -XXX,XX +XXX,XX @@ class VM(qtest.QEMUQtestMachine):
                 return x
         return None
 
+    def query_bitmaps(self):
+        res = self.qmp("query-named-block-nodes")
+        return {device['node-name']: device['dirty-bitmaps']
+                for device in res['return'] if 'dirty-bitmaps' in device}
+
+    def get_bitmap(self, node_name, bitmap_name, recording=None, bitmaps=None):
+        """
+        get a specific bitmap from the object returned by query_bitmaps.
+        :param recording: If specified, filter results by the specified value.
+        :param bitmaps: If specified, use it instead of call query_bitmaps()
+        """
+        if bitmaps is None:
+            bitmaps = self.query_bitmaps()
+
+        for bitmap in bitmaps[node_name]:
+            if bitmap.get('name', '') == bitmap_name:
+                if recording is None:
+                    return bitmap
+                elif bitmap.get('recording') == recording:
+                    return bitmap
+        return None
+
+    def check_bitmap_status(self, node_name, bitmap_name, fields):
+        ret = self.get_bitmap(node_name, bitmap_name)
+
+        return fields.items() <= ret.items()
+
 
 index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')
 
-- 
2.21.0

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

After previous commit Drive.device is actually unused. Drop it together
with .name property.  While being here reuse .node in qmp commands
instead of writing 'drive0' twice.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190920142056.12778-11-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/257 | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/257
+++ b/tests/qemu-iotests/257
@@ -XXX,XX +XXX,XX @@ class Drive:
         self.fmt = None
         self.size = None
         self.node = None
-        self.device = None
-
-    @property
-    def name(self):
-        return self.node or self.device
 
     def img_create(self, fmt, size):
         self.fmt = fmt
@@ -XXX,XX +XXX,XX @@ def blockdev_backup(vm, device, target, sync, **kwargs):
 def blockdev_backup_mktarget(drive, target_id, filepath, sync, **kwargs):
     target_drive = Drive(filepath, vm=drive.vm)
     target_drive.create_target(target_id, drive.fmt, drive.size)
-    blockdev_backup(drive.vm, drive.name, target_id, sync, **kwargs)
+    blockdev_backup(drive.vm, drive.node, target_id, sync, **kwargs)
 
 def reference_backup(drive, n, filepath):
     log("--- Reference Backup #{:d} ---\n".format(n))
@@ -XXX,XX +XXX,XX @@ def perform_writes(drive, n):
             pattern.offset,
             pattern.size)
         log(cmd)
-        log(drive.vm.hmp_qemu_io(drive.name, cmd))
+        log(drive.vm.hmp_qemu_io(drive.node, cmd))
     bitmaps = drive.vm.query_bitmaps()
     log({'bitmaps': bitmaps}, indent=2)
     log('')
@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
                 }]
             }
 
+        drive0.node = 'drive0'
         vm.qmp_log('blockdev-add',
                    filters=[iotests.filter_qmp_testfiles],
-                   node_name="drive0",
+                   node_name=drive0.node,
                    driver=drive0.fmt,
                    file=file_config)
-        drive0.node = 'drive0'
-        drive0.device = 'device0'
         # Use share-rw to allow writes directly to the node;
         # The anonymous block-backend for this configuration prevents us
         # from using HMP's qemu-io commands to address the device.
-        vm.qmp_log("device_add", id=drive0.device,
-                   drive=drive0.name, driver="scsi-hd",
+        vm.qmp_log("device_add", id='device0',
+                   drive=drive0.node, driver="scsi-hd",
                    share_rw=True)
         log('')
 
@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
         perform_writes(drive0, 0)
         reference_backup(drive0, 0, fbackup0)
         log('--- Add Bitmap ---\n')
-        vm.qmp_log("block-dirty-bitmap-add", node=drive0.name,
+        vm.qmp_log("block-dirty-bitmap-add", node=drive0.node,
                    name="bitmap0", granularity=GRANULARITY)
         log('')
         ebitmap = EmulatedBitmap()
@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
         # 1 - Test Backup (w/ Optional induced failure)
         if failure == 'intermediate':
             # Activate blkdebug induced failure for second-to-next read
-            log(vm.hmp_qemu_io(drive0.name, 'flush'))
+            log(vm.hmp_qemu_io(drive0.node, 'flush'))
             log('')
         job = backup(drive0, 1, bsync1, msync_mode,
                      bitmap="bitmap0", bitmap_mode=bsync_mode)
@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
 
         log('--- Cleanup ---\n')
         vm.qmp_log("block-dirty-bitmap-remove",
-                   node=drive0.name, name="bitmap0")
+                   node=drive0.node, name="bitmap0")
         bitmaps = vm.query_bitmaps()
         log({'bitmaps': bitmaps}, indent=2)
         vm.shutdown()
@@ -XXX,XX +XXX,XX @@ def test_backup_api():
             'filename': drive0.path
         }
 
+        drive0.node = 'drive0'
         vm.qmp_log('blockdev-add',
                    filters=[iotests.filter_qmp_testfiles],
-                   node_name="drive0",
+                   node_name=drive0.node,
                    driver=drive0.fmt,
                    file=file_config)
-        drive0.node = 'drive0'
-        drive0.device = 'device0'
-        vm.qmp_log("device_add", id=drive0.device,
-                   drive=drive0.name, driver="scsi-hd")
+        vm.qmp_log("device_add", id='device0',
+                   drive=drive0.node, driver="scsi-hd")
         log('')
 
         target0 = Drive(backup_path, vm=vm)
         target0.create_target("backup_target", drive0.fmt, drive0.size)
         log('')
 
-        vm.qmp_log("block-dirty-bitmap-add", node=drive0.name,
+        vm.qmp_log("block-dirty-bitmap-add", node=drive0.node,
                    name="bitmap0", granularity=GRANULARITY)
         log('')
 
@@ -XXX,XX +XXX,XX @@ def test_backup_api():
             log("-- Sync mode {:s} tests --\n".format(sync_mode))
             for bitmap in (None, 'bitmap404', 'bitmap0'):
                 for policy in error_cases[sync_mode][bitmap]:
-                    blockdev_backup(drive0.vm, drive0.name, "backup_target",
+                    blockdev_backup(drive0.vm, drive0.node, "backup_target",
                                     sync_mode, job_id='api_job',
                                     bitmap=bitmap, bitmap_mode=policy)
                     log('')
-- 
2.21.0

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

SCSI devices are unused in test, drop them.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190920142056.12778-12-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/257     |  8 -------
 tests/qemu-iotests/257.out | 44 --------------------------------------
 2 files changed, 52 deletions(-)

diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/257
+++ b/tests/qemu-iotests/257
@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
                    node_name=drive0.node,
                    driver=drive0.fmt,
                    file=file_config)
-        # Use share-rw to allow writes directly to the node;
-        # The anonymous block-backend for this configuration prevents us
-        # from using HMP's qemu-io commands to address the device.
-        vm.qmp_log("device_add", id='device0',
-                   drive=drive0.node, driver="scsi-hd",
-                   share_rw=True)
         log('')
 
         # 0 - Writes and Reference Backup
@@ -XXX,XX +XXX,XX @@ def test_backup_api():
                    node_name=drive0.node,
                    driver=drive0.fmt,
                    file=file_config)
-        vm.qmp_log("device_add", id='device0',
-                   drive=drive0.node, driver="scsi-hd")
         log('')
 
         target0 = Drive(backup_path, vm=vm)
diff --git a/tests/qemu-iotests/257.out b/tests/qemu-iotests/257.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/257.out
+++ b/tests/qemu-iotests/257.out
@@ -XXX,XX +XXX,XX @@
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "blkdebug", "image": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio", "immediately": false, "once": true, "state": 3}], "set-state": [{"event": "flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio", "new-state": 3, "state": 2}]}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
 
 --- Write #0 ---
 
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 {"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
 {"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver": "scsi-hd", "id": "device0"}}
-{"return": {}}
 
 {}
 {"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
-- 
2.21.0

From: Anton Nefedov <anton.nefedov@virtuozzo.com>

Make the stat fields definition slightly more readable.
Also reorder total_time_ns stats read-write-flush as done elsewhere.
Cosmetic change only.

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190923121737.83281-2-anton.nefedov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 qapi/block-core.json | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 # @flush_operations: The number of cache flush operations performed by the
 #                    device (since 0.15.0)
 #
-# @flush_total_time_ns: Total time spend on cache flushes in nano-seconds
-#                       (since 0.15.0).
+# @rd_total_time_ns: Total time spent on reads in nanoseconds (since 0.15.0).
 #
-# @wr_total_time_ns: Total time spend on writes in nano-seconds (since 0.15.0).
+# @wr_total_time_ns: Total time spent on writes in nanoseconds (since 0.15.0).
 #
-# @rd_total_time_ns: Total_time_spend on reads in nano-seconds (since 0.15.0).
+# @flush_total_time_ns: Total time spent on cache flushes in nanoseconds
+#                       (since 0.15.0).
 #
 # @wr_highest_offset: The offset after the greatest byte written to the
 #                     device.  The intended use of this information is for
@@ -XXX,XX +XXX,XX @@
 # Since: 0.14.0
 ##
 { 'struct': 'BlockDeviceStats',
-  'data': {'rd_bytes': 'int', 'wr_bytes': 'int', 'rd_operations': 'int',
-           'wr_operations': 'int', 'flush_operations': 'int',
-           'flush_total_time_ns': 'int', 'wr_total_time_ns': 'int',
-           'rd_total_time_ns': 'int', 'wr_highest_offset': 'int',
-           'rd_merged': 'int', 'wr_merged': 'int', '*idle_time_ns': 'int',
+  'data': {'rd_bytes': 'int', 'wr_bytes': 'int',
+           'rd_operations': 'int', 'wr_operations': 'int',
+           'flush_operations': 'int',
+           'rd_total_time_ns': 'int', 'wr_total_time_ns': 'int',
+           'flush_total_time_ns': 'int',
+           'wr_highest_offset': 'int',
+           'rd_merged': 'int', 'wr_merged': 'int',
+           '*idle_time_ns': 'int',
            'failed_rd_operations': 'int', 'failed_wr_operations': 'int',
-           'failed_flush_operations': 'int', 'invalid_rd_operations': 'int',
-           'invalid_wr_operations': 'int', 'invalid_flush_operations': 'int',
+           'failed_flush_operations': 'int',
+           'invalid_rd_operations': 'int', 'invalid_wr_operations': 'int',
+           'invalid_flush_operations': 'int',
            'account_invalid': 'bool', 'account_failed': 'bool',
            'timed_stats': ['BlockDeviceTimedStats'],
            '*rd_latency_histogram': 'BlockLatencyHistogramInfo',
-- 
2.21.0

From: Anton Nefedov <anton.nefedov@virtuozzo.com>

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20190923121737.83281-3-anton.nefedov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 qapi/block-core.json       | 29 +++++++++++++++++++++++------
 include/block/accounting.h |  1 +
 block/qapi.c               |  6 ++++++
 tests/qemu-iotests/227.out | 18 ++++++++++++++++++
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 #
 # @wr_bytes:      The number of bytes written by the device.
 #
+# @unmap_bytes: The number of bytes unmapped by the device (Since 4.2)
+#
 # @rd_operations: The number of read operations performed by the device.
 #
 # @wr_operations: The number of write operations performed by the device.
@@ -XXX,XX +XXX,XX @@
 # @flush_operations: The number of cache flush operations performed by the
 #                    device (since 0.15.0)
 #
+# @unmap_operations: The number of unmap operations performed by the device
+#                    (Since 4.2)
+#
 # @rd_total_time_ns: Total time spent on reads in nanoseconds (since 0.15.0).
 #
 # @wr_total_time_ns: Total time spent on writes in nanoseconds (since 0.15.0).
@@ -XXX,XX +XXX,XX @@
 # @flush_total_time_ns: Total time spent on cache flushes in nanoseconds
 #                       (since 0.15.0).
 #
+# @unmap_total_time_ns: Total time spent on unmap operations in nanoseconds
+#                       (Since 4.2)
+#
 # @wr_highest_offset: The offset after the greatest byte written to the
 #                     device.  The intended use of this information is for
 #                     growable sparse files (like qcow2) that are used on top
@@ -XXX,XX +XXX,XX @@
 # @wr_merged: Number of write requests that have been merged into another
 #             request (Since 2.3).
 #
+# @unmap_merged: Number of unmap requests that have been merged into another
+#                request (Since 4.2)
+#
 # @idle_time_ns: Time since the last I/O operation, in
 #                nanoseconds. If the field is absent it means that
 #                there haven't been any operations yet (Since 2.5).
@@ -XXX,XX +XXX,XX @@
 # @failed_flush_operations: The number of failed flush operations
 #                           performed by the device (Since 2.5)
 #
+# @failed_unmap_operations: The number of failed unmap operations performed
+#                           by the device (Since 4.2)
+#
 # @invalid_rd_operations: The number of invalid read operations
 #                          performed by the device (Since 2.5)
 #
@@ -XXX,XX +XXX,XX @@
 # @invalid_flush_operations: The number of invalid flush operations
 #                            performed by the device (Since 2.5)
 #
+# @invalid_unmap_operations: The number of invalid unmap operations performed
+#                            by the device (Since 4.2)
+#
 # @account_invalid: Whether invalid operations are included in the
 #                   last access statistics (Since 2.5)
 #
@@ -XXX,XX +XXX,XX @@
 # Since: 0.14.0
 ##
 { 'struct': 'BlockDeviceStats',
-  'data': {'rd_bytes': 'int', 'wr_bytes': 'int',
+  'data': {'rd_bytes': 'int', 'wr_bytes': 'int', 'unmap_bytes' : 'int',
            'rd_operations': 'int', 'wr_operations': 'int',
-           'flush_operations': 'int',
+           'flush_operations': 'int', 'unmap_operations': 'int',
            'rd_total_time_ns': 'int', 'wr_total_time_ns': 'int',
-           'flush_total_time_ns': 'int',
+           'flush_total_time_ns': 'int', 'unmap_total_time_ns': 'int',
            'wr_highest_offset': 'int',
-           'rd_merged': 'int', 'wr_merged': 'int',
+           'rd_merged': 'int', 'wr_merged': 'int', 'unmap_merged': 'int',
            '*idle_time_ns': 'int',
            'failed_rd_operations': 'int', 'failed_wr_operations': 'int',
-           'failed_flush_operations': 'int',
+           'failed_flush_operations': 'int', 'failed_unmap_operations': 'int',
            'invalid_rd_operations': 'int', 'invalid_wr_operations': 'int',
-           'invalid_flush_operations': 'int',
+           'invalid_flush_operations': 'int', 'invalid_unmap_operations': 'int',
            'account_invalid': 'bool', 'account_failed': 'bool',
            'timed_stats': ['BlockDeviceTimedStats'],
            '*rd_latency_histogram': 'BlockLatencyHistogramInfo',
diff --git a/include/block/accounting.h b/include/block/accounting.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/accounting.h
+++ b/include/block/accounting.h
@@ -XXX,XX +XXX,XX @@ enum BlockAcctType {
     BLOCK_ACCT_READ,
     BLOCK_ACCT_WRITE,
     BLOCK_ACCT_FLUSH,
+    BLOCK_ACCT_UNMAP,
     BLOCK_MAX_IOTYPE,
 };
 
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 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk)
 
     ds->rd_bytes = stats->nr_bytes[BLOCK_ACCT_READ];
     ds->wr_bytes = stats->nr_bytes[BLOCK_ACCT_WRITE];
+    ds->unmap_bytes = stats->nr_bytes[BLOCK_ACCT_UNMAP];
     ds->rd_operations = stats->nr_ops[BLOCK_ACCT_READ];
     ds->wr_operations = stats->nr_ops[BLOCK_ACCT_WRITE];
+    ds->unmap_operations = stats->nr_ops[BLOCK_ACCT_UNMAP];
 
     ds->failed_rd_operations = stats->failed_ops[BLOCK_ACCT_READ];
     ds->failed_wr_operations = stats->failed_ops[BLOCK_ACCT_WRITE];
     ds->failed_flush_operations = stats->failed_ops[BLOCK_ACCT_FLUSH];
+    ds->failed_unmap_operations = stats->failed_ops[BLOCK_ACCT_UNMAP];
 
     ds->invalid_rd_operations = stats->invalid_ops[BLOCK_ACCT_READ];
     ds->invalid_wr_operations = stats->invalid_ops[BLOCK_ACCT_WRITE];
     ds->invalid_flush_operations =
         stats->invalid_ops[BLOCK_ACCT_FLUSH];
+    ds->invalid_unmap_operations = stats->invalid_ops[BLOCK_ACCT_UNMAP];
 
     ds->rd_merged = stats->merged[BLOCK_ACCT_READ];
     ds->wr_merged = stats->merged[BLOCK_ACCT_WRITE];
+    ds->unmap_merged = stats->merged[BLOCK_ACCT_UNMAP];
     ds->flush_operations = stats->nr_ops[BLOCK_ACCT_FLUSH];
     ds->wr_total_time_ns = stats->total_time_ns[BLOCK_ACCT_WRITE];
     ds->rd_total_time_ns = stats->total_time_ns[BLOCK_ACCT_READ];
     ds->flush_total_time_ns = stats->total_time_ns[BLOCK_ACCT_FLUSH];
+    ds->unmap_total_time_ns = stats->total_time_ns[BLOCK_ACCT_UNMAP];
 
     ds->has_idle_time_ns = stats->last_access_time_ns > 0;
     if (ds->has_idle_time_ns) {
diff --git a/tests/qemu-iotests/227.out b/tests/qemu-iotests/227.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/227.out
+++ b/tests/qemu-iotests/227.out
@@ -XXX,XX +XXX,XX @@ Testing: -drive driver=null-co,read-zeroes=on,if=virtio
         {
             "device": "virtio0",
             "stats": {
+                "unmap_operations": 0,
+                "unmap_merged": 0,
                 "flush_total_time_ns": 0,
                 "wr_highest_offset": 0,
                 "wr_total_time_ns": 0,
@@ -XXX,XX +XXX,XX @@ Testing: -drive driver=null-co,read-zeroes=on,if=virtio
                 "wr_bytes": 0,
                 "timed_stats": [
                 ],
+                "failed_unmap_operations": 0,
                 "failed_flush_operations": 0,
                 "account_invalid": true,
                 "rd_total_time_ns": 0,
+                "invalid_unmap_operations": 0,
                 "flush_operations": 0,
                 "wr_operations": 0,
+                "unmap_bytes": 0,
                 "rd_merged": 0,
                 "rd_bytes": 0,
+                "unmap_total_time_ns": 0,
                 "invalid_flush_operations": 0,
                 "account_failed": true,
                 "rd_operations": 0,
@@ -XXX,XX +XXX,XX @@ Testing: -drive driver=null-co,if=none
         {
             "device": "none0",
             "stats": {
+                "unmap_operations": 0,
+                "unmap_merged": 0,
                 "flush_total_time_ns": 0,
                 "wr_highest_offset": 0,
                 "wr_total_time_ns": 0,
@@ -XXX,XX +XXX,XX @@ Testing: -drive driver=null-co,if=none
                 "wr_bytes": 0,
                 "timed_stats": [
                 ],
+                "failed_unmap_operations": 0,
                 "failed_flush_operations": 0,
                 "account_invalid": true,
                 "rd_total_time_ns": 0,
+                "invalid_unmap_operations": 0,
                 "flush_operations": 0,
                 "wr_operations": 0,
+                "unmap_bytes": 0,
                 "rd_merged": 0,
                 "rd_bytes": 0,
+                "unmap_total_time_ns": 0,
                 "invalid_flush_operations": 0,
                 "account_failed": true,
                 "rd_operations": 0,
@@ -XXX,XX +XXX,XX @@ Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device virtio-b
         {
             "device": "",
             "stats": {
+                "unmap_operations": 0,
+                "unmap_merged": 0,
                 "flush_total_time_ns": 0,
                 "wr_highest_offset": 0,
                 "wr_total_time_ns": 0,
@@ -XXX,XX +XXX,XX @@ Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device virtio-b
                 "wr_bytes": 0,
                 "timed_stats": [
                 ],
+                "failed_unmap_operations": 0,
                 "failed_flush_operations": 0,
                 "account_invalid": false,
                 "rd_total_time_ns": 0,
+                "invalid_unmap_operations": 0,
                 "flush_operations": 0,
                 "wr_operations": 0,
+                "unmap_bytes": 0,
                 "rd_merged": 0,
                 "rd_bytes": 0,
+                "unmap_total_time_ns": 0,
                 "invalid_flush_operations": 0,
                 "account_failed": false,
                 "rd_operations": 0,
-- 
2.21.0

From: Anton Nefedov <anton.nefedov@virtuozzo.com>

Each block_acct_done/failed call is designed to correspond to a
previous block_acct_start call, which initializes the stats cookie.
However sometimes it is not the case, e.g. some error paths might
report the same cookie twice because it is hard to accurately track if
the cookie was reported yet or not.

This patch cleans the cookie after report.
(Note: block_acct_failed/done without a previous block_acct_start at
all should be avoided. Uninitialized cookie might hold a garbage value
and there is still "< BLOCK_MAX_IOTYPE" assertion for that)

It will be particularly useful in ide code where it's hard to
keep track whether the request done its accounting or not: in the
following patch of the series, trim requests will do the accounting
separately.

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190923121737.83281-4-anton.nefedov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 include/block/accounting.h | 1 +
 block/accounting.c         | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/include/block/accounting.h b/include/block/accounting.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/accounting.h
+++ b/include/block/accounting.h
@@ -XXX,XX +XXX,XX @@ typedef struct BlockAcctTimedStats BlockAcctTimedStats;
 typedef struct BlockAcctStats BlockAcctStats;
 
 enum BlockAcctType {
+    BLOCK_ACCT_NONE = 0,
     BLOCK_ACCT_READ,
     BLOCK_ACCT_WRITE,
     BLOCK_ACCT_FLUSH,
diff --git a/block/accounting.c b/block/accounting.c
index XXXXXXX..XXXXXXX 100644
--- a/block/accounting.c
+++ b/block/accounting.c
@@ -XXX,XX +XXX,XX @@ static void block_account_one_io(BlockAcctStats *stats, BlockAcctCookie *cookie,
 
     assert(cookie->type < BLOCK_MAX_IOTYPE);
 
+    if (cookie->type == BLOCK_ACCT_NONE) {
+        return;
+    }
+
     qemu_mutex_lock(&stats->lock);
 
     if (failed) {
@@ -XXX,XX +XXX,XX @@ static void block_account_one_io(BlockAcctStats *stats, BlockAcctCookie *cookie,
     }
 
     qemu_mutex_unlock(&stats->lock);
+
+    cookie->type = BLOCK_ACCT_NONE;
 }
 
 void block_acct_done(BlockAcctStats *stats, BlockAcctCookie *cookie)
-- 
2.21.0

From: Anton Nefedov <anton.nefedov@virtuozzo.com>

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190923121737.83281-5-anton.nefedov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 hw/ide/core.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/hw/ide/core.c b/hw/ide/core.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -XXX,XX +XXX,XX @@ static void ide_issue_trim_cb(void *opaque, int ret)
     TrimAIOCB *iocb = opaque;
     IDEState *s = iocb->s;
 
+    if (iocb->i >= 0) {
+        if (ret >= 0) {
+            block_acct_done(blk_get_stats(s->blk), &s->acct);
+        } else {
+            block_acct_failed(blk_get_stats(s->blk), &s->acct);
+        }
+    }
+
     if (ret >= 0) {
         while (iocb->j < iocb->qiov->niov) {
             int j = iocb->j;
@@ -XXX,XX +XXX,XX @@ static void ide_issue_trim_cb(void *opaque, int ret)
                 }
 
                 if (!ide_sect_range_ok(s, sector, count)) {
+                    block_acct_invalid(blk_get_stats(s->blk), BLOCK_ACCT_UNMAP);
                     iocb->ret = -EINVAL;
                     goto done;
                 }
 
+                block_acct_start(blk_get_stats(s->blk), &s->acct,
+                                 count << BDRV_SECTOR_BITS, BLOCK_ACCT_UNMAP);
+
                 /* Got an entry! Submit and exit.  */
                 iocb->aiocb = blk_aio_pdiscard(s->blk,
                                                sector << BDRV_SECTOR_BITS,
-- 
2.21.0

From: Anton Nefedov <anton.nefedov@virtuozzo.com>

it allows to report it in the error handler

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Message-id: 20190923121737.83281-6-anton.nefedov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 hw/scsi/scsi-disk.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -XXX,XX +XXX,XX @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret)
 {
     SCSIDiskReq *r = data->r;
     SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
-    uint64_t sector_num;
-    uint32_t nb_sectors;
 
     assert(r->req.aiocb == NULL);
     if (scsi_disk_req_check_error(r, ret, false)) {
@@ -XXX,XX +XXX,XX @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret)
     }
 
     if (data->count > 0) {
-        sector_num = ldq_be_p(&data->inbuf[0]);
-        nb_sectors = ldl_be_p(&data->inbuf[8]) & 0xffffffffULL;
-        if (!check_lba_range(s, sector_num, nb_sectors)) {
+        r->sector = ldq_be_p(&data->inbuf[0])
+            * (s->qdev.blocksize / BDRV_SECTOR_SIZE);
+        r->sector_count = (ldl_be_p(&data->inbuf[8]) & 0xffffffffULL)
+            * (s->qdev.blocksize / BDRV_SECTOR_SIZE);
+        if (!check_lba_range(s, r->sector, r->sector_count)) {
             scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));
             goto done;
         }
 
         r->req.aiocb = blk_aio_pdiscard(s->qdev.conf.blk,
-                                        sector_num * s->qdev.blocksize,
-                                        nb_sectors * s->qdev.blocksize,
+                                        r->sector * BDRV_SECTOR_SIZE,
+                                        r->sector_count * BDRV_SECTOR_SIZE,
                                         scsi_unmap_complete, data);
         data->count--;
         data->inbuf += 16;
-- 
2.21.0

From: Anton Nefedov <anton.nefedov@virtuozzo.com>

This will help to account the operation in the following commit.

The difference is that we don't call scsi_disk_req_check_error() before
the 1st discard iteration anymore. That function also checks if
the request is cancelled, however it shouldn't get canceled until it
yields in blk_aio() functions anyway.
Same approach is already used for emulate_write_same.

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-id: 20190923121737.83281-7-anton.nefedov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 hw/scsi/scsi-disk.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -XXX,XX +XXX,XX @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret)
     SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
 
     assert(r->req.aiocb == NULL);
-    if (scsi_disk_req_check_error(r, ret, false)) {
-        goto done;
-    }
 
     if (data->count > 0) {
         r->sector = ldq_be_p(&data->inbuf[0])
@@ -XXX,XX +XXX,XX @@ static void scsi_unmap_complete(void *opaque, int ret)
     r->req.aiocb = NULL;
 
     aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk));
-    scsi_unmap_complete_noio(data, ret);
+    if (scsi_disk_req_check_error(r, ret, false)) {
+        scsi_req_unref(&r->req);
+        g_free(data);
+    } else {
+        scsi_unmap_complete_noio(data, ret);
+    }
     aio_context_release(blk_get_aio_context(s->qdev.conf.blk));
 }
 
-- 
2.21.0

From: Anton Nefedov <anton.nefedov@virtuozzo.com>

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190923121737.83281-8-anton.nefedov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 hw/scsi/scsi-disk.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -XXX,XX +XXX,XX @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret)
         r->sector_count = (ldl_be_p(&data->inbuf[8]) & 0xffffffffULL)
             * (s->qdev.blocksize / BDRV_SECTOR_SIZE);
         if (!check_lba_range(s, r->sector, r->sector_count)) {
+            block_acct_invalid(blk_get_stats(s->qdev.conf.blk),
+                               BLOCK_ACCT_UNMAP);
             scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));
             goto done;
         }
 
+        block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct,
+                         r->sector_count * BDRV_SECTOR_SIZE,
+                         BLOCK_ACCT_UNMAP);
+
         r->req.aiocb = blk_aio_pdiscard(s->qdev.conf.blk,
                                         r->sector * BDRV_SECTOR_SIZE,
                                         r->sector_count * BDRV_SECTOR_SIZE,
@@ -XXX,XX +XXX,XX @@ static void scsi_unmap_complete(void *opaque, int ret)
     r->req.aiocb = NULL;
 
     aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk));
-    if (scsi_disk_req_check_error(r, ret, false)) {
+    if (scsi_disk_req_check_error(r, ret, true)) {
         scsi_req_unref(&r->req);
         g_free(data);
     } else {
+        block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct);
         scsi_unmap_complete_noio(data, ret);
     }
     aio_context_release(blk_get_aio_context(s->qdev.conf.blk));
@@ -XXX,XX +XXX,XX @@ static void scsi_disk_emulate_unmap(SCSIDiskReq *r, uint8_t *inbuf)
     }
 
     if (blk_is_read_only(s->qdev.conf.blk)) {
+        block_acct_invalid(blk_get_stats(s->qdev.conf.blk), BLOCK_ACCT_UNMAP);
         scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED));
         return;
     }
@@ -XXX,XX +XXX,XX @@ static void scsi_disk_emulate_unmap(SCSIDiskReq *r, uint8_t *inbuf)
     return;
 
 invalid_param_len:
+    block_acct_invalid(blk_get_stats(s->qdev.conf.blk), BLOCK_ACCT_UNMAP);
     scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
     return;
 
 invalid_field:
+    block_acct_invalid(blk_get_stats(s->qdev.conf.blk), BLOCK_ACCT_UNMAP);
     scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
 }
 
-- 
2.21.0

From: Anton Nefedov <anton.nefedov@virtuozzo.com>

This will help to identify how many of the user-issued discard operations
(accounted on a device level) have actually suceeded down on the host file
(even though the numbers will not be exactly the same if non-raw format
driver is used (e.g. qcow2 sending metadata discards)).

Note that these numbers will not include discards triggered by
write-zeroes + MAY_UNMAP calls.

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190923121737.83281-9-anton.nefedov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/file-posix.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRawState {
     bool needs_alignment;
     bool drop_cache;
     bool check_cache_dropped;
+    struct {
+        uint64_t discard_nb_ok;
+        uint64_t discard_nb_failed;
+        uint64_t discard_bytes_ok;
+    } stats;
 
     PRManager *pr_mgr;
 } BDRVRawState;
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
 #endif /* !__linux__ */
 }
 
+static void raw_account_discard(BDRVRawState *s, uint64_t nbytes, int ret)
+{
+    if (ret) {
+        s->stats.discard_nb_failed++;
+    } else {
+        s->stats.discard_nb_ok++;
+        s->stats.discard_bytes_ok += nbytes;
+    }
+}
+
 static coroutine_fn int
 raw_do_pdiscard(BlockDriverState *bs, int64_t offset, int bytes, bool blkdev)
 {
     BDRVRawState *s = bs->opaque;
     RawPosixAIOData acb;
+    int ret;
 
     acb = (RawPosixAIOData) {
         .bs             = bs,
@@ -XXX,XX +XXX,XX @@ raw_do_pdiscard(BlockDriverState *bs, int64_t offset, int bytes, bool blkdev)
         acb.aio_type |= QEMU_AIO_BLKDEV;
     }
 
-    return raw_thread_pool_submit(bs, handle_aiocb_discard, &acb);
+    ret = raw_thread_pool_submit(bs, handle_aiocb_discard, &acb);
+    raw_account_discard(s, bytes, ret);
+    return ret;
 }
 
 static coroutine_fn int
@@ -XXX,XX +XXX,XX @@ static int fd_open(BlockDriverState *bs)
 static coroutine_fn int
 hdev_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes)
 {
+    BDRVRawState *s = bs->opaque;
     int ret;
 
     ret = fd_open(bs);
     if (ret < 0) {
+        raw_account_discard(s, bytes, ret);
         return ret;
     }
     return raw_do_pdiscard(bs, offset, bytes, true);
-- 
2.21.0

From: Anton Nefedov <anton.nefedov@virtuozzo.com>

A block driver can provide a callback to report driver-specific
statistics.

file-posix driver now reports discard statistics

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
Message-id: 20190923121737.83281-10-anton.nefedov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 qapi/block-core.json      | 38 ++++++++++++++++++++++++++++++++++++++
 include/block/block.h     |  1 +
 include/block/block_int.h |  1 +
 block.c                   |  9 +++++++++
 block/file-posix.c        | 32 ++++++++++++++++++++++++++++++++
 block/qapi.c              |  5 +++++
 6 files changed, 86 insertions(+)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
            '*wr_latency_histogram': 'BlockLatencyHistogramInfo',
            '*flush_latency_histogram': 'BlockLatencyHistogramInfo' } }
 
+##
+# @BlockStatsSpecificFile:
+#
+# File driver statistics
+#
+# @discard-nb-ok: The number of successful discard operations performed by
+#                 the driver.
+#
+# @discard-nb-failed: The number of failed discard operations performed by
+#                     the driver.
+#
+# @discard-bytes-ok: The number of bytes discarded by the driver.
+#
+# Since: 4.2
+##
+{ 'struct': 'BlockStatsSpecificFile',
+  'data': {
+      'discard-nb-ok': 'uint64',
+      'discard-nb-failed': 'uint64',
+      'discard-bytes-ok': 'uint64' } }
+
+##
+# @BlockStatsSpecific:
+#
+# Block driver specific statistics
+#
+# Since: 4.2
+##
+{ 'union': 'BlockStatsSpecific',
+  'base': { 'driver': 'BlockdevDriver' },
+  'discriminator': 'driver',
+  'data': {
+      'file': 'BlockStatsSpecificFile',
+      'host_device': 'BlockStatsSpecificFile' } }
+
 ##
 # @BlockStats:
 #
@@ -XXX,XX +XXX,XX @@
 #
 # @stats:  A @BlockDeviceStats for the device.
 #
+# @driver-specific: Optional driver-specific stats. (Since 4.2)
+#
 # @parent: This describes the file block device if it has one.
 #          Contains recursively the statistics of the underlying
 #          protocol (e.g. the host file for a qcow2 image). If there is
@@ -XXX,XX +XXX,XX @@
 { 'struct': 'BlockStats',
   'data': {'*device': 'str', '*qdev': 'str', '*node-name': 'str',
            'stats': 'BlockDeviceStats',
+           '*driver-specific': 'BlockStatsSpecific',
            '*parent': 'BlockStats',
            '*backing': 'BlockStats'} }
 
diff --git a/include/block/block.h b/include/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ int bdrv_get_flags(BlockDriverState *bs);
 int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
 ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs,
                                           Error **errp);
+BlockStatsSpecific *bdrv_get_specific_stats(BlockDriverState *bs);
 void bdrv_round_to_clusters(BlockDriverState *bs,
                             int64_t offset, int64_t bytes,
                             int64_t *cluster_offset,
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 @@ struct BlockDriver {
     int (*bdrv_get_info)(BlockDriverState *bs, BlockDriverInfo *bdi);
     ImageInfoSpecific *(*bdrv_get_specific_info)(BlockDriverState *bs,
                                                  Error **errp);
+    BlockStatsSpecific *(*bdrv_get_specific_stats)(BlockDriverState *bs);
 
     int coroutine_fn (*bdrv_save_vmstate)(BlockDriverState *bs,
                                           QEMUIOVector *qiov,
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs,
     return NULL;
 }
 
+BlockStatsSpecific *bdrv_get_specific_stats(BlockDriverState *bs)
+{
+    BlockDriver *drv = bs->drv;
+    if (!drv || !drv->bdrv_get_specific_stats) {
+        return NULL;
+    }
+    return drv->bdrv_get_specific_stats(bs);
+}
+
 void bdrv_debug_event(BlockDriverState *bs, BlkdebugEvent event)
 {
     if (!bs || !bs->drv || !bs->drv->bdrv_debug_event) {
diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static int raw_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
     return 0;
 }
 
+static BlockStatsSpecificFile get_blockstats_specific_file(BlockDriverState *bs)
+{
+    BDRVRawState *s = bs->opaque;
+    return (BlockStatsSpecificFile) {
+        .discard_nb_ok = s->stats.discard_nb_ok,
+        .discard_nb_failed = s->stats.discard_nb_failed,
+        .discard_bytes_ok = s->stats.discard_bytes_ok,
+    };
+}
+
+static BlockStatsSpecific *raw_get_specific_stats(BlockDriverState *bs)
+{
+    BlockStatsSpecific *stats = g_new(BlockStatsSpecific, 1);
+
+    stats->driver = BLOCKDEV_DRIVER_FILE;
+    stats->u.file = get_blockstats_specific_file(bs);
+
+    return stats;
+}
+
+static BlockStatsSpecific *hdev_get_specific_stats(BlockDriverState *bs)
+{
+    BlockStatsSpecific *stats = g_new(BlockStatsSpecific, 1);
+
+    stats->driver = BLOCKDEV_DRIVER_HOST_DEVICE;
+    stats->u.host_device = get_blockstats_specific_file(bs);
+
+    return stats;
+}
+
 static QemuOptsList raw_create_opts = {
     .name = "raw-create-opts",
     .head = QTAILQ_HEAD_INITIALIZER(raw_create_opts.head),
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_file = {
     .bdrv_get_info = raw_get_info,
     .bdrv_get_allocated_file_size
                         = raw_get_allocated_file_size,
+    .bdrv_get_specific_stats = raw_get_specific_stats,
     .bdrv_check_perm = raw_check_perm,
     .bdrv_set_perm   = raw_set_perm,
     .bdrv_abort_perm_update = raw_abort_perm_update,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
     .bdrv_get_info = raw_get_info,
     .bdrv_get_allocated_file_size
                         = raw_get_allocated_file_size,
+    .bdrv_get_specific_stats = hdev_get_specific_stats,
     .bdrv_check_perm = raw_check_perm,
     .bdrv_set_perm   = raw_set_perm,
     .bdrv_abort_perm_update = raw_abort_perm_update,
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 @@ static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs,
 
     s->stats->wr_highest_offset = stat64_get(&bs->wr_highest_offset);
 
+    s->driver_specific = bdrv_get_specific_stats(bs);
+    if (s->driver_specific) {
+        s->has_driver_specific = true;
+    }
+
     if (bs->file) {
         s->has_parent = true;
         s->parent = bdrv_query_bds_stats(bs->file->bs, blk_level);
-- 
2.21.0

If we use growth_mode = metadata, it is very much possible that the file
uses more disk space after we have written something to the added area.
We did indeed want to test for this case, but unfortunately we evidently
just copied the code from the "Test creation preallocation" section and
forgot to replace "$create_mode" by "$growth_mode".

We never noticed because we only read the first number from qemu-img
info's "disk size" output -- and that is effectively useless, because
qemu-img prints a human-readable value (which generally includes a
decimal point).  That will be fixed in the patch after the next one.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190925183231.11196-2-mreitz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/125 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/125
+++ b/tests/qemu-iotests/125
@@ -XXX,XX +XXX,XX @@ for GROWTH_SIZE in 16 48 80; do
                 if [ $file_length_2 -gt $file_length_1 ]; then
                     echo "ERROR (grow): Image length has grown from $file_length_1 to $file_length_2"
                 fi
-                if [ $create_mode != metadata ]; then
+                if [ $growth_mode != metadata ]; then
                     # The host size should not have grown either
                     if [ $host_size_2 -gt $host_size_1 ]; then
                         echo "ERROR (grow): Host size has grown from $host_size_1 to $host_size_2"
-- 
2.21.0

And by that I mean all XFS versions, as far as I can tell.  All details
are in the comment below.

We never noticed this problem because we only read the first number from
qemu-img info's "disk size" output -- and that is effectively useless,
because qemu-img prints a human-readable value (which generally includes
a decimal point).  That will be fixed in the next patch.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190925183231.11196-3-mreitz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/125 | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/125
+++ b/tests/qemu-iotests/125
@@ -XXX,XX +XXX,XX @@ if [ -z "$TEST_IMG_FILE" ]; then
     TEST_IMG_FILE=$TEST_IMG
 fi
 
+# Test whether we are running on a broken XFS version.  There is this
+# bug:
+
+# $ rm -f foo
+# $ touch foo
+# $ block_size=4096 # Your FS's block size
+# $ fallocate -o $((block_size / 2)) -l $block_size foo
+# $ LANG=C xfs_bmap foo | grep hole
+#         1: [8..15]: hole
+#
+# The problem is that the XFS driver rounds down the offset and
+# rounds up the length to the block size, but independently.  As
+# such, it only allocates the first block in the example above,
+# even though it should allocate the first two blocks (because our
+# request is to fallocate something that touches both the first
+# two blocks).
+#
+# This means that when you then write to the beginning of the
+# second block, the disk usage of the first two blocks grows.
+#
+# That is precisely what fallocate() promises, though: That when you
+# write to an area that you have fallocated, no new blocks will have
+# to be allocated.
+
+touch "$TEST_IMG_FILE"
+# Assuming there is no FS with a block size greater than 64k
+fallocate -o 65535 -l 2 "$TEST_IMG_FILE"
+len0=$(get_image_size_on_host)
+
+# Write to something that in theory we have just fallocated
+# (Thus, the on-disk size should not increase)
+poke_file "$TEST_IMG_FILE" 65536 42
+len1=$(get_image_size_on_host)
+
+if [ $len1 -gt $len0 ]; then
+    _notrun "the test filesystem's fallocate() is broken"
+fi
+
+rm -f "$TEST_IMG_FILE"
+
 # Generally, we create some image with or without existing preallocation and
 # then resize it. Then we write some data into the image and verify that its
 # size does not change if we have used preallocation.
-- 
2.21.0

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

Move synchronization mechanism to block-copy, to be able to use one
block-copy instance from backup job and backup-top filter in parallel.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20191001131409.14202-2-vsementsov@virtuozzo.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 include/block/block-copy.h |  8 ++++++
 block/backup.c             | 52 --------------------------------------
 block/block-copy.c         | 43 +++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/include/block/block-copy.h b/include/block/block-copy.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-copy.h
+++ b/include/block/block-copy.h
@@ -XXX,XX +XXX,XX @@
 
 #include "block/block.h"
 
+typedef struct BlockCopyInFlightReq {
+    int64_t start_byte;
+    int64_t end_byte;
+    QLIST_ENTRY(BlockCopyInFlightReq) list;
+    CoQueue wait_queue; /* coroutines blocked on this request */
+} BlockCopyInFlightReq;
+
 typedef void (*ProgressBytesCallbackFunc)(int64_t bytes, void *opaque);
 typedef void (*ProgressResetCallbackFunc)(void *opaque);
 typedef struct BlockCopyState {
@@ -XXX,XX +XXX,XX @@ typedef struct BlockCopyState {
     bool use_copy_range;
     int64_t copy_range_size;
     uint64_t len;
+    QLIST_HEAD(, BlockCopyInFlightReq) inflight_reqs;
 
     BdrvRequestFlags write_flags;
 
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 @@
 
 #define BACKUP_CLUSTER_SIZE_DEFAULT (1 << 16)
 
-typedef struct CowRequest {
-    int64_t start_byte;
-    int64_t end_byte;
-    QLIST_ENTRY(CowRequest) list;
-    CoQueue wait_queue; /* coroutines blocked on this request */
-} CowRequest;
-
 typedef struct BackupBlockJob {
     BlockJob common;
     BlockDriverState *source_bs;
@@ -XXX,XX +XXX,XX @@ typedef struct BackupBlockJob {
     uint64_t bytes_read;
     int64_t cluster_size;
     NotifierWithReturn before_write;
-    QLIST_HEAD(, CowRequest) inflight_reqs;
 
     BlockCopyState *bcs;
 } BackupBlockJob;
 
 static const BlockJobDriver backup_job_driver;
 
-/* See if in-flight requests overlap and wait for them to complete */
-static void coroutine_fn wait_for_overlapping_requests(BackupBlockJob *job,
-                                                       int64_t start,
-                                                       int64_t end)
-{
-    CowRequest *req;
-    bool retry;
-
-    do {
-        retry = false;
-        QLIST_FOREACH(req, &job->inflight_reqs, list) {
-            if (end > req->start_byte && start < req->end_byte) {
-                qemu_co_queue_wait(&req->wait_queue, NULL);
-                retry = true;
-                break;
-            }
-        }
-    } while (retry);
-}
-
-/* Keep track of an in-flight request */
-static void cow_request_begin(CowRequest *req, BackupBlockJob *job,
-                              int64_t start, int64_t end)
-{
-    req->start_byte = start;
-    req->end_byte = end;
-    qemu_co_queue_init(&req->wait_queue);
-    QLIST_INSERT_HEAD(&job->inflight_reqs, req, list);
-}
-
-/* Forget about a completed request */
-static void cow_request_end(CowRequest *req)
-{
-    QLIST_REMOVE(req, list);
-    qemu_co_queue_restart_all(&req->wait_queue);
-}
-
 static void backup_progress_bytes_callback(int64_t bytes, void *opaque)
 {
     BackupBlockJob *s = opaque;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_cow(BackupBlockJob *job,
                                       bool *error_is_read,
                                       bool is_write_notifier)
 {
-    CowRequest cow_request;
     int ret = 0;
     int64_t start, end; /* bytes */
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_do_cow(BackupBlockJob *job,
 
     trace_backup_do_cow_enter(job, start, offset, bytes);
 
-    wait_for_overlapping_requests(job, start, end);
-    cow_request_begin(&cow_request, job, start, end);
-
     ret = block_copy(job->bcs, start, end - start, error_is_read,
                      is_write_notifier);
 
-    cow_request_end(&cow_request);
-
     trace_backup_do_cow_return(job, offset, bytes, ret);
 
     qemu_co_rwlock_unlock(&job->flush_rwlock);
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_run(Job *job, Error **errp)
     BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);
     int ret = 0;
 
-    QLIST_INIT(&s->inflight_reqs);
     qemu_co_rwlock_init(&s->flush_rwlock);
 
     backup_init_copy_bitmap(s);
diff --git a/block/block-copy.c b/block/block-copy.c
index XXXXXXX..XXXXXXX 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -XXX,XX +XXX,XX @@
 #include "block/block-copy.h"
 #include "sysemu/block-backend.h"
 
+static void coroutine_fn block_copy_wait_inflight_reqs(BlockCopyState *s,
+                                                       int64_t start,
+                                                       int64_t end)
+{
+    BlockCopyInFlightReq *req;
+    bool waited;
+
+    do {
+        waited = false;
+        QLIST_FOREACH(req, &s->inflight_reqs, list) {
+            if (end > req->start_byte && start < req->end_byte) {
+                qemu_co_queue_wait(&req->wait_queue, NULL);
+                waited = true;
+                break;
+            }
+        }
+    } while (waited);
+}
+
+static void block_copy_inflight_req_begin(BlockCopyState *s,
+                                          BlockCopyInFlightReq *req,
+                                          int64_t start, int64_t end)
+{
+    req->start_byte = start;
+    req->end_byte = end;
+    qemu_co_queue_init(&req->wait_queue);
+    QLIST_INSERT_HEAD(&s->inflight_reqs, req, list);
+}
+
+static void coroutine_fn block_copy_inflight_req_end(BlockCopyInFlightReq *req)
+{
+    QLIST_REMOVE(req, list);
+    qemu_co_queue_restart_all(&req->wait_queue);
+}
+
 void block_copy_state_free(BlockCopyState *s)
 {
     if (!s) {
@@ -XXX,XX +XXX,XX @@ BlockCopyState *block_copy_state_new(
     s->use_copy_range =
         !(write_flags & BDRV_REQ_WRITE_COMPRESSED) && s->copy_range_size > 0;
 
+    QLIST_INIT(&s->inflight_reqs);
+
     /*
      * We just allow aio context change on our block backends. block_copy() user
      * (now it's only backup) is responsible for source and target being in same
@@ -XXX,XX +XXX,XX @@ int coroutine_fn block_copy(BlockCopyState *s,
     int64_t end = bytes + start; /* bytes */
     void *bounce_buffer = NULL;
     int64_t status_bytes;
+    BlockCopyInFlightReq req;
 
     /*
      * block_copy() user is responsible for keeping source and target in same
@@ -XXX,XX +XXX,XX @@ int coroutine_fn block_copy(BlockCopyState *s,
     assert(QEMU_IS_ALIGNED(start, s->cluster_size));
     assert(QEMU_IS_ALIGNED(end, s->cluster_size));
 
+    block_copy_wait_inflight_reqs(s, start, bytes);
+    block_copy_inflight_req_begin(s, &req, start, end);
+
     while (start < end) {
         int64_t dirty_end;
 
@@ -XXX,XX +XXX,XX @@ int coroutine_fn block_copy(BlockCopyState *s,
         qemu_vfree(bounce_buffer);
     }
 
+    block_copy_inflight_req_end(&req);
+
     return ret;
 }
-- 
2.21.0

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

This is logic-less refactoring, which simplifies further patch, as
we'll need write_flags for backup-top filter creation and backup-top
should be created before block job creation.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20191001131409.14202-3-vsementsov@virtuozzo.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/backup.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 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 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
         goto error;
     }
 
-    /* job->len is fixed, so we can't allow resize */
-    job = block_job_create(job_id, &backup_job_driver, txn, bs, 0, BLK_PERM_ALL,
-                           speed, creation_flags, cb, opaque, errp);
-    if (!job) {
-        goto error;
-    }
-
-    job->source_bs = bs;
-    job->on_source_error = on_source_error;
-    job->on_target_error = on_target_error;
-    job->sync_mode = sync_mode;
-    job->sync_bitmap = sync_bitmap;
-    job->bitmap_mode = bitmap_mode;
-
     /*
      * If source is in backing chain of target assume that target is going to be
      * used for "image fleecing", i.e. it should represent a kind of snapshot of
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
     write_flags = (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0) |
                   (compress ? BDRV_REQ_WRITE_COMPRESSED : 0),
 
+    /* job->len is fixed, so we can't allow resize */
+    job = block_job_create(job_id, &backup_job_driver, txn, bs, 0, BLK_PERM_ALL,
+                           speed, creation_flags, cb, opaque, errp);
+    if (!job) {
+        goto error;
+    }
+
+    job->source_bs = bs;
+    job->on_source_error = on_source_error;
+    job->on_target_error = on_target_error;
+    job->sync_mode = sync_mode;
+    job->sync_bitmap = sync_bitmap;
+    job->bitmap_mode = bitmap_mode;
+
     job->bcs = block_copy_state_new(bs, target, cluster_size, write_flags,
                                     backup_progress_bytes_callback,
                                     backup_progress_reset_callback, job, errp);
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
     }
 
     job->cluster_size = cluster_size;
+    job->len = len;
 
     /* Required permissions are already taken by block-copy-state target */
     block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
                        &error_abort);
-    job->len = len;
 
     return &job->common;
 
-- 
2.21.0

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

Split block_copy_set_callbacks out of block_copy_state_new. It's needed
for further commit: block-copy will use BdrvChildren of backup-top
filter, so it will be created from backup-top filter creation function.
But callbacks will still belong to backup job and will be set in
separate.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20191001131409.14202-4-vsementsov@virtuozzo.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 include/block/block-copy.h | 13 +++++++++----
 block/backup.c             |  6 ++++--
 block/block-copy.c         | 24 +++++++++++++++---------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/include/block/block-copy.h b/include/block/block-copy.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-copy.h
+++ b/include/block/block-copy.h
@@ -XXX,XX +XXX,XX @@ typedef struct BlockCopyState {
     void *progress_opaque;
 } BlockCopyState;
 
-BlockCopyState *block_copy_state_new(
-        BlockDriverState *source, BlockDriverState *target,
-        int64_t cluster_size, BdrvRequestFlags write_flags,
+BlockCopyState *block_copy_state_new(BlockDriverState *source,
+                                     BlockDriverState *target,
+                                     int64_t cluster_size,
+                                     BdrvRequestFlags write_flags,
+                                     Error **errp);
+
+void block_copy_set_callbacks(
+        BlockCopyState *s,
         ProgressBytesCallbackFunc progress_bytes_callback,
         ProgressResetCallbackFunc progress_reset_callback,
-        void *progress_opaque, Error **errp);
+        void *progress_opaque);
 
 void block_copy_state_free(BlockCopyState *s);
 
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 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
     job->bitmap_mode = bitmap_mode;
 
     job->bcs = block_copy_state_new(bs, target, cluster_size, write_flags,
-                                    backup_progress_bytes_callback,
-                                    backup_progress_reset_callback, job, errp);
+                                    errp);
     if (!job->bcs) {
         goto error;
     }
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
     job->cluster_size = cluster_size;
     job->len = len;
 
+    block_copy_set_callbacks(job->bcs, backup_progress_bytes_callback,
+                             backup_progress_reset_callback, job);
+
     /* Required permissions are already taken by block-copy-state target */
     block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
                        &error_abort);
diff --git a/block/block-copy.c b/block/block-copy.c
index XXXXXXX..XXXXXXX 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -XXX,XX +XXX,XX @@ void block_copy_state_free(BlockCopyState *s)
     g_free(s);
 }
 
-BlockCopyState *block_copy_state_new(
-        BlockDriverState *source, BlockDriverState *target,
-        int64_t cluster_size, BdrvRequestFlags write_flags,
-        ProgressBytesCallbackFunc progress_bytes_callback,
-        ProgressResetCallbackFunc progress_reset_callback,
-        void *progress_opaque, Error **errp)
+BlockCopyState *block_copy_state_new(BlockDriverState *source,
+                                     BlockDriverState *target,
+                                     int64_t cluster_size,
+                                     BdrvRequestFlags write_flags, Error **errp)
 {
     BlockCopyState *s;
     int ret;
@@ -XXX,XX +XXX,XX @@ BlockCopyState *block_copy_state_new(
         .cluster_size = cluster_size,
         .len = bdrv_dirty_bitmap_size(copy_bitmap),
         .write_flags = write_flags,
-        .progress_bytes_callback = progress_bytes_callback,
-        .progress_reset_callback = progress_reset_callback,
-        .progress_opaque = progress_opaque,
     };
 
     s->copy_range_size = QEMU_ALIGN_DOWN(MIN(blk_get_max_transfer(s->source),
@@ -XXX,XX +XXX,XX @@ fail:
     return NULL;
 }
 
+void block_copy_set_callbacks(
+        BlockCopyState *s,
+        ProgressBytesCallbackFunc progress_bytes_callback,
+        ProgressResetCallbackFunc progress_reset_callback,
+        void *progress_opaque)
+{
+    s->progress_bytes_callback = progress_bytes_callback;
+    s->progress_reset_callback = progress_reset_callback;
+    s->progress_opaque = progress_opaque;
+}
+
 /*
  * Copy range to target with a bounce buffer and return the bytes copied. If
  * error occurred, return a negative error number
-- 
2.21.0

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

Backup-top filter caches write operations and does copy-before-write
operations.

The driver will be used in backup instead of write-notifiers.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20191001131409.14202-5-vsementsov@virtuozzo.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/Makefile.objs |   1 +
 block/backup-top.h  |  41 +++++++
 block/backup-top.c  | 281 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 323 insertions(+)
 create mode 100644 block/backup-top.h
 create mode 100644 block/backup-top.c

diff --git a/block/Makefile.objs b/block/Makefile.objs
index XXXXXXX..XXXXXXX 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -XXX,XX +XXX,XX @@ block-obj-y += block-copy.o
 block-obj-y += crypto.o
 
 block-obj-y += aio_task.o
+block-obj-y += backup-top.o
 
 common-obj-y += stream.o
 
diff --git a/block/backup-top.h b/block/backup-top.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/block/backup-top.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * backup-top filter driver
+ *
+ * The driver performs Copy-Before-Write (CBW) operation: it is injected above
+ * some node, and before each write it copies _old_ data to the target node.
+ *
+ * Copyright (c) 2018-2019 Virtuozzo International GmbH.
+ *
+ * Author:
+ *  Sementsov-Ogievskiy Vladimir <vsementsov@virtuozzo.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/>.
+ */
+
+#ifndef BACKUP_TOP_H
+#define BACKUP_TOP_H
+
+#include "block/block_int.h"
+#include "block/block-copy.h"
+
+BlockDriverState *bdrv_backup_top_append(BlockDriverState *source,
+                                         BlockDriverState *target,
+                                         const char *filter_node_name,
+                                         uint64_t cluster_size,
+                                         BdrvRequestFlags write_flags,
+                                         BlockCopyState **bcs,
+                                         Error **errp);
+void bdrv_backup_top_drop(BlockDriverState *bs);
+
+#endif /* BACKUP_TOP_H */
diff --git a/block/backup-top.c b/block/backup-top.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/block/backup-top.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * backup-top filter driver
+ *
+ * The driver performs Copy-Before-Write (CBW) operation: it is injected above
+ * some node, and before each write it copies _old_ data to the target node.
+ *
+ * Copyright (c) 2018-2019 Virtuozzo International GmbH.
+ *
+ * Author:
+ *  Sementsov-Ogievskiy Vladimir <vsementsov@virtuozzo.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/>.
+ */
+
+#include "qemu/osdep.h"
+
+#include "sysemu/block-backend.h"
+#include "qemu/cutils.h"
+#include "qapi/error.h"
+#include "block/block_int.h"
+#include "block/qdict.h"
+#include "block/block-copy.h"
+
+#include "block/backup-top.h"
+
+typedef struct BDRVBackupTopState {
+    BlockCopyState *bcs;
+    BdrvChild *target;
+    bool active;
+} BDRVBackupTopState;
+
+static coroutine_fn int backup_top_co_preadv(
+        BlockDriverState *bs, uint64_t offset, uint64_t bytes,
+        QEMUIOVector *qiov, int flags)
+{
+    return bdrv_co_preadv(bs->backing, offset, bytes, qiov, flags);
+}
+
+static coroutine_fn int backup_top_cbw(BlockDriverState *bs, uint64_t offset,
+                                       uint64_t bytes)
+{
+    /*
+     * Here we'd like to use block_copy(), but block-copy need to be moved to
+     * use BdrvChildren to correctly use it in backup-top filter. It's a TODO.
+     */
+
+    abort();
+}
+
+static int coroutine_fn backup_top_co_pdiscard(BlockDriverState *bs,
+                                               int64_t offset, int bytes)
+{
+    int ret = backup_top_cbw(bs, offset, bytes);
+    if (ret < 0) {
+        return ret;
+    }
+
+    return bdrv_co_pdiscard(bs->backing, offset, bytes);
+}
+
+static int coroutine_fn backup_top_co_pwrite_zeroes(BlockDriverState *bs,
+        int64_t offset, int bytes, BdrvRequestFlags flags)
+{
+    int ret = backup_top_cbw(bs, offset, bytes);
+    if (ret < 0) {
+        return ret;
+    }
+
+    return bdrv_co_pwrite_zeroes(bs->backing, offset, bytes, flags);
+}
+
+static coroutine_fn int backup_top_co_pwritev(BlockDriverState *bs,
+                                              uint64_t offset,
+                                              uint64_t bytes,
+                                              QEMUIOVector *qiov, int flags)
+{
+    if (!(flags & BDRV_REQ_WRITE_UNCHANGED)) {
+        int ret = backup_top_cbw(bs, offset, bytes);
+        if (ret < 0) {
+            return ret;
+        }
+    }
+
+    return bdrv_co_pwritev(bs->backing, offset, bytes, qiov, flags);
+}
+
+static int coroutine_fn backup_top_co_flush(BlockDriverState *bs)
+{
+    if (!bs->backing) {
+        return 0;
+    }
+
+    return bdrv_co_flush(bs->backing->bs);
+}
+
+static void backup_top_refresh_filename(BlockDriverState *bs)
+{
+    if (bs->backing == NULL) {
+        /*
+         * we can be here after failed bdrv_attach_child in
+         * bdrv_set_backing_hd
+         */
+        return;
+    }
+    pstrcpy(bs->exact_filename, sizeof(bs->exact_filename),
+            bs->backing->bs->filename);
+}
+
+static void backup_top_child_perm(BlockDriverState *bs, BdrvChild *c,
+                                  const BdrvChildRole *role,
+                                  BlockReopenQueue *reopen_queue,
+                                  uint64_t perm, uint64_t shared,
+                                  uint64_t *nperm, uint64_t *nshared)
+{
+    BDRVBackupTopState *s = bs->opaque;
+
+    if (!s->active) {
+        /*
+         * The filter node may be in process of bdrv_append(), which firstly do
+         * bdrv_set_backing_hd() and then bdrv_replace_node(). This means that
+         * we can't unshare BLK_PERM_WRITE during bdrv_append() operation. So,
+         * let's require nothing during bdrv_append() and refresh permissions
+         * after it (see bdrv_backup_top_append()).
+         */
+        *nperm = 0;
+        *nshared = BLK_PERM_ALL;
+        return;
+    }
+
+    if (role == &child_file) {
+        /*
+         * Target child
+         *
+         * Share write to target (child_file), to not interfere
+         * with guest writes to its disk which may be in target backing chain.
+         */
+        *nshared = BLK_PERM_ALL;
+        *nperm = BLK_PERM_WRITE;
+    } else {
+        /* Source child */
+        bdrv_filter_default_perms(bs, c, role, reopen_queue, perm, shared,
+                                  nperm, nshared);
+
+        if (perm & BLK_PERM_WRITE) {
+            *nperm = *nperm | BLK_PERM_CONSISTENT_READ;
+        }
+        *nshared &= ~BLK_PERM_WRITE;
+    }
+}
+
+BlockDriver bdrv_backup_top_filter = {
+    .format_name = "backup-top",
+    .instance_size = sizeof(BDRVBackupTopState),
+
+    .bdrv_co_preadv             = backup_top_co_preadv,
+    .bdrv_co_pwritev            = backup_top_co_pwritev,
+    .bdrv_co_pwrite_zeroes      = backup_top_co_pwrite_zeroes,
+    .bdrv_co_pdiscard           = backup_top_co_pdiscard,
+    .bdrv_co_flush              = backup_top_co_flush,
+
+    .bdrv_co_block_status       = bdrv_co_block_status_from_backing,
+
+    .bdrv_refresh_filename      = backup_top_refresh_filename,
+
+    .bdrv_child_perm            = backup_top_child_perm,
+
+    .is_filter = true,
+};
+
+BlockDriverState *bdrv_backup_top_append(BlockDriverState *source,
+                                         BlockDriverState *target,
+                                         const char *filter_node_name,
+                                         uint64_t cluster_size,
+                                         BdrvRequestFlags write_flags,
+                                         BlockCopyState **bcs,
+                                         Error **errp)
+{
+    Error *local_err = NULL;
+    BDRVBackupTopState *state;
+    BlockDriverState *top = bdrv_new_open_driver(&bdrv_backup_top_filter,
+                                                 filter_node_name,
+                                                 BDRV_O_RDWR, errp);
+
+    if (!top) {
+        return NULL;
+    }
+
+    top->total_sectors = source->total_sectors;
+    top->opaque = state = g_new0(BDRVBackupTopState, 1);
+
+    bdrv_ref(target);
+    state->target = bdrv_attach_child(top, target, "target", &child_file, errp);
+    if (!state->target) {
+        bdrv_unref(target);
+        bdrv_unref(top);
+        return NULL;
+    }
+
+    bdrv_drained_begin(source);
+
+    bdrv_ref(top);
+    bdrv_append(top, source, &local_err);
+    if (local_err) {
+        error_prepend(&local_err, "Cannot append backup-top filter: ");
+        goto append_failed;
+    }
+
+    /*
+     * bdrv_append() finished successfully, now we can require permissions
+     * we want.
+     */
+    state->active = true;
+    bdrv_child_refresh_perms(top, top->backing, &local_err);
+    if (local_err) {
+        error_prepend(&local_err,
+                      "Cannot set permissions for backup-top filter: ");
+        goto failed_after_append;
+    }
+
+    /*
+     * TODO: Create block-copy-state here (which will utilize @cluster_size and
+     * @write_flags parameters which are unused now). For this, block-copy
+     * should be refactored to use BdrvChildren.
+     */
+    state->bcs = NULL;
+    if (!state->bcs) {
+        error_setg(&local_err, "Cannot create block-copy-state");
+        goto failed_after_append;
+    }
+    *bcs = state->bcs;
+
+    bdrv_drained_end(source);
+
+    return top;
+
+failed_after_append:
+    state->active = false;
+    bdrv_backup_top_drop(top);
+
+append_failed:
+    bdrv_drained_end(source);
+    bdrv_unref_child(top, state->target);
+    bdrv_unref(top);
+    error_propagate(errp, local_err);
+
+    return NULL;
+}
+
+void bdrv_backup_top_drop(BlockDriverState *bs)
+{
+    BDRVBackupTopState *s = bs->opaque;
+    AioContext *aio_context = bdrv_get_aio_context(bs);
+
+    block_copy_state_free(s->bcs);
+
+    aio_context_acquire(aio_context);
+
+    bdrv_drained_begin(bs);
+
+    s->active = false;
+    bdrv_child_refresh_perms(bs, bs->backing, &error_abort);
+    bdrv_replace_node(bs, backing_bs(bs), &error_abort);
+    bdrv_set_backing_hd(bs, NULL, &error_abort);
+
+    bdrv_drained_end(bs);
+
+    bdrv_unref(bs);
+
+    aio_context_release(aio_context);
+}
-- 
2.21.0

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

Drop write notifiers and use filter node instead.

= Changes =

1. Add filter-node-name argument for backup qmp api. We have to do it
in this commit, as 257 needs to be fixed.

2. There are no more write notifiers here, so is_write_notifier
parameter is dropped from block-copy paths.

3. To sync with in-flight requests at job finish we now have drained
removing of the filter, we don't need rw-lock.

4. Block-copy is now using BdrvChildren instead of BlockBackends

5. As backup-top owns these children, we also move block-copy state
into backup-top's ownership.

= Iotest changes =

56: op-blocker doesn't shoot now, as we set it on source, but then
check on filter, when trying to start second backup.
To keep the test we instead can catch another collision: both jobs will
get 'drive0' job-id, as job-id parameter is unspecified. To prevent
interleaving with file-posix locks (as they are dependent on config)
let's use another target for second backup.

Also, it's obvious now that we'd like to drop this op-blocker at all
and add a test-case for two backups from one node (to different
destinations) actually works. But not in these series.

141: Output changed: prepatch, "Node is in use" comes from bdrv_has_blk
check inside qmp_blockdev_del. But we've dropped block-copy blk
objects, so no more blk objects on source bs (job blk is on backup-top
filter bs). New message is from op-blocker, which is the next check in
qmp_blockdev_add.

257: The test wants to emulate guest write during backup. They should
go to filter node, not to original source node, of course. Therefore we
need to specify filter node name and use it.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20191001131409.14202-6-vsementsov@virtuozzo.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 qapi/block-core.json       |   8 +-
 include/block/block-copy.h |  14 +-
 include/block/block_int.h  |   1 +
 block/backup-top.c         |  21 +--
 block/backup.c             |  73 +++------
 block/block-copy.c         |  81 +++-------
 block/replication.c        |   2 +-
 blockdev.c                 |   1 +
 tests/qemu-iotests/056     |   8 +-
 tests/qemu-iotests/141.out |   2 +-
 tests/qemu-iotests/257     |   7 +-
 tests/qemu-iotests/257.out | 306 ++++++++++++++++++-------------------
 12 files changed, 237 insertions(+), 287 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 #                list without user intervention.
 #                Defaults to true. (Since 2.12)
 #
+# @filter-node-name: the node name that should be assigned to the
+#                    filter driver that the backup job inserts into the graph
+#                    above node specified by @drive. If this option is not given,
+#                    a node name is autogenerated. (Since: 4.2)
+#
 # Note: @on-source-error and @on-target-error only affect background
 # I/O.  If an error occurs during a guest write request, the device's
 # rerror/werror actions will be used.
@@ -XXX,XX +XXX,XX @@
             '*compress': 'bool',
             '*on-source-error': 'BlockdevOnError',
             '*on-target-error': 'BlockdevOnError',
-            '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
+            '*auto-finalize': 'bool', '*auto-dismiss': 'bool',
+            '*filter-node-name': 'str' } }
 
 ##
 # @DriveBackup:
diff --git a/include/block/block-copy.h b/include/block/block-copy.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-copy.h
+++ b/include/block/block-copy.h
@@ -XXX,XX +XXX,XX @@ typedef struct BlockCopyInFlightReq {
 typedef void (*ProgressBytesCallbackFunc)(int64_t bytes, void *opaque);
 typedef void (*ProgressResetCallbackFunc)(void *opaque);
 typedef struct BlockCopyState {
-    BlockBackend *source;
-    BlockBackend *target;
+    /*
+     * BdrvChild objects are not owned or managed by block-copy. They are
+     * provided by block-copy user and user is responsible for appropriate
+     * permissions on these children.
+     */
+    BdrvChild *source;
+    BdrvChild *target;
     BdrvDirtyBitmap *copy_bitmap;
     int64_t cluster_size;
     bool use_copy_range;
@@ -XXX,XX +XXX,XX @@ typedef struct BlockCopyState {
     void *progress_opaque;
 } BlockCopyState;
 
-BlockCopyState *block_copy_state_new(BlockDriverState *source,
-                                     BlockDriverState *target,
+BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
                                      int64_t cluster_size,
                                      BdrvRequestFlags write_flags,
                                      Error **errp);
@@ -XXX,XX +XXX,XX @@ int64_t block_copy_reset_unallocated(BlockCopyState *s,
                                      int64_t offset, int64_t *count);
 
 int coroutine_fn block_copy(BlockCopyState *s, int64_t start, uint64_t bytes,
-                            bool *error_is_read, bool is_write_notifier);
+                            bool *error_is_read);
 
 #endif /* BLOCK_COPY_H */
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 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
                             BdrvDirtyBitmap *sync_bitmap,
                             BitmapSyncMode bitmap_mode,
                             bool compress,
+                            const char *filter_node_name,
                             BlockdevOnError on_source_error,
                             BlockdevOnError on_target_error,
                             int creation_flags,
diff --git a/block/backup-top.c b/block/backup-top.c
index XXXXXXX..XXXXXXX 100644
--- a/block/backup-top.c
+++ b/block/backup-top.c
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int backup_top_co_preadv(
 static coroutine_fn int backup_top_cbw(BlockDriverState *bs, uint64_t offset,
                                        uint64_t bytes)
 {
-    /*
-     * Here we'd like to use block_copy(), but block-copy need to be moved to
-     * use BdrvChildren to correctly use it in backup-top filter. It's a TODO.
-     */
+    BDRVBackupTopState *s = bs->opaque;
+    uint64_t end = QEMU_ALIGN_UP(offset + bytes, s->bcs->cluster_size);
+    uint64_t off = QEMU_ALIGN_DOWN(offset, s->bcs->cluster_size);
 
-    abort();
+    return block_copy(s->bcs, off, end - off, NULL);
 }
 
 static int coroutine_fn backup_top_co_pdiscard(BlockDriverState *bs,
@@ -XXX,XX +XXX,XX @@ BlockDriverState *bdrv_backup_top_append(BlockDriverState *source,
         goto failed_after_append;
     }
 
-    /*
-     * TODO: Create block-copy-state here (which will utilize @cluster_size and
-     * @write_flags parameters which are unused now). For this, block-copy
-     * should be refactored to use BdrvChildren.
-     */
-    state->bcs = NULL;
-    if (!state->bcs) {
-        error_setg(&local_err, "Cannot create block-copy-state");
+    state->bcs = block_copy_state_new(top->backing, state->target,
+                                      cluster_size, write_flags, &local_err);
+    if (local_err) {
+        error_prepend(&local_err, "Cannot create block-copy-state: ");
         goto failed_after_append;
     }
     *bcs = state->bcs;
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 @@
  * QEMU backup
  *
  * Copyright (C) 2013 Proxmox Server Solutions
+ * Copyright (c) 2019 Virtuozzo International GmbH.
  *
  * Authors:
  *  Dietmar Maurer (dietmar@proxmox.com)
@@ -XXX,XX +XXX,XX @@
 #include "qemu/bitmap.h"
 #include "qemu/error-report.h"
 
+#include "block/backup-top.h"
+
 #define BACKUP_CLUSTER_SIZE_DEFAULT (1 << 16)
 
 typedef struct BackupBlockJob {
     BlockJob common;
+    BlockDriverState *backup_top;
     BlockDriverState *source_bs;
 
     BdrvDirtyBitmap *sync_bitmap;
@@ -XXX,XX +XXX,XX @@ typedef struct BackupBlockJob {
     BitmapSyncMode bitmap_mode;
     BlockdevOnError on_source_error;
     BlockdevOnError on_target_error;
-    CoRwlock flush_rwlock;
     uint64_t len;
     uint64_t bytes_read;
     int64_t cluster_size;
-    NotifierWithReturn before_write;
 
     BlockCopyState *bcs;
 } BackupBlockJob;
@@ -XXX,XX +XXX,XX @@ static void backup_progress_reset_callback(void *opaque)
 
 static int coroutine_fn backup_do_cow(BackupBlockJob *job,
                                       int64_t offset, uint64_t bytes,
-                                      bool *error_is_read,
-                                      bool is_write_notifier)
+                                      bool *error_is_read)
 {
     int ret = 0;
     int64_t start, end; /* bytes */
 
-    qemu_co_rwlock_rdlock(&job->flush_rwlock);
-
     start = QEMU_ALIGN_DOWN(offset, job->cluster_size);
     end = QEMU_ALIGN_UP(bytes + offset, job->cluster_size);
 
     trace_backup_do_cow_enter(job, start, offset, bytes);
 
-    ret = block_copy(job->bcs, start, end - start, error_is_read,
-                     is_write_notifier);
+    ret = block_copy(job->bcs, start, end - start, error_is_read);
 
     trace_backup_do_cow_return(job, offset, bytes, ret);
 
-    qemu_co_rwlock_unlock(&job->flush_rwlock);
-
     return ret;
 }
 
-static int coroutine_fn backup_before_write_notify(
-        NotifierWithReturn *notifier,
-        void *opaque)
-{
-    BackupBlockJob *job = container_of(notifier, BackupBlockJob, before_write);
-    BdrvTrackedRequest *req = opaque;
-
-    assert(req->bs == job->source_bs);
-    assert(QEMU_IS_ALIGNED(req->offset, BDRV_SECTOR_SIZE));
-    assert(QEMU_IS_ALIGNED(req->bytes, BDRV_SECTOR_SIZE));
-
-    return backup_do_cow(job, req->offset, req->bytes, NULL, true);
-}
-
 static void backup_cleanup_sync_bitmap(BackupBlockJob *job, int ret)
 {
     BdrvDirtyBitmap *bm;
@@ -XXX,XX +XXX,XX @@ static void backup_clean(Job *job)
 {
     BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);
 
-    block_copy_state_free(s->bcs);
+    bdrv_backup_top_drop(s->backup_top);
 }
 
 void backup_do_checkpoint(BlockJob *job, Error **errp)
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_loop(BackupBlockJob *job)
             if (yield_and_check(job)) {
                 goto out;
             }
-            ret = backup_do_cow(job, offset,
-                                job->cluster_size, &error_is_read, false);
+            ret = backup_do_cow(job, offset, job->cluster_size, &error_is_read);
             if (ret < 0 && backup_error_action(job, error_is_read, -ret) ==
                            BLOCK_ERROR_ACTION_REPORT)
             {
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_run(Job *job, Error **errp)
     BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);
     int ret = 0;
 
-    qemu_co_rwlock_init(&s->flush_rwlock);
-
     backup_init_copy_bitmap(s);
 
-    s->before_write.notify = backup_before_write_notify;
-    bdrv_add_before_write_notifier(s->source_bs, &s->before_write);
-
     if (s->sync_mode == MIRROR_SYNC_MODE_TOP) {
         int64_t offset = 0;
         int64_t count;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_run(Job *job, Error **errp)
     }
 
  out:
-    notifier_with_return_remove(&s->before_write);
-
-    /* wait until pending backup_do_cow() calls have completed */
-    qemu_co_rwlock_wrlock(&s->flush_rwlock);
-    qemu_co_rwlock_unlock(&s->flush_rwlock);
-
     return ret;
 }
 
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
                   MirrorSyncMode sync_mode, BdrvDirtyBitmap *sync_bitmap,
                   BitmapSyncMode bitmap_mode,
                   bool compress,
+                  const char *filter_node_name,
                   BlockdevOnError on_source_error,
                   BlockdevOnError on_target_error,
                   int creation_flags,
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
     BackupBlockJob *job = NULL;
     int64_t cluster_size;
     BdrvRequestFlags write_flags;
+    BlockDriverState *backup_top = NULL;
+    BlockCopyState *bcs = NULL;
 
     assert(bs);
     assert(target);
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
     write_flags = (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0) |
                   (compress ? BDRV_REQ_WRITE_COMPRESSED : 0),
 
+    backup_top = bdrv_backup_top_append(bs, target, filter_node_name,
+                                        cluster_size, write_flags, &bcs, errp);
+    if (!backup_top) {
+        goto error;
+    }
+
     /* job->len is fixed, so we can't allow resize */
-    job = block_job_create(job_id, &backup_job_driver, txn, bs, 0, BLK_PERM_ALL,
+    job = block_job_create(job_id, &backup_job_driver, txn, backup_top,
+                           0, BLK_PERM_ALL,
                            speed, creation_flags, cb, opaque, errp);
     if (!job) {
         goto error;
     }
 
+    job->backup_top = backup_top;
     job->source_bs = bs;
     job->on_source_error = on_source_error;
     job->on_target_error = on_target_error;
     job->sync_mode = sync_mode;
     job->sync_bitmap = sync_bitmap;
     job->bitmap_mode = bitmap_mode;
-
-    job->bcs = block_copy_state_new(bs, target, cluster_size, write_flags,
-                                    errp);
-    if (!job->bcs) {
-        goto error;
-    }
-
+    job->bcs = bcs;
     job->cluster_size = cluster_size;
     job->len = len;
 
-    block_copy_set_callbacks(job->bcs, backup_progress_bytes_callback,
+    block_copy_set_callbacks(bcs, backup_progress_bytes_callback,
                              backup_progress_reset_callback, job);
 
-    /* Required permissions are already taken by block-copy-state target */
+    /* Required permissions are already taken by backup-top target */
     block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
                        &error_abort);
 
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
     if (job) {
         backup_clean(&job->common.job);
         job_early_fail(&job->common.job);
+    } else if (backup_top) {
+        bdrv_backup_top_drop(backup_top);
     }
 
     return NULL;
diff --git a/block/block-copy.c b/block/block-copy.c
index XXXXXXX..XXXXXXX 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -XXX,XX +XXX,XX @@ void block_copy_state_free(BlockCopyState *s)
         return;
     }
 
-    bdrv_release_dirty_bitmap(blk_bs(s->source), s->copy_bitmap);
-    blk_unref(s->source);
-    blk_unref(s->target);
+    bdrv_release_dirty_bitmap(s->source->bs, s->copy_bitmap);
     g_free(s);
 }
 
-BlockCopyState *block_copy_state_new(BlockDriverState *source,
-                                     BlockDriverState *target,
+BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
                                      int64_t cluster_size,
                                      BdrvRequestFlags write_flags, Error **errp)
 {
     BlockCopyState *s;
-    int ret;
-    uint64_t no_resize = BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE |
-                         BLK_PERM_WRITE_UNCHANGED | BLK_PERM_GRAPH_MOD;
     BdrvDirtyBitmap *copy_bitmap;
+    uint32_t max_transfer =
+            MIN_NON_ZERO(INT_MAX, MIN_NON_ZERO(source->bs->bl.max_transfer,
+                                               target->bs->bl.max_transfer));
 
-    copy_bitmap = bdrv_create_dirty_bitmap(source, cluster_size, NULL, errp);
+    copy_bitmap = bdrv_create_dirty_bitmap(source->bs, cluster_size, NULL,
+                                           errp);
     if (!copy_bitmap) {
         return NULL;
     }
@@ -XXX,XX +XXX,XX @@ BlockCopyState *block_copy_state_new(BlockDriverState *source,
 
     s = g_new(BlockCopyState, 1);
     *s = (BlockCopyState) {
-        .source = blk_new(bdrv_get_aio_context(source),
-                          BLK_PERM_CONSISTENT_READ, no_resize),
-        .target = blk_new(bdrv_get_aio_context(target),
-                          BLK_PERM_WRITE, no_resize),
+        .source = source,
+        .target = target,
         .copy_bitmap = copy_bitmap,
         .cluster_size = cluster_size,
         .len = bdrv_dirty_bitmap_size(copy_bitmap),
         .write_flags = write_flags,
     };
 
-    s->copy_range_size = QEMU_ALIGN_DOWN(MIN(blk_get_max_transfer(s->source),
-                                             blk_get_max_transfer(s->target)),
-                                         s->cluster_size);
+    s->copy_range_size = QEMU_ALIGN_DOWN(max_transfer, cluster_size),
     /*
      * Set use_copy_range, consider the following:
      * 1. Compression is not supported for copy_range.
@@ -XXX,XX +XXX,XX @@ BlockCopyState *block_copy_state_new(BlockDriverState *source,
 
     QLIST_INIT(&s->inflight_reqs);
 
-    /*
-     * We just allow aio context change on our block backends. block_copy() user
-     * (now it's only backup) is responsible for source and target being in same
-     * aio context.
-     */
-    blk_set_disable_request_queuing(s->source, true);
-    blk_set_allow_aio_context_change(s->source, true);
-    blk_set_disable_request_queuing(s->target, true);
-    blk_set_allow_aio_context_change(s->target, true);
-
-    ret = blk_insert_bs(s->source, source, errp);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    ret = blk_insert_bs(s->target, target, errp);
-    if (ret < 0) {
-        goto fail;
-    }
-
     return s;
-
-fail:
-    block_copy_state_free(s);
-
-    return NULL;
 }
 
 void block_copy_set_callbacks(
@@ -XXX,XX +XXX,XX @@ void block_copy_set_callbacks(
 static int coroutine_fn block_copy_with_bounce_buffer(BlockCopyState *s,
                                                       int64_t start,
                                                       int64_t end,
-                                                      bool is_write_notifier,
                                                       bool *error_is_read,
                                                       void **bounce_buffer)
 {
     int ret;
     int nbytes;
-    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
 
     assert(QEMU_IS_ALIGNED(start, s->cluster_size));
     bdrv_reset_dirty_bitmap(s->copy_bitmap, start, s->cluster_size);
     nbytes = MIN(s->cluster_size, s->len - start);
     if (!*bounce_buffer) {
-        *bounce_buffer = blk_blockalign(s->source, s->cluster_size);
+        *bounce_buffer = qemu_blockalign(s->source->bs, s->cluster_size);
     }
 
-    ret = blk_co_pread(s->source, start, nbytes, *bounce_buffer, read_flags);
+    ret = bdrv_co_pread(s->source, start, nbytes, *bounce_buffer, 0);
     if (ret < 0) {
         trace_block_copy_with_bounce_buffer_read_fail(s, start, ret);
         if (error_is_read) {
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn block_copy_with_bounce_buffer(BlockCopyState *s,
         goto fail;
     }
 
-    ret = blk_co_pwrite(s->target, start, nbytes, *bounce_buffer,
-                        s->write_flags);
+    ret = bdrv_co_pwrite(s->target, start, nbytes, *bounce_buffer,
+                         s->write_flags);
     if (ret < 0) {
         trace_block_copy_with_bounce_buffer_write_fail(s, start, ret);
         if (error_is_read) {
@@ -XXX,XX +XXX,XX @@ fail:
  */
 static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
                                                 int64_t start,
-                                                int64_t end,
-                                                bool is_write_notifier)
+                                                int64_t end)
 {
     int ret;
     int nr_clusters;
     int nbytes;
-    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
 
     assert(QEMU_IS_ALIGNED(s->copy_range_size, s->cluster_size));
     assert(QEMU_IS_ALIGNED(start, s->cluster_size));
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
     nr_clusters = DIV_ROUND_UP(nbytes, s->cluster_size);
     bdrv_reset_dirty_bitmap(s->copy_bitmap, start,
                             s->cluster_size * nr_clusters);
-    ret = blk_co_copy_range(s->source, start, s->target, start, nbytes,
-                            read_flags, s->write_flags);
+    ret = bdrv_co_copy_range(s->source, start, s->target, start, nbytes,
+                             0, s->write_flags);
     if (ret < 0) {
         trace_block_copy_with_offload_fail(s, start, ret);
         bdrv_set_dirty_bitmap(s->copy_bitmap, start,
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn block_copy_with_offload(BlockCopyState *s,
 static int block_copy_is_cluster_allocated(BlockCopyState *s, int64_t offset,
                                            int64_t *pnum)
 {
-    BlockDriverState *bs = blk_bs(s->source);
+    BlockDriverState *bs = s->source->bs;
     int64_t count, total_count = 0;
     int64_t bytes = s->len - offset;
     int ret;
@@ -XXX,XX +XXX,XX @@ int64_t block_copy_reset_unallocated(BlockCopyState *s,
 
 int coroutine_fn block_copy(BlockCopyState *s,
                             int64_t start, uint64_t bytes,
-                            bool *error_is_read,
-                            bool is_write_notifier)
+                            bool *error_is_read)
 {
     int ret = 0;
     int64_t end = bytes + start; /* bytes */
@@ -XXX,XX +XXX,XX @@ int coroutine_fn block_copy(BlockCopyState *s,
      * block_copy() user is responsible for keeping source and target in same
      * aio context
      */
-    assert(blk_get_aio_context(s->source) == blk_get_aio_context(s->target));
+    assert(bdrv_get_aio_context(s->source->bs) ==
+           bdrv_get_aio_context(s->target->bs));
 
     assert(QEMU_IS_ALIGNED(start, s->cluster_size));
     assert(QEMU_IS_ALIGNED(end, s->cluster_size));
@@ -XXX,XX +XXX,XX @@ int coroutine_fn block_copy(BlockCopyState *s,
         trace_block_copy_process(s, start);
 
         if (s->use_copy_range) {
-            ret = block_copy_with_offload(s, start, dirty_end,
-                                          is_write_notifier);
+            ret = block_copy_with_offload(s, start, dirty_end);
             if (ret < 0) {
                 s->use_copy_range = false;
             }
         }
         if (!s->use_copy_range) {
             ret = block_copy_with_bounce_buffer(s, start, dirty_end,
-                                                is_write_notifier,
                                                 error_is_read, &bounce_buffer);
         }
         if (ret < 0) {
diff --git a/block/replication.c b/block/replication.c
index XXXXXXX..XXXXXXX 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
 
         s->backup_job = backup_job_create(
                                 NULL, s->secondary_disk->bs, s->hidden_disk->bs,
-                                0, MIRROR_SYNC_MODE_NONE, NULL, 0, false,
+                                0, MIRROR_SYNC_MODE_NONE, NULL, 0, false, NULL,
                                 BLOCKDEV_ON_ERROR_REPORT,
                                 BLOCKDEV_ON_ERROR_REPORT, JOB_INTERNAL,
                                 backup_job_completed, bs, NULL, &local_err);
diff --git a/blockdev.c b/blockdev.c
index XXXXXXX..XXXXXXX 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -XXX,XX +XXX,XX @@ static BlockJob *do_backup_common(BackupCommon *backup,
     job = backup_job_create(backup->job_id, bs, target_bs, backup->speed,
                             backup->sync, bmap, backup->bitmap_mode,
                             backup->compress,
+                            backup->filter_node_name,
                             backup->on_source_error,
                             backup->on_target_error,
                             job_flags, NULL, NULL, txn, errp);
diff --git a/tests/qemu-iotests/056 b/tests/qemu-iotests/056
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/056
+++ b/tests/qemu-iotests/056
@@ -XXX,XX +XXX,XX @@ class BackupTest(iotests.QMPTestCase):
         self.vm = iotests.VM()
         self.test_img = img_create('test')
         self.dest_img = img_create('dest')
+        self.dest_img2 = img_create('dest2')
         self.ref_img = img_create('ref')
         self.vm.add_drive(self.test_img)
         self.vm.launch()
@@ -XXX,XX +XXX,XX @@ class BackupTest(iotests.QMPTestCase):
         self.vm.shutdown()
         try_remove(self.test_img)
         try_remove(self.dest_img)
+        try_remove(self.dest_img2)
         try_remove(self.ref_img)
 
     def hmp_io_writes(self, drive, patterns):
@@ -XXX,XX +XXX,XX @@ class BackupTest(iotests.QMPTestCase):
         res = self.vm.qmp('query-block-jobs')
         self.assert_qmp(res, 'return[0]/status', 'concluded')
         # Leave zombie job un-dismissed, observe a failure:
-        res = self.qmp_backup_and_wait(serror="Node 'drive0' is busy: block device is in use by block job: backup",
+        res = self.qmp_backup_and_wait(serror="Job ID 'drive0' already in use",
                                        device='drive0', format=iotests.imgfmt,
-                                       sync='full', target=self.dest_img,
+                                       sync='full', target=self.dest_img2,
                                        auto_dismiss=False)
         self.assertEqual(res, False)
         # OK, dismiss the zombie.
@@ -XXX,XX +XXX,XX @@ class BackupTest(iotests.QMPTestCase):
         self.assert_qmp(res, 'return', [])
         # Ensure it's really gone.
         self.qmp_backup_and_wait(device='drive0', format=iotests.imgfmt,
-                                 sync='full', target=self.dest_img,
+                                 sync='full', target=self.dest_img2,
                                  auto_dismiss=False)
 
     def dismissal_failure(self, dismissal_opt):
diff --git a/tests/qemu-iotests/141.out b/tests/qemu-iotests/141.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/141.out
+++ b/tests/qemu-iotests/141.out
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/m.
 Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT
 {"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"}}
-{"error": {"class": "GenericError", "desc": "Node drv0 is in use"}}
+{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: node is used as backing hd of 'NODE_NAME'"}}
 {"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "job0"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 0, "speed": 0, "type": "backup"}}
diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/257
+++ b/tests/qemu-iotests/257
@@ -XXX,XX +XXX,XX @@ def blockdev_backup(vm, device, target, sync, **kwargs):
                         device=device,
                         target=target,
                         sync=sync,
+                        filter_node_name='backup-top',
                         **kwargs)
     return result
 
@@ -XXX,XX +XXX,XX @@ def backup(drive, n, filepath, sync, **kwargs):
                              job_id=job_id, **kwargs)
     return job_id
 
-def perform_writes(drive, n):
+def perform_writes(drive, n, filter_node_name=None):
     log("--- Write #{:d} ---\n".format(n))
     for pattern in GROUPS[n].patterns:
         cmd = "write -P{:s} 0x{:07x} 0x{:x}".format(
@@ -XXX,XX +XXX,XX @@ def perform_writes(drive, n):
             pattern.offset,
             pattern.size)
         log(cmd)
-        log(drive.vm.hmp_qemu_io(drive.node, cmd))
+        log(drive.vm.hmp_qemu_io(filter_node_name or drive.node, cmd))
     bitmaps = drive.vm.query_bitmaps()
     log({'bitmaps': bitmaps}, indent=2)
     log('')
@@ -XXX,XX +XXX,XX @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
             """Issue writes while the job is open to test bitmap divergence."""
             # Note: when `failure` is 'intermediate', this isn't called.
             log('')
-            bitmaps = perform_writes(drive0, 2)
+            bitmaps = perform_writes(drive0, 2, filter_node_name='backup-top')
             # Named bitmap (static, should be unchanged)
             ebitmap.compare(vm.get_bitmap(drive0.node, 'bitmap0',
                                           bitmaps=bitmaps))
diff --git a/tests/qemu-iotests/257.out b/tests/qemu-iotests/257.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/257.out
+++ b/tests/qemu-iotests/257.out
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 {"return": {}}
 {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 393216, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 {"return": {}}
 {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 393216, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 {"return": {}}
 {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 393216, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 13 dirty sectors; have 13. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 13 dirty sectors; have 13. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "bitmap", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
 {"return": {}}
 {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 67108864, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
 {"return": {}}
 {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 67108864, "offset": 983040, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 1014 dirty sectors; have 1014. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 1014 dirty sectors; have 1014. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "full", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 15 dirty sectors; have 15. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
 {"return": {}}
 {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 458752, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
 {"return": {}}
 {"data": {"action": "report", "device": "backup_1", "operation": "read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 {"data": {"device": "backup_1", "error": "Input/output error", "len": 458752, "offset": 65536, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 14 dirty sectors; have 14. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ write -P0x76 0x3ff0000 0x10000
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_0", "sync": "full", "target": "ref_target_0"}}
 {"return": {}}
 {"data": {"device": "ref_backup_0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_1", "sync": "full", "target": "ref_target_1"}}
 {"return": {}}
 {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 6 dirty sectors; have 6. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_1", "sync": "top", "target": "backup_target_1"}}
 {"return": {}}
 
 --- Write #2 ---
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "ref_backup_2", "sync": "full", "target": "ref_target_2"}}
 {"return": {}}
 {"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
 
@@ -XXX,XX +XXX,XX @@ expecting 12 dirty sectors; have 12. OK!
 {"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
 {"return": {}}
 {}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "backup_2", "sync": "bitmap", "target": "backup_target_2"}}
 {"return": {}}
 {"execute": "job-finalize", "arguments": {"id": "backup_2"}}
 {"return": {}}
@@ -XXX,XX +XXX,XX @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
 
 -- Sync mode incremental tests --
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'incremental' sync mode"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'incremental' sync mode"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'incremental' sync mode"}}
 
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'incremental' sync mode"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be 'on-success' when using sync mode 'incremental'"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be 'on-success' when using sync mode 'incremental'"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be 'on-success' when using sync mode 'incremental'"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "incremental", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be 'on-success' when using sync mode 'incremental'"}}
 
 -- Sync mode bitmap tests --
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'bitmap' sync mode"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'bitmap' sync mode"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'bitmap' sync mode"}}
 
-{"execute": "blockdev-backup", "arguments": {"device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "must provide a valid bitmap name for 'bitmap' sync mode"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "bitmap", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be given when providing a bitmap"}}
 
 -- Sync mode full tests --
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap sync mode 'never' has no meaningful effect when combined with sync mode 'full'"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "full", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be given when providing a bitmap"}}
 
 -- Sync mode top tests --
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap sync mode 'never' has no meaningful effect when combined with sync mode 'top'"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "top", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be given when providing a bitmap"}}
 
 -- Sync mode none tests --
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Cannot specify bitmap sync mode without a bitmap"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap404", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap 'bitmap404' could not be found"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "on-success", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "sync mode 'none' does not produce meaningful bitmap outputs"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "always", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "sync mode 'none' does not produce meaningful bitmap outputs"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "bitmap-mode": "never", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "sync mode 'none' does not produce meaningful bitmap outputs"}}
 
-{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
+{"execute": "blockdev-backup", "arguments": {"bitmap": "bitmap0", "device": "drive0", "filter-node-name": "backup-top", "job-id": "api_job", "sync": "none", "target": "backup_target"}}
 {"error": {"class": "GenericError", "desc": "Bitmap sync mode must be given when providing a bitmap"}}
 
-- 
2.21.0

From: Maxim Levitsky <mlevitsk@redhat.com>

Fixes commit job / qemu-img commit, when
commiting qcow2 file which is based on nbd export.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1718727
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20190930213820.29777-2-mlevitsk@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/nbd.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/block/nbd.c b/block/nbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nbd_client_co_block_status(
         BDRV_BLOCK_OFFSET_VALID;
 }
 
+static int nbd_client_reopen_prepare(BDRVReopenState *state,
+                                     BlockReopenQueue *queue, Error **errp)
+{
+    BDRVNBDState *s = (BDRVNBDState *)state->bs->opaque;
+
+    if ((state->flags & BDRV_O_RDWR) && (s->info.flags & NBD_FLAG_READ_ONLY)) {
+        error_setg(errp, "Can't reopen read-only NBD mount as read/write");
+        return -EACCES;
+    }
+    return 0;
+}
+
 static void nbd_client_close(BlockDriverState *bs)
 {
     BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_nbd = {
     .instance_size              = sizeof(BDRVNBDState),
     .bdrv_parse_filename        = nbd_parse_filename,
     .bdrv_file_open             = nbd_open,
+    .bdrv_reopen_prepare        = nbd_client_reopen_prepare,
     .bdrv_co_preadv             = nbd_client_co_preadv,
     .bdrv_co_pwritev            = nbd_client_co_pwritev,
     .bdrv_co_pwrite_zeroes      = nbd_client_co_pwrite_zeroes,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_nbd_tcp = {
     .instance_size              = sizeof(BDRVNBDState),
     .bdrv_parse_filename        = nbd_parse_filename,
     .bdrv_file_open             = nbd_open,
+    .bdrv_reopen_prepare        = nbd_client_reopen_prepare,
     .bdrv_co_preadv             = nbd_client_co_preadv,
     .bdrv_co_pwritev            = nbd_client_co_pwritev,
     .bdrv_co_pwrite_zeroes      = nbd_client_co_pwrite_zeroes,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_nbd_unix = {
     .instance_size              = sizeof(BDRVNBDState),
     .bdrv_parse_filename        = nbd_parse_filename,
     .bdrv_file_open             = nbd_open,
+    .bdrv_reopen_prepare        = nbd_client_reopen_prepare,
     .bdrv_co_preadv             = nbd_client_co_preadv,
     .bdrv_co_pwritev            = nbd_client_co_pwritev,
     .bdrv_co_pwrite_zeroes      = nbd_client_co_pwrite_zeroes,
-- 
2.21.0

From: Daniel P. Berrangé <berrange@redhat.com>

Some distros are now defaulting to LUKS version 2 which QEMU cannot
process. For our I/O test that validates interoperability between the
kernel/cryptsetup and QEMU, we need to explicitly ask for version 1
of the LUKS format.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20190927101155.25896-1-berrange@redhat.com
Tested-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/149     |  2 +-
 tests/qemu-iotests/149.out | 44 +++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/149
+++ b/tests/qemu-iotests/149
@@ -XXX,XX +XXX,XX @@ def cryptsetup_format(config):
 
     (password, slot) = config.first_password()
 
-    args = ["luksFormat"]
+    args = ["luksFormat", "--type", "luks1"]
     cipher = config.cipher + "-" + config.mode + "-" + config.ivgen
     if config.ivgen_hash is not None:
         cipher = cipher + ":" + config.ivgen_hash
diff --git a/tests/qemu-iotests/149.out b/tests/qemu-iotests/149.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/149.out
+++ b/tests/qemu-iotests/149.out
@@ -XXX,XX +XXX,XX @@
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha1.img qiotest-145-aes-256-xts-plain64-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha1.img
 # Create image
 truncate TEST_DIR/luks-twofish-256-xts-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher twofish-xts-plain64 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-twofish-256-xts-plain64-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher twofish-xts-plain64 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-twofish-256-xts-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-256-xts-plain64-sha1.img qiotest-145-twofish-256-xts-plain64-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-twofish-256-xts-plain64-sha1.img
 # Create image
 truncate TEST_DIR/luks-serpent-256-xts-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher serpent-xts-plain64 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpent-256-xts-plain64-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher serpent-xts-plain64 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpent-256-xts-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-256-xts-plain64-sha1.img qiotest-145-serpent-256-xts-plain64-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-serpent-256-xts-plain64-sha1.img
 # Create image
 truncate TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher cast5-cbc-plain64 --key-size 128 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher cast5-cbc-plain64 --key-size 128 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img qiotest-145-cast5-128-cbc-plain64-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ Skipping cast6-256-xts-plain64-sha1 in blacklist
 # Create image
 truncate TEST_DIR/luks-aes-256-cbc-plain-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-cbc-plain --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-plain-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-cbc-plain --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-plain-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain-sha1.img qiotest-145-aes-256-cbc-plain-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-cbc-plain-sha1.img
 # Create image
 truncate TEST_DIR/luks-aes-256-cbc-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-cbc-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-plain64-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-cbc-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha1.img qiotest-145-aes-256-cbc-plain64-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-cbc-plain64-sha1.img
 # Create image
 truncate TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-cbc-essiv:sha256 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-cbc-essiv:sha256 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img qiotest-145-aes-256-cbc-essiv-sha256-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-essiv:sha256 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-essiv:sha256 --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img qiotest-145-aes-256-xts-essiv-sha256-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img
 # Create image
 truncate TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img qiotest-145-aes-128-xts-plain64-sha256-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img
 # Create image
 truncate TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 384 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 384 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img qiotest-145-aes-192-xts-plain64-sha256-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img
 # Create image
 truncate TEST_DIR/luks-twofish-128-xts-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher twofish-xts-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-twofish-128-xts-plain64-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher twofish-xts-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-twofish-128-xts-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-128-xts-plain64-sha1.img qiotest-145-twofish-128-xts-plain64-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ Skipping twofish-192-xts-plain64-sha1 in blacklist
 # Create image
 truncate TEST_DIR/luks-serpent-128-xts-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher serpent-xts-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpent-128-xts-plain64-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher serpent-xts-plain64 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpent-128-xts-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-128-xts-plain64-sha1.img qiotest-145-serpent-128-xts-plain64-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-serpent-128-xts-plain64-sha1.img
 # Create image
 truncate TEST_DIR/luks-serpent-192-xts-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher serpent-xts-plain64 --key-size 384 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpent-192-xts-plain64-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher serpent-xts-plain64 --key-size 384 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpent-192-xts-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-192-xts-plain64-sha1.img qiotest-145-serpent-192-xts-plain64-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ Skipping cast6-192-xts-plain64-sha1 in blacklist
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-plain64-sha224.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 --hash sha224 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha224.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 512 --hash sha224 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha224.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha224.img qiotest-145-aes-256-xts-plain64-sha224
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha224.img
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-plain64-sha256.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 --hash sha256 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha256.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 512 --hash sha256 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha256.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha256.img qiotest-145-aes-256-xts-plain64-sha256
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha256.img
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-plain64-sha384.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 --hash sha384 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha384.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 512 --hash sha384 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha384.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha384.img qiotest-145-aes-256-xts-plain64-sha384
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha384.img
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-plain64-sha512.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 --hash sha512 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha512.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 512 --hash sha512 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-sha512.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha512.img qiotest-145-aes-256-xts-plain64-sha512
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha512.img
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 --hash ripemd160 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain64 --key-size 512 --hash ripemd160 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img qiotest-145-aes-256-xts-plain64-ripemd160
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-plain-sha1-pwslot3.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain --key-size 512 --hash sha1 --key-slot 3 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain-sha1-pwslot3.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain --key-size 512 --hash sha1 --key-slot 3 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain-sha1-pwslot3.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain-sha1-pwslot3.img qiotest-145-aes-256-xts-plain-sha1-pwslot3
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain-sha1-pwslot3.img
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-xts-plain --key-size 512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img
 # Add password slot 1
 sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img --key-slot 1 --key-file - --iter-time 10 TEST_DIR/passwd.txt
 # Add password slot 2
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img
 # Create image
 truncate TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-cbc-essiv:sha256 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-cbc-essiv:sha256 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img qiotest-145-aes-256-cbc-essiv-auto-sha1
 # Write test pattern 0xa7
@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img
 # Create image
 truncate TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-cbc-plain64:sha256 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img
+sudo cryptsetup -q -v luksFormat --type luks1 --cipher aes-cbc-plain64:sha256 --key-size 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img qiotest-145-aes-256-cbc-plain64-sha256-sha1
 # Write test pattern 0xa7
-- 
2.21.0

Linux 5.3 has made 0.0.0.0/8 a working IPv4 subnet.  As such, "42" is
now a valid host, and the connection to it will (hopefully) time out
over a long period rather than quickly return with EINVAL.

So let us use a negative integer for testing that NBD will not crash
when it receives integer hosts.  This way, the connection will again
fail quickly and reliably.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20191002174052.5773-1-mreitz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/162     | 2 +-
 tests/qemu-iotests/162.out | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/162
+++ b/tests/qemu-iotests/162
@@ -XXX,XX +XXX,XX @@ echo '=== NBD ==='
 # NBD expects all of its arguments to be strings
 
 # So this should not crash
-$QEMU_IMG info 'json:{"driver": "nbd", "host": 42}'
+$QEMU_IMG info 'json:{"driver": "nbd", "host": -1}'
 
 # And this should not treat @port as if it had not been specified
 # (We need to set up a server here, because the error message for "Connection
diff --git a/tests/qemu-iotests/162.out b/tests/qemu-iotests/162.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/162.out
+++ b/tests/qemu-iotests/162.out
@@ -XXX,XX +XXX,XX @@
 QA output created by 162
 
 === NBD ===
-qemu-img: Could not open 'json:{"driver": "nbd", "host": 42}': Failed to connect socket: Invalid argument
+qemu-img: Could not open 'json:{"driver": "nbd", "host": -1}': address resolution failed for -1:10809: Name or service not known
 image: nbd://localhost:PORT
 image: nbd+unix://?socket=42
 
-- 
2.21.0

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

Commit 7a3f542fbd "block/io: refactor padding" occasionally dropped
aligning for zero-length request: bdrv_init_padding() blindly return
false if bytes == 0, like there is nothing to align.

This leads the following command to crash:

./qemu-io --image-opts -c 'write 1 0' \
  driver=blkdebug,align=512,image.driver=null-co,image.size=512

>> qemu-io: block/io.c:1955: bdrv_aligned_pwritev: Assertion
    `(offset & (align - 1)) == 0' failed.
>> Aborted (core dumped)

Prior to 7a3f542fbd we does aligning of such zero requests. Instead of
recovering this behavior let's just do nothing on such requests as it
is useless.

Note that driver may have special meaning of zero-length reqeusts, like
qcow2_co_pwritev_compressed_part, so we can't skip any zero-length
operation. But for unaligned ones, we can't pass it to driver anyway.

This commit also fixes crash in iotest 80 running with -nocache:

./check -nocache -qcow2 80

which crashes on same assertion due to trying to read empty extra data
in qcow2_do_read_snapshots().

Cc: qemu-stable@nongnu.org # v4.2
Fixes: 7a3f542fbd
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20200206164245.17781-1-vsementsov@virtuozzo.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/io.c | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

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 bool bdrv_init_padding(BlockDriverState *bs,
         pad->tail = align - pad->tail;
     }
 
-    if ((!pad->head && !pad->tail) || !bytes) {
+    if (!pad->head && !pad->tail) {
         return false;
     }
 
+    assert(bytes); /* Nothing good in aligning zero-length requests */
+
     sum = pad->head + bytes + pad->tail;
     pad->buf_len = (sum > align && pad->head && pad->tail) ? 2 * align : align;
     pad->buf = qemu_blockalign(bs, pad->buf_len);
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_preadv_part(BdrvChild *child,
         return ret;
     }
 
+    if (bytes == 0 && !QEMU_IS_ALIGNED(offset, bs->bl.request_alignment)) {
+        /*
+         * Aligning zero request is nonsense. Even if driver has special meaning
+         * of zero-length (like qcow2_co_pwritev_compressed_part), we can't pass
+         * it to driver due to request_alignment.
+         *
+         * Still, no reason to return an error if someone do unaligned
+         * zero-length read occasionally.
+         */
+        return 0;
+    }
+
     bdrv_inc_in_flight(bs);
 
     /* Don't do copy-on-read if we read data before write operation */
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child,
         return -ENOTSUP;
     }
 
+    if (bytes == 0 && !QEMU_IS_ALIGNED(offset, bs->bl.request_alignment)) {
+        /*
+         * Aligning zero request is nonsense. Even if driver has special meaning
+         * of zero-length (like qcow2_co_pwritev_compressed_part), we can't pass
+         * it to driver due to request_alignment.
+         *
+         * Still, no reason to return an error if someone do unaligned
+         * zero-length write occasionally.
+         */
+        return 0;
+    }
+
     bdrv_inc_in_flight(bs);
     /*
      * Align write if necessary by performing a read-modify-write cycle.
-- 
2.24.1

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

Commit ed65fd1a2750 ("virtio-blk: switch off scsi-passthrough by
default") changed the default value of the 'scsi' property of
virtio-blk, which is only available on Linux hosts. It also added
an unconditional compat entry for 2.4 or earlier machines.

Trying to set this property on a pre-2.5 machine on OSX, we get:

Unexpected error in object_property_find() at qom/object.c:1201:
   qemu-system-x86_64: -device virtio-blk-pci,id=scsi0,drive=drive0: can't apply global virtio-blk-device.scsi=true: Property '.scsi' not found

Fix this error by marking the property optional.

Fixes: ed65fd1a27 ("virtio-blk: switch off scsi-passthrough by default")
Suggested-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 20200207001404.1739-1-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/core/machine.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/core/machine.c b/hw/core/machine.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -XXX,XX +XXX,XX @@ GlobalProperty hw_compat_2_5[] = {
 const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5);
 
 GlobalProperty hw_compat_2_4[] = {
-    { "virtio-blk-device", "scsi", "true" },
+    /* Optional because the 'scsi' property is Linux-only */
+    { "virtio-blk-device", "scsi", "true", .optional = true },
     { "e1000", "extra_mac_registers", "off" },
     { "virtio-pci", "x-disable-pcie", "on" },
     { "virtio-pci", "migrate-extra", "off" },
-- 
2.24.1