Series comparison

-[Qemu-devel] [PULL 00/29] Block layer patches
+[PULL v2 00/30] Block layer patches
-The following changes since commit 609ef9f451759151d0bfe7c3843410ab94d68f18:
+The following changes since commit 138d2931979cb7ee4a54a434a54088231f6980ff:
-  Merge remote-tracking branch 'remotes/berrange/tags/qio-next-pull-request' into staging (2018-06-28 17:53:31 +0100)
+  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210308' into staging (2021-03-08 11:57:36 +0000)
-are available in the git repository at:
+are available in the Git repository at:
   git://repo.or.cz/qemu/kevin.git tags/for-upstream
-for you to fetch changes up to 583c99d39368526dfb57a715b04a6ceea27dbe1e:
+for you to fetch changes up to ef2e38a1a1d2915b148c4a49f61626e62c46fbb6:
-  block: Remove unused sector-based vectored I/O (2018-06-29 14:20:56 +0200)
+  blockdev: Clarify error messages pertaining to 'node-name' (2021-03-08 14:56:55 +0100)
 ----------------------------------------------------------------
 Block layer patches:
-- Make truncate operations asynchronous (so that preallocation in
+- qemu-storage-daemon: add --pidfile option
-  blockdev-create doesn't block the main loop any more)
+- qemu-storage-daemon: CLI error messages include the option name now
-- usb-storage: Add rerror/werror properties
+- vhost-user-blk export: Misc fixes
-- nvme: Add num_queues property
+- docs: Improvements for qemu-storage-daemon documentation
-- qemu-img convert: Copy offloading fixes (including data corruption fix)
+- parallels: load bitmap extension
-- qcow2: Fix cluster leak on temporary write error
+- backup-top: Don't crash on post-finalize accesses
-- Use byte-based functions instead of bdrv_co_readv/writev()
+- Improve error messages related to node-name options
-- Various small fixes and cleanups
+- iotests improvements
 ----------------------------------------------------------------
-Eric Blake (8):
+Alberto Garcia (1):
-      parallels: Switch to byte-based calls
+      iotests: Drop deprecated 'props' from object-add
       qcow: Switch get_cluster_offset to be byte-based
       qcow: Switch qcow_co_readv to byte-based calls
       qcow: Switch qcow_co_writev to byte-based calls
       qcow: Switch to a byte-based driver
       replication: Switch to byte-based calls
       vhdx: Switch to byte-based calls
       block: Remove unused sector-based vectored I/O
-Fam Zheng (5):
+Connor Kuehl (2):
-      qcow2: Remove dead check on !ret
+      block: Clarify error messages pertaining to 'node-name'
-      block: Move request tracking to children in copy offloading
+      blockdev: Clarify error messages pertaining to 'node-name'
       qcow2: Fix src_offset in copy offloading
       iscsi: Don't blindly use designator length in response for memcpy
       file-posix: Fix EINTR handling
-Kevin Wolf (12):
+Eric Blake (1):
-      qapi/job: The next release will be 3.0
+      iotests: Fix up python style in 300
       usb-storage: Add rerror/werror properties
       qcow2: Fix qcow2_truncate() error return value
       block: Convert .bdrv_truncate callback to coroutine_fn
       qcow2: Remove coroutine trampoline for preallocate_co()
       block: Move bdrv_truncate() implementation to io.c
       block: Use tracked request for truncate
       file-posix: Make .bdrv_co_truncate asynchronous
       qemu-iotests: Update 026.out.nocache reference output
       qcow2: Free allocated clusters on write error
       qemu-iotests: Test qcow2 not leaking clusters on write error
       file-posix: Implement co versions of discard/flush
-Markus Armbruster (3):
+Kevin Wolf (1):
-      block-qdict: Pacify Coverity after commit f1b34a248e9
+      docs: qsd: Explain --export nbd,name=... default
       block/crypto: Pacify Coverity after commit f853465aacb
       block/crypto: Simplify block_crypto_{open,create}_opts_init()
-Weiping Zhang (1):
+Max Reitz (3):
-      hw/block/nvme: add optional parameter num_queues for nvme device
+      backup: Remove nodes from job in .clean()
       backup-top: Refuse I/O in inactive state
       iotests/283: Check that finalize drops backup-top
- qapi/job.json                      |  18 +-
+Paolo Bonzini (2):
- block/crypto.h                     |   8 +-
+      storage-daemon: report unexpected arguments on the fly
- block/qcow2.h                      |   1 +
+      storage-daemon: include current command line option in the errors
  include/block/block.h              |   8 +-
  include/block/block_int.h          |   7 +-
  include/block/raw-aio.h            |   4 +-
  include/hw/scsi/scsi.h             |   2 +
  block.c                            |  64 +------
  block/copy-on-read.c               |   8 +-
  block/crypto.c                     | 112 +++--------
  block/file-posix.c                 | 367 +++++++++++++++++++------------------
  block/file-win32.c                 |   6 +-
  block/gluster.c                    |  14 +-
  block/io.c                         | 219 +++++++++++++++-------
  block/iscsi.c                      |  10 +-
  block/nfs.c                        |   7 +-
  block/parallels.c                  |  16 +-
  block/qcow.c                       | 135 +++++++-------
  block/qcow2-cluster.c              |  11 ++
  block/qcow2.c                      | 140 ++++++--------
  block/qed.c                        |   8 +-
  block/raw-format.c                 |   8 +-
  block/rbd.c                        |   8 +-
  block/replication.c                |  14 +-
  block/sheepdog.c                   |  12 +-
  block/ssh.c                        |   6 +-
  block/vhdx.c                       |  12 +-
  hw/block/nvme.c                    |   5 +-
  hw/scsi/scsi-bus.c                 |  11 +-
  hw/usb/dev-storage.c               |   2 +
  qobject/block-qdict.c              |  16 +-
  tests/qemu-iotests/026             |  17 ++
  tests/qemu-iotests/026.out         |   8 +
  tests/qemu-iotests/026.out.nocache |  14 +-
  tests/qemu-iotests/063             |   9 +
  tests/qemu-iotests/063.out         |  12 ++
 files changed, 685 insertions(+), 634 deletions(-)
+Stefan Hajnoczi (12):
+      qemu-storage-daemon: add --pidfile option
+      docs: show how to spawn qemu-storage-daemon with fd passing
+      docs: replace insecure /tmp examples in qsd docs
+      vhost-user-blk: fix blkcfg->num_queues endianness
+      libqtest: add qtest_socket_server()
+      libqtest: add qtest_kill_qemu()
+      libqtest: add qtest_remove_abrt_handler()
+      block/export: fix blk_size double byteswap
+      block/export: use VIRTIO_BLK_SECTOR_BITS
+      block/export: fix vhost-user-blk export sector number calculation
+      block/export: port virtio-blk discard/write zeroes input validation
+      block/export: port virtio-blk read/write range check
+Stefano Garzarella (1):
+      blockjob: report a better error message
+Vladimir Sementsov-Ogievskiy (7):
+      qcow2-bitmap: make bytes_covered_by_bitmap_cluster() public
+      parallels.txt: fix bitmap L1 table description
+      block/parallels: BDRVParallelsState: add cluster_size field
+      parallels: support bitmap extension for read-only mode
+      iotests.py: add unarchive_sample_image() helper
+      iotests: add parallels-read-bitmap test
+      MAINTAINERS: update parallels block driver
+ docs/interop/parallels.txt                         |  28 +-
+ docs/tools/qemu-storage-daemon.rst                 |  68 ++++-
+ block/parallels.h                                  |   7 +-
+ include/block/dirty-bitmap.h                       |   2 +
+ tests/qtest/libqos/libqtest.h                      |  37 +++
+ block.c                                            |   8 +-
+ block/backup-top.c                                 |  10 +
+ block/backup.c                                     |   1 +
+ block/dirty-bitmap.c                               |  13 +
+ block/export/vhost-user-blk-server.c               | 150 +++++++++--
+ block/parallels-ext.c                              | 300 +++++++++++++++++++++
+ block/parallels.c                                  |  26 +-
+ block/qcow2-bitmap.c                               |  16 +-
+ blockdev.c                                         |  13 +-
+ blockjob.c                                         |  10 +-
+ hw/block/vhost-user-blk.c                          |   7 +-
+ storage-daemon/qemu-storage-daemon.c               |  56 +++-
+ tests/qtest/libqtest.c                             |  82 ++++--
+ tests/qemu-iotests/iotests.py                      |  10 +
+ MAINTAINERS                                        |   3 +
+ block/meson.build                                  |   3 +-
+ tests/qemu-iotests/030                             |   4 +-
+ tests/qemu-iotests/040                             |   4 +-
+ tests/qemu-iotests/051.pc.out                      |   6 +-
+ tests/qemu-iotests/081.out                         |   2 +-
+ tests/qemu-iotests/085.out                         |   6 +-
+ tests/qemu-iotests/087                             |   8 +-
+ tests/qemu-iotests/087.out                         |   2 +-
+ tests/qemu-iotests/184                             |  18 +-
+ tests/qemu-iotests/206.out                         |   2 +-
+ tests/qemu-iotests/210.out                         |   2 +-
+ tests/qemu-iotests/211.out                         |   2 +-
+ tests/qemu-iotests/212.out                         |   2 +-
+ tests/qemu-iotests/213.out                         |   2 +-
+ tests/qemu-iotests/218                             |   2 +-
+ tests/qemu-iotests/223.out                         |   4 +-
+ tests/qemu-iotests/235                             |   2 +-
+ tests/qemu-iotests/237.out                         |   2 +-
+ tests/qemu-iotests/245                             |  14 +-
+ tests/qemu-iotests/249.out                         |   2 +-
+ tests/qemu-iotests/258                             |   6 +-
+ tests/qemu-iotests/258.out                         |   4 +-
+ tests/qemu-iotests/283                             |  53 ++++
+ tests/qemu-iotests/283.out                         |  15 ++
+ tests/qemu-iotests/295                             |   2 +-
+ tests/qemu-iotests/296                             |   2 +-
+ tests/qemu-iotests/300                             |  14 +-
+ .../sample_images/parallels-with-bitmap.bz2        | Bin 0 -> 203 bytes
+ .../sample_images/parallels-with-bitmap.sh         |  51 ++++
+ tests/qemu-iotests/tests/parallels-read-bitmap     |  55 ++++
+ tests/qemu-iotests/tests/parallels-read-bitmap.out |   6 +
+files changed, 969 insertions(+), 175 deletions(-)
+ create mode 100644 block/parallels-ext.c
+ create mode 100644 tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2
+ create mode 100755 tests/qemu-iotests/sample_images/parallels-with-bitmap.sh
+ create mode 100755 tests/qemu-iotests/tests/parallels-read-bitmap
+ create mode 100644 tests/qemu-iotests/tests/parallels-read-bitmap.out

-[Qemu-devel] [PULL 01/29] block-qdict: Pacify Coverity after commit f1b34a248e9
+Deleted patch
-From: Markus Armbruster <armbru@redhat.com>
-Commit f1b34a248e9 replaced less-than-obvious test in
-qdict_flatten_qdict() by the obvious one.  Sadly, it made something
-else non-obvious: the fact that @new_key passed to qdict_put_obj()
-can't be null, because that depends on the function's precondition
-(target == qdict) == !prefix.
-Tweak the function some more to help Coverity and human readers alike.
-Fixes: CID 1393620
-Signed-off-by: Markus Armbruster <armbru@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- qobject/block-qdict.c | 16 ++++++++--------
-file changed, 8 insertions(+), 8 deletions(-)
-diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c
-index XXXXXXX..XXXXXXX 100644
---- a/qobject/block-qdict.c
-+++ b/qobject/block-qdict.c
-@@ -XXX,XX +XXX,XX @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
-     const QDictEntry *entry, *next;
-     QDict *dict_val;
-     QList *list_val;
--    char *new_key;
-+    char *key, *new_key;
-     entry = qdict_first(qdict);
-@@ -XXX,XX +XXX,XX @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
-         value = qdict_entry_value(entry);
-         dict_val = qobject_to(QDict, value);
-         list_val = qobject_to(QList, value);
--        new_key = NULL;
-         if (prefix) {
--            new_key = g_strdup_printf("%s.%s", prefix, entry->key);
-+            key = new_key = g_strdup_printf("%s.%s", prefix, entry->key);
-+        } else {
-+            key = entry->key;
-+            new_key = NULL;
-         }
-         /*
-@@ -XXX,XX +XXX,XX @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
-          * well advised not to modify them altogether.)
-          */
-         if (dict_val && qdict_size(dict_val)) {
--            qdict_flatten_qdict(dict_val, target,
--                                new_key ? new_key : entry->key);
-+            qdict_flatten_qdict(dict_val, target, key);
-             if (target == qdict) {
-                 qdict_del(qdict, entry->key);
-             }
-         } else if (list_val && !qlist_empty(list_val)) {
--            qdict_flatten_qlist(list_val, target,
--                                new_key ? new_key : entry->key);
-+            qdict_flatten_qlist(list_val, target, key);
-             if (target == qdict) {
-                 qdict_del(qdict, entry->key);
-             }
-         } else if (target != qdict) {
--            qdict_put_obj(target, new_key, qobject_ref(value));
-+            qdict_put_obj(target, key, qobject_ref(value));
-         }
-         g_free(new_key);
---
-.13.6

-[Qemu-devel] [PULL 02/29] block/crypto: Pacify Coverity after commit f853465aacb
+Deleted patch
-From: Markus Armbruster <armbru@redhat.com>
-Coverity can't see that qobject_input_visitor_new_flat_confused()
-returns non-null when it doesn't set @local_err.  Check the return
-value instead, like all the other callers do.
-Fixes: CID 1393615
-Fixes: CID 1393616
-Signed-off-by: Markus Armbruster <armbru@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/crypto.c | 4 ++--
-file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/block/crypto.c b/block/crypto.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/crypto.c
-+++ b/block/crypto.c
-@@ -XXX,XX +XXX,XX @@ block_crypto_open_opts_init(QCryptoBlockFormat format,
-     ret->format = format;
-     v = qobject_input_visitor_new_flat_confused(opts, &local_err);
--    if (local_err) {
-+    if (!v) {
-         goto out;
-     }
-@@ -XXX,XX +XXX,XX @@ block_crypto_create_opts_init(QCryptoBlockFormat format,
-     ret->format = format;
-     v = qobject_input_visitor_new_flat_confused(opts, &local_err);
--    if (local_err) {
-+    if (!v) {
-         goto out;
-     }
---
-.13.6

-[Qemu-devel] [PULL 03/29] qapi/job: The next release will be 3.0
+Deleted patch
-Commit 51f63ec7d tried to change all references to 2.13 into 3.0, but
-it failed to achieve this because it was not properly rebased on top of
-the series introducing qapi/job.json. Change the references now.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- qapi/job.json | 18 +++++++++---------
-file changed, 9 insertions(+), 9 deletions(-)
-diff --git a/qapi/job.json b/qapi/job.json
-index XXXXXXX..XXXXXXX 100644
---- a/qapi/job.json
-+++ b/qapi/job.json
-@@ -XXX,XX +XXX,XX @@
- # @id: The job identifier
- # @status: The new job status
- #
--# Since: 2.13
-+# Since: 3.0
- ##
- { 'event': 'JOB_STATUS_CHANGE',
-   'data': { 'id': 'str',
-@@ -XXX,XX +XXX,XX @@
- #
- # @id: The job identifier.
- #
--# Since: 2.13
-+# Since: 3.0
- ##
- { 'command': 'job-pause', 'data': { 'id': 'str' } }
-@@ -XXX,XX +XXX,XX @@
- #
- # @id : The job identifier.
- #
--# Since: 2.13
-+# Since: 3.0
- ##
- { 'command': 'job-resume', 'data': { 'id': 'str' } }
-@@ -XXX,XX +XXX,XX @@
- #
- # @id: The job identifier.
- #
--# Since: 2.13
-+# Since: 3.0
- ##
- { 'command': 'job-cancel', 'data': { 'id': 'str' } }
-@@ -XXX,XX +XXX,XX @@
- #
- # @id: The job identifier.
- #
--# Since: 2.13
-+# Since: 3.0
- ##
- { 'command': 'job-complete', 'data': { 'id': 'str' } }
-@@ -XXX,XX +XXX,XX @@
- #
- # @id: The job identifier.
- #
--# Since: 2.13
-+# Since: 3.0
- ##
- { 'command': 'job-dismiss', 'data': { 'id': 'str' } }
-@@ -XXX,XX +XXX,XX @@
- # @id: The identifier of any job in the transaction, or of a job that is not
- #      part of any transaction.
- #
--# Since: 2.13
-+# Since: 3.0
- ##
- { 'command': 'job-finalize', 'data': { 'id': 'str' } }
-@@ -XXX,XX +XXX,XX @@
- #                       the reason for the job failure. It should not be parsed
- #                       by applications.
- #
--# Since: 2.13
-+# Since: 3.0
- ##
- { 'struct': 'JobInfo',
-   'data': { 'id': 'str', 'type': 'JobType', 'status': 'JobStatus',
-@@ -XXX,XX +XXX,XX @@
- #
- # Returns: a list with a @JobInfo for each active job
- #
--# Since: 2.13
-+# Since: 3.0
- ##
- { 'command': 'query-jobs', 'returns': ['JobInfo'] }
---
-.13.6

-[Qemu-devel] [PULL 04/29] usb-storage: Add rerror/werror properties
+Deleted patch
-The error handling policy was traditionally set with -drive, but with
--blockdev it is no longer possible to set frontend options. scsi-disk
-(and other block devices) have long supported qdev properties to
-configure the error handling policy, so let's add these options to
-usb-storage as well and just forward them to the internal scsi-disk
-instance.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
----
- include/hw/scsi/scsi.h |  2 ++
- hw/scsi/scsi-bus.c     | 11 ++++++++++-
- hw/usb/dev-storage.c   |  2 ++
-files changed, 14 insertions(+), 1 deletion(-)
-diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/hw/scsi/scsi.h
-+++ b/include/hw/scsi/scsi.h
-@@ -XXX,XX +XXX,XX @@ static inline SCSIBus *scsi_bus_from_device(SCSIDevice *d)
- SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
-                                       int unit, bool removable, int bootindex,
-                                       bool share_rw,
-+                                      BlockdevOnError rerror,
-+                                      BlockdevOnError werror,
-                                       const char *serial, Error **errp);
- void scsi_bus_legacy_handle_cmdline(SCSIBus *bus);
- void scsi_legacy_handle_cmdline(void);
-diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/scsi/scsi-bus.c
-+++ b/hw/scsi/scsi-bus.c
-@@ -XXX,XX +XXX,XX @@ static void scsi_qdev_unrealize(DeviceState *qdev, Error **errp)
- SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
-                                       int unit, bool removable, int bootindex,
-                                       bool share_rw,
-+                                      BlockdevOnError rerror,
-+                                      BlockdevOnError werror,
-                                       const char *serial, Error **errp)
- {
-     const char *driver;
-@@ -XXX,XX +XXX,XX @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
-         object_unparent(OBJECT(dev));
-         return NULL;
-     }
-+
-+    qdev_prop_set_enum(dev, "rerror", rerror);
-+    qdev_prop_set_enum(dev, "werror", werror);
-+
-     object_property_set_bool(OBJECT(dev), true, "realized", &err);
-     if (err != NULL) {
-         error_propagate(errp, err);
-@@ -XXX,XX +XXX,XX @@ void scsi_bus_legacy_handle_cmdline(SCSIBus *bus)
-         }
-         qemu_opts_loc_restore(dinfo->opts);
-         scsi_bus_legacy_add_drive(bus, blk_by_legacy_dinfo(dinfo),
--                                  unit, false, -1, false, NULL, &error_fatal);
-+                                  unit, false, -1, false,
-+                                  BLOCKDEV_ON_ERROR_AUTO,
-+                                  BLOCKDEV_ON_ERROR_AUTO,
-+                                  NULL, &error_fatal);
-     }
-     loc_pop(&loc);
- }
-diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/usb/dev-storage.c
-+++ b/hw/usb/dev-storage.c
-@@ -XXX,XX +XXX,XX @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp)
-                  &usb_msd_scsi_info_storage, NULL);
-     scsi_dev = scsi_bus_legacy_add_drive(&s->bus, blk, 0, !!s->removable,
-                                          s->conf.bootindex, s->conf.share_rw,
-+                                         s->conf.rerror, s->conf.werror,
-                                          dev->serial,
-                                          errp);
-     blk_unref(blk);
-@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_usb_msd = {
- static Property msd_properties[] = {
-     DEFINE_BLOCK_PROPERTIES(MSDState, conf),
-+    DEFINE_BLOCK_ERROR_PROPERTIES(MSDState, conf),
-     DEFINE_PROP_BIT("removable", MSDState, removable, 0, false),
-     DEFINE_PROP_END_OF_LIST(),
- };
---
-.13.6

-[Qemu-devel] [PULL 05/29] hw/block/nvme: add optional parameter num_queues for nvme device
+Deleted patch
-From: Weiping Zhang <zhangweiping@didichuxing.com>
-Add an optional paramter num_queues for device, and set it
-to 64 by default.
-Signed-off-by: Weiping Zhang <zhangweiping@didichuxing.com>
-Acked-by: Keith Busch <keith.busch@intel.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- hw/block/nvme.c | 5 +++--
-file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/hw/block/nvme.c b/hw/block/nvme.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/block/nvme.c
-+++ b/hw/block/nvme.c
-@@ -XXX,XX +XXX,XX @@
-  * Usage: add options:
-  *      -drive file=<file>,if=none,id=<drive_id>
-  *      -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>, \
-- *              cmb_size_mb=<cmb_size_mb[optional]>
-+ *              cmb_size_mb=<cmb_size_mb[optional]>, \
-+ *              num_queues=<N[optional]>
-  *
-  * Note cmb_size_mb denotes size of CMB in MB. CMB is assumed to be at
-  * offset 0 in BAR2 and supports only WDS, RDS and SQS for now.
-@@ -XXX,XX +XXX,XX @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
-     pcie_endpoint_cap_init(&n->parent_obj, 0x80);
-     n->num_namespaces = 1;
--    n->num_queues = 64;
-     n->reg_size = pow2ceil(0x1004 + 2 * (n->num_queues + 1) * 4);
-     n->ns_size = bs_size / (uint64_t)n->num_namespaces;
-@@ -XXX,XX +XXX,XX @@ static Property nvme_props[] = {
-     DEFINE_BLOCK_PROPERTIES(NvmeCtrl, conf),
-     DEFINE_PROP_STRING("serial", NvmeCtrl, serial),
-     DEFINE_PROP_UINT32("cmb_size_mb", NvmeCtrl, cmb_size_mb, 0),
-+    DEFINE_PROP_UINT32("num_queues", NvmeCtrl, num_queues, 64),
-     DEFINE_PROP_END_OF_LIST(),
- };
---
-.13.6

-[Qemu-devel] [PULL 06/29] qcow2: Fix qcow2_truncate() error return value
+Deleted patch
-If qcow2_alloc_clusters_at() returns an error, we do need to negate it
-to get back the positive errno code for error_setg_errno(), but we still
-need to return the negative error code.
-Fixes: 772d1f973f87269f6a4a4ea4b880680f3779bbdf
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- block/qcow2.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-         if (clusters_allocated < 0) {
-             error_setg_errno(errp, -clusters_allocated,
-                              "Failed to allocate data clusters");
--            return -clusters_allocated;
-+            return clusters_allocated;
-         }
-         assert(clusters_allocated == nb_new_data_clusters);
---
-.13.6

-[Qemu-devel] [PULL 07/29] block: Convert .bdrv_truncate callback to coroutine_fn
+Deleted patch
-bdrv_truncate() is an operation that can block (even for a quite long
-time, depending on the PreallocMode) in I/O paths that shouldn't block.
-Convert it to a coroutine_fn so that we have the infrastructure for
-drivers to make their .bdrv_co_truncate implementation asynchronous.
-This change could potentially introduce new race conditions because
-bdrv_truncate() isn't necessarily executed atomically any more. Whether
-this is a problem needs to be evaluated for each block driver that
-supports truncate:
-* file-posix/win32, gluster, iscsi, nfs, rbd, ssh, sheepdog: The
-  protocol drivers are trivially safe because they don't actually yield
-  yet, so there is no change in behaviour.
-* copy-on-read, crypto, raw-format: Essentially just filter drivers that
-  pass the request to a child node, no problem.
-* qcow2: The implementation modifies metadata, so it needs to hold
-  s->lock to be safe with concurrent I/O requests. In order to avoid
-  double locking, this requires pulling the locking out into
-  preallocate_co() and using qcow2_write_caches() instead of
-  bdrv_flush().
-* qed: Does a single header update, this is fine without locking.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- include/block/block.h     |  4 +++
- include/block/block_int.h |  4 +--
- block.c                   | 63 +++++++++++++++++++++++++++++++++++-----
- block/copy-on-read.c      |  8 ++---
- block/crypto.c            |  9 +++---
- block/file-posix.c        | 12 ++++----
- block/file-win32.c        |  6 ++--
- block/gluster.c           | 14 +++++----
- block/iscsi.c             |  8 ++---
- block/nfs.c               |  7 +++--
- block/qcow2.c             | 74 ++++++++++++++++++++++++++++-------------------
- block/qed.c               |  8 +++--
- block/raw-format.c        |  8 ++---
- block/rbd.c               |  8 +++--
- block/sheepdog.c          | 12 ++++----
- block/ssh.c               |  6 ++--
-files changed, 162 insertions(+), 89 deletions(-)
-diff --git a/include/block/block.h b/include/block/block.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/block.h
-+++ b/include/block/block.h
-@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_pwrite_zeroes(BdrvChild *child, int64_t offset,
- BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,
-     const char *backing_file);
- void bdrv_refresh_filename(BlockDriverState *bs);
-+
-+int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
-+                                  PreallocMode prealloc, Error **errp);
- int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
-                   Error **errp);
-+
- int64_t bdrv_nb_sectors(BlockDriverState *bs);
- int64_t bdrv_getlength(BlockDriverState *bs);
- int64_t bdrv_get_allocated_file_size(BlockDriverState *bs);
-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 {
-      * bdrv_parse_filename.
-      */
-     const char *protocol_name;
--    int (*bdrv_truncate)(BlockDriverState *bs, int64_t offset,
--                         PreallocMode prealloc, Error **errp);
-+    int coroutine_fn (*bdrv_co_truncate)(BlockDriverState *bs, int64_t offset,
-+                                         PreallocMode prealloc, Error **errp);
-     int64_t (*bdrv_getlength)(BlockDriverState *bs);
-     bool has_variable_length;
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ exit:
- /**
-  * Truncate file to 'offset' bytes (needed only for file protocols)
-  */
--int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
--                  Error **errp)
-+int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
-+                                  PreallocMode prealloc, Error **errp)
- {
-     BlockDriverState *bs = child->bs;
-     BlockDriver *drv = bs->drv;
-@@ -XXX,XX +XXX,XX @@ int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
-         return -EINVAL;
-     }
--    if (!drv->bdrv_truncate) {
-+    bdrv_inc_in_flight(bs);
-+
-+    if (!drv->bdrv_co_truncate) {
-         if (bs->file && drv->is_filter) {
--            return bdrv_truncate(bs->file, offset, prealloc, errp);
-+            ret = bdrv_co_truncate(bs->file, offset, prealloc, errp);
-+            goto out;
-         }
-         error_setg(errp, "Image format driver does not support resize");
--        return -ENOTSUP;
-+        ret = -ENOTSUP;
-+        goto out;
-     }
-     if (bs->read_only) {
-         error_setg(errp, "Image is read-only");
--        return -EACCES;
-+        ret = -EACCES;
-+        goto out;
-     }
-     assert(!(bs->open_flags & BDRV_O_INACTIVE));
--    ret = drv->bdrv_truncate(bs, offset, prealloc, errp);
-+    ret = drv->bdrv_co_truncate(bs, offset, prealloc, errp);
-     if (ret < 0) {
--        return ret;
-+        goto out;
-     }
-     ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);
-     if (ret < 0) {
-@@ -XXX,XX +XXX,XX @@ int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
-     bdrv_dirty_bitmap_truncate(bs, offset);
-     bdrv_parent_cb_resize(bs);
-     atomic_inc(&bs->write_gen);
-+
-+out:
-+    bdrv_dec_in_flight(bs);
-     return ret;
- }
-+typedef struct TruncateCo {
-+    BdrvChild *child;
-+    int64_t offset;
-+    PreallocMode prealloc;
-+    Error **errp;
-+    int ret;
-+} TruncateCo;
-+
-+static void coroutine_fn bdrv_truncate_co_entry(void *opaque)
-+{
-+    TruncateCo *tco = opaque;
-+    tco->ret = bdrv_co_truncate(tco->child, tco->offset, tco->prealloc,
-+                                tco->errp);
-+}
-+
-+int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
-+                  Error **errp)
-+{
-+    Coroutine *co;
-+    TruncateCo tco = {
-+        .child      = child,
-+        .offset     = offset,
-+        .prealloc   = prealloc,
-+        .errp       = errp,
-+        .ret        = NOT_DONE,
-+    };
-+
-+    if (qemu_in_coroutine()) {
-+        /* Fast-path if already in coroutine context */
-+        bdrv_truncate_co_entry(&tco);
-+    } else {
-+        co = qemu_coroutine_create(bdrv_truncate_co_entry, &tco);
-+        qemu_coroutine_enter(co);
-+        BDRV_POLL_WHILE(child->bs, tco.ret == NOT_DONE);
-+    }
-+
-+    return tco.ret;
-+}
-+
- /**
-  * Length of a allocated file in bytes. Sparse files are counted by actual
-  * allocated space. Return < 0 if error or unknown.
-diff --git a/block/copy-on-read.c b/block/copy-on-read.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/copy-on-read.c
-+++ b/block/copy-on-read.c
-@@ -XXX,XX +XXX,XX @@ static int64_t cor_getlength(BlockDriverState *bs)
- }
--static int cor_truncate(BlockDriverState *bs, int64_t offset,
--                        PreallocMode prealloc, Error **errp)
-+static int coroutine_fn cor_co_truncate(BlockDriverState *bs, int64_t offset,
-+                                        PreallocMode prealloc, Error **errp)
- {
--    return bdrv_truncate(bs->file, offset, prealloc, errp);
-+    return bdrv_co_truncate(bs->file, offset, prealloc, errp);
- }
-@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_copy_on_read = {
-     .bdrv_child_perm                    = cor_child_perm,
-     .bdrv_getlength                     = cor_getlength,
--    .bdrv_truncate                      = cor_truncate,
-+    .bdrv_co_truncate                   = cor_co_truncate,
-     .bdrv_co_preadv                     = cor_co_preadv,
-     .bdrv_co_pwritev                    = cor_co_pwritev,
-diff --git a/block/crypto.c b/block/crypto.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/crypto.c
-+++ b/block/crypto.c
-@@ -XXX,XX +XXX,XX @@ static int block_crypto_co_create_generic(BlockDriverState *bs,
-     return ret;
- }
--static int block_crypto_truncate(BlockDriverState *bs, int64_t offset,
--                                 PreallocMode prealloc, Error **errp)
-+static int coroutine_fn
-+block_crypto_co_truncate(BlockDriverState *bs, int64_t offset,
-+                         PreallocMode prealloc, Error **errp)
- {
-     BlockCrypto *crypto = bs->opaque;
-     uint64_t payload_offset =
-@@ -XXX,XX +XXX,XX @@ static int block_crypto_truncate(BlockDriverState *bs, int64_t offset,
-     offset += payload_offset;
--    return bdrv_truncate(bs->file, offset, prealloc, errp);
-+    return bdrv_co_truncate(bs->file, offset, prealloc, errp);
- }
- static void block_crypto_close(BlockDriverState *bs)
-@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_crypto_luks = {
-     .bdrv_child_perm    = bdrv_format_default_perms,
-     .bdrv_co_create     = block_crypto_co_create_luks,
-     .bdrv_co_create_opts = block_crypto_co_create_opts_luks,
--    .bdrv_truncate      = block_crypto_truncate,
-+    .bdrv_co_truncate   = block_crypto_co_truncate,
-     .create_opts        = &block_crypto_create_opts_luks,
-     .bdrv_reopen_prepare = block_crypto_reopen_prepare,
-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 @@ out:
-     return result;
- }
--static int raw_truncate(BlockDriverState *bs, int64_t offset,
--                        PreallocMode prealloc, Error **errp)
-+static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
-+                                        PreallocMode prealloc, Error **errp)
- {
-     BDRVRawState *s = bs->opaque;
-     struct stat st;
-@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_file = {
-     .bdrv_io_unplug = raw_aio_unplug,
-     .bdrv_attach_aio_context = raw_aio_attach_aio_context,
--    .bdrv_truncate = raw_truncate,
-+    .bdrv_co_truncate = raw_co_truncate,
-     .bdrv_getlength = raw_getlength,
-     .bdrv_get_info = raw_get_info,
-     .bdrv_get_allocated_file_size
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
-     .bdrv_io_plug = raw_aio_plug,
-     .bdrv_io_unplug = raw_aio_unplug,
--    .bdrv_truncate      = raw_truncate,
-+    .bdrv_co_truncate       = raw_co_truncate,
-     .bdrv_getlength    = raw_getlength,
-     .bdrv_get_info = raw_get_info,
-     .bdrv_get_allocated_file_size
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
-     .bdrv_io_plug = raw_aio_plug,
-     .bdrv_io_unplug = raw_aio_unplug,
--    .bdrv_truncate      = raw_truncate,
-+    .bdrv_co_truncate    = raw_co_truncate,
-     .bdrv_getlength      = raw_getlength,
-     .has_variable_length = true,
-     .bdrv_get_allocated_file_size
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
-     .bdrv_io_plug = raw_aio_plug,
-     .bdrv_io_unplug = raw_aio_unplug,
--    .bdrv_truncate      = raw_truncate,
-+    .bdrv_co_truncate    = raw_co_truncate,
-     .bdrv_getlength      = raw_getlength,
-     .has_variable_length = true,
-     .bdrv_get_allocated_file_size
-diff --git a/block/file-win32.c b/block/file-win32.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/file-win32.c
-+++ b/block/file-win32.c
-@@ -XXX,XX +XXX,XX @@ static void raw_close(BlockDriverState *bs)
-     }
- }
--static int raw_truncate(BlockDriverState *bs, int64_t offset,
--                        PreallocMode prealloc, Error **errp)
-+static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
-+                                        PreallocMode prealloc, Error **errp)
- {
-     BDRVRawState *s = bs->opaque;
-     LONG low, high;
-@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_file = {
-     .bdrv_aio_pwritev   = raw_aio_pwritev,
-     .bdrv_aio_flush     = raw_aio_flush,
--    .bdrv_truncate    = raw_truncate,
-+    .bdrv_co_truncate   = raw_co_truncate,
-     .bdrv_getlength    = raw_getlength,
-     .bdrv_get_allocated_file_size
-                         = raw_get_allocated_file_size,
-diff --git a/block/gluster.c b/block/gluster.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/gluster.c
-+++ b/block/gluster.c
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qemu_gluster_co_rw(BlockDriverState *bs,
-     return acb.ret;
- }
--static int qemu_gluster_truncate(BlockDriverState *bs, int64_t offset,
--                                 PreallocMode prealloc, Error **errp)
-+static coroutine_fn int qemu_gluster_co_truncate(BlockDriverState *bs,
-+                                                 int64_t offset,
-+                                                 PreallocMode prealloc,
-+                                                 Error **errp)
- {
-     BDRVGlusterState *s = bs->opaque;
-     return qemu_gluster_do_truncate(s->fd, offset, prealloc, errp);
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_gluster = {
-     .bdrv_co_create_opts          = qemu_gluster_co_create_opts,
-     .bdrv_getlength               = qemu_gluster_getlength,
-     .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,
--    .bdrv_truncate                = qemu_gluster_truncate,
-+    .bdrv_co_truncate             = qemu_gluster_co_truncate,
-     .bdrv_co_readv                = qemu_gluster_co_readv,
-     .bdrv_co_writev               = qemu_gluster_co_writev,
-     .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_gluster_tcp = {
-     .bdrv_co_create_opts          = qemu_gluster_co_create_opts,
-     .bdrv_getlength               = qemu_gluster_getlength,
-     .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,
--    .bdrv_truncate                = qemu_gluster_truncate,
-+    .bdrv_co_truncate             = qemu_gluster_co_truncate,
-     .bdrv_co_readv                = qemu_gluster_co_readv,
-     .bdrv_co_writev               = qemu_gluster_co_writev,
-     .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_gluster_unix = {
-     .bdrv_co_create_opts          = qemu_gluster_co_create_opts,
-     .bdrv_getlength               = qemu_gluster_getlength,
-     .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,
--    .bdrv_truncate                = qemu_gluster_truncate,
-+    .bdrv_co_truncate             = qemu_gluster_co_truncate,
-     .bdrv_co_readv                = qemu_gluster_co_readv,
-     .bdrv_co_writev               = qemu_gluster_co_writev,
-     .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_gluster_rdma = {
-     .bdrv_co_create_opts          = qemu_gluster_co_create_opts,
-     .bdrv_getlength               = qemu_gluster_getlength,
-     .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,
--    .bdrv_truncate                = qemu_gluster_truncate,
-+    .bdrv_co_truncate             = qemu_gluster_co_truncate,
-     .bdrv_co_readv                = qemu_gluster_co_readv,
-     .bdrv_co_writev               = qemu_gluster_co_writev,
-     .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,
-diff --git a/block/iscsi.c b/block/iscsi.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/iscsi.c
-+++ b/block/iscsi.c
-@@ -XXX,XX +XXX,XX @@ static void iscsi_reopen_commit(BDRVReopenState *reopen_state)
-     }
- }
--static int iscsi_truncate(BlockDriverState *bs, int64_t offset,
--                          PreallocMode prealloc, Error **errp)
-+static int coroutine_fn iscsi_co_truncate(BlockDriverState *bs, int64_t offset,
-+                                          PreallocMode prealloc, Error **errp)
- {
-     IscsiLun *iscsilun = bs->opaque;
-     Error *local_err = NULL;
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_iscsi = {
-     .bdrv_getlength  = iscsi_getlength,
-     .bdrv_get_info   = iscsi_get_info,
--    .bdrv_truncate   = iscsi_truncate,
-+    .bdrv_co_truncate    = iscsi_co_truncate,
-     .bdrv_refresh_limits = iscsi_refresh_limits,
-     .bdrv_co_block_status  = iscsi_co_block_status,
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_iser = {
-     .bdrv_getlength  = iscsi_getlength,
-     .bdrv_get_info   = iscsi_get_info,
--    .bdrv_truncate   = iscsi_truncate,
-+    .bdrv_co_truncate    = iscsi_co_truncate,
-     .bdrv_refresh_limits = iscsi_refresh_limits,
-     .bdrv_co_block_status  = iscsi_co_block_status,
-diff --git a/block/nfs.c b/block/nfs.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/nfs.c
-+++ b/block/nfs.c
-@@ -XXX,XX +XXX,XX @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs)
-     return (task.ret < 0 ? task.ret : st.st_blocks * 512);
- }
--static int nfs_file_truncate(BlockDriverState *bs, int64_t offset,
--                             PreallocMode prealloc, Error **errp)
-+static int coroutine_fn
-+nfs_file_co_truncate(BlockDriverState *bs, int64_t offset,
-+                     PreallocMode prealloc, Error **errp)
- {
-     NFSClient *client = bs->opaque;
-     int ret;
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_nfs = {
-     .bdrv_has_zero_init             = nfs_has_zero_init,
-     .bdrv_get_allocated_file_size   = nfs_get_allocated_file_size,
--    .bdrv_truncate                  = nfs_file_truncate,
-+    .bdrv_co_truncate               = nfs_file_co_truncate,
-     .bdrv_file_open                 = nfs_file_open,
-     .bdrv_close                     = nfs_file_close,
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static void coroutine_fn preallocate_co(void *opaque)
-     BlockDriverState *bs = params->bs;
-     uint64_t offset = params->offset;
-     uint64_t new_length = params->new_length;
--    BDRVQcow2State *s = bs->opaque;
-     uint64_t bytes;
-     uint64_t host_offset = 0;
-     unsigned int cur_bytes;
-     int ret;
-     QCowL2Meta *meta;
--    qemu_co_mutex_lock(&s->lock);
--
-     assert(offset <= new_length);
-     bytes = new_length - offset;
-@@ -XXX,XX +XXX,XX @@ static void coroutine_fn preallocate_co(void *opaque)
-     ret = 0;
- done:
--    qemu_co_mutex_unlock(&s->lock);
-     params->ret = ret;
- }
-@@ -XXX,XX +XXX,XX @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
-     /* And if we're supposed to preallocate metadata, do that now */
-     if (qcow2_opts->preallocation != PREALLOC_MODE_OFF) {
-+        BDRVQcow2State *s = blk_bs(blk)->opaque;
-+        qemu_co_mutex_lock(&s->lock);
-         ret = preallocate(blk_bs(blk), 0, qcow2_opts->size);
-+        qemu_co_mutex_unlock(&s->lock);
-+
-         if (ret < 0) {
-             error_setg_errno(errp, -ret, "Could not preallocate metadata");
-             goto out;
-@@ -XXX,XX +XXX,XX @@ fail:
-     return ret;
- }
--static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
--                          PreallocMode prealloc, Error **errp)
-+static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
-+                                          PreallocMode prealloc, Error **errp)
- {
-     BDRVQcow2State *s = bs->opaque;
-     uint64_t old_length;
-@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-         return -EINVAL;
-     }
-+    qemu_co_mutex_lock(&s->lock);
-+
-     /* cannot proceed if image has snapshots */
-     if (s->nb_snapshots) {
-         error_setg(errp, "Can't resize an image which has snapshots");
--        return -ENOTSUP;
-+        ret = -ENOTSUP;
-+        goto fail;
-     }
-     /* cannot proceed if image has bitmaps */
-     if (s->nb_bitmaps) {
-         /* TODO: resize bitmaps in the image */
-         error_setg(errp, "Can't resize an image which has bitmaps");
--        return -ENOTSUP;
-+        ret = -ENOTSUP;
-+        goto fail;
-     }
-     old_length = bs->total_sectors * 512;
-@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-         if (prealloc != PREALLOC_MODE_OFF) {
-             error_setg(errp,
-                        "Preallocation can't be used for shrinking an image");
--            return -EINVAL;
-+            ret = -EINVAL;
-+            goto fail;
-         }
-         ret = qcow2_cluster_discard(bs, ROUND_UP(offset, s->cluster_size),
-@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-                                     QCOW2_DISCARD_ALWAYS, true);
-         if (ret < 0) {
-             error_setg_errno(errp, -ret, "Failed to discard cropped clusters");
--            return ret;
-+            goto fail;
-         }
-         ret = qcow2_shrink_l1_table(bs, new_l1_size);
-         if (ret < 0) {
-             error_setg_errno(errp, -ret,
-                              "Failed to reduce the number of L2 tables");
--            return ret;
-+            goto fail;
-         }
-         ret = qcow2_shrink_reftable(bs);
-         if (ret < 0) {
-             error_setg_errno(errp, -ret,
-                              "Failed to discard unused refblocks");
--            return ret;
-+            goto fail;
-         }
-         old_file_size = bdrv_getlength(bs->file->bs);
-         if (old_file_size < 0) {
-             error_setg_errno(errp, -old_file_size,
-                              "Failed to inquire current file length");
--            return old_file_size;
-+            ret = old_file_size;
-+            goto fail;
-         }
-         last_cluster = qcow2_get_last_cluster(bs, old_file_size);
-         if (last_cluster < 0) {
-             error_setg_errno(errp, -last_cluster,
-                              "Failed to find the last cluster");
--            return last_cluster;
-+            ret = last_cluster;
-+            goto fail;
-         }
-         if ((last_cluster + 1) * s->cluster_size < old_file_size) {
-             Error *local_err = NULL;
--            bdrv_truncate(bs->file, (last_cluster + 1) * s->cluster_size,
--                          PREALLOC_MODE_OFF, &local_err);
-+            bdrv_co_truncate(bs->file, (last_cluster + 1) * s->cluster_size,
-+                             PREALLOC_MODE_OFF, &local_err);
-             if (local_err) {
-                 warn_reportf_err(local_err,
-                                  "Failed to truncate the tail of the image: ");
-@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-         ret = qcow2_grow_l1_table(bs, new_l1_size, true);
-         if (ret < 0) {
-             error_setg_errno(errp, -ret, "Failed to grow the L1 table");
--            return ret;
-+            goto fail;
-         }
-     }
-@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-         ret = preallocate(bs, old_length, offset);
-         if (ret < 0) {
-             error_setg_errno(errp, -ret, "Preallocation failed");
--            return ret;
-+            goto fail;
-         }
-         break;
-@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-         if (old_file_size < 0) {
-             error_setg_errno(errp, -old_file_size,
-                              "Failed to inquire current file length");
--            return old_file_size;
-+            ret = old_file_size;
-+            goto fail;
-         }
-         old_file_size = ROUND_UP(old_file_size, s->cluster_size);
-@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-         if (allocation_start < 0) {
-             error_setg_errno(errp, -allocation_start,
-                              "Failed to resize refcount structures");
--            return allocation_start;
-+            ret = allocation_start;
-+            goto fail;
-         }
-         clusters_allocated = qcow2_alloc_clusters_at(bs, allocation_start,
-@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-         if (clusters_allocated < 0) {
-             error_setg_errno(errp, -clusters_allocated,
-                              "Failed to allocate data clusters");
--            return clusters_allocated;
-+            ret = clusters_allocated;
-+            goto fail;
-         }
-         assert(clusters_allocated == nb_new_data_clusters);
-@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-         /* Allocate the data area */
-         new_file_size = allocation_start +
-                         nb_new_data_clusters * s->cluster_size;
--        ret = bdrv_truncate(bs->file, new_file_size, prealloc, errp);
-+        ret = bdrv_co_truncate(bs->file, new_file_size, prealloc, errp);
-         if (ret < 0) {
-             error_prepend(errp, "Failed to resize underlying file: ");
-             qcow2_free_clusters(bs, allocation_start,
-                                 nb_new_data_clusters * s->cluster_size,
-                                 QCOW2_DISCARD_OTHER);
--            return ret;
-+            goto fail;
-         }
-         /* Create the necessary L2 entries */
-@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-                 qcow2_free_clusters(bs, host_offset,
-                                     nb_new_data_clusters * s->cluster_size,
-                                     QCOW2_DISCARD_OTHER);
--                return ret;
-+                goto fail;
-             }
-             guest_offset += nb_clusters * s->cluster_size;
-@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-     if (prealloc != PREALLOC_MODE_OFF) {
-         /* Flush metadata before actually changing the image size */
--        ret = bdrv_flush(bs);
-+        ret = qcow2_write_caches(bs);
-         if (ret < 0) {
-             error_setg_errno(errp, -ret,
-                              "Failed to flush the preallocated area to disk");
--            return ret;
-+            goto fail;
-         }
-     }
-@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-                            &offset, sizeof(uint64_t));
-     if (ret < 0) {
-         error_setg_errno(errp, -ret, "Failed to update the image size");
--        return ret;
-+        goto fail;
-     }
-     s->l1_vm_state_index = new_l1_size;
--    return 0;
-+    ret = 0;
-+fail:
-+    qemu_co_mutex_unlock(&s->lock);
-+    return ret;
- }
- /* XXX: put compressed sectors first, then all the cluster aligned
-@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
-         if (cluster_offset < 0) {
-             return cluster_offset;
-         }
--        return bdrv_truncate(bs->file, cluster_offset, PREALLOC_MODE_OFF, NULL);
-+        return bdrv_co_truncate(bs->file, cluster_offset, PREALLOC_MODE_OFF,
-+                                NULL);
-     }
-     if (offset_into_cluster(s, offset)) {
-@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_qcow2 = {
-     .bdrv_co_pdiscard       = qcow2_co_pdiscard,
-     .bdrv_co_copy_range_from = qcow2_co_copy_range_from,
-     .bdrv_co_copy_range_to  = qcow2_co_copy_range_to,
--    .bdrv_truncate          = qcow2_truncate,
-+    .bdrv_co_truncate       = qcow2_co_truncate,
-     .bdrv_co_pwritev_compressed = qcow2_co_pwritev_compressed,
-     .bdrv_make_empty        = qcow2_make_empty,
-diff --git a/block/qed.c b/block/qed.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qed.c
-+++ b/block/qed.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_qed_co_pwrite_zeroes(BlockDriverState *bs,
-                           QED_AIOCB_WRITE | QED_AIOCB_ZERO);
- }
--static int bdrv_qed_truncate(BlockDriverState *bs, int64_t offset,
--                             PreallocMode prealloc, Error **errp)
-+static int coroutine_fn bdrv_qed_co_truncate(BlockDriverState *bs,
-+                                             int64_t offset,
-+                                             PreallocMode prealloc,
-+                                             Error **errp)
- {
-     BDRVQEDState *s = bs->opaque;
-     uint64_t old_image_size;
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_qed = {
-     .bdrv_co_readv            = bdrv_qed_co_readv,
-     .bdrv_co_writev           = bdrv_qed_co_writev,
-     .bdrv_co_pwrite_zeroes    = bdrv_qed_co_pwrite_zeroes,
--    .bdrv_truncate            = bdrv_qed_truncate,
-+    .bdrv_co_truncate         = bdrv_qed_co_truncate,
-     .bdrv_getlength           = bdrv_qed_getlength,
-     .bdrv_get_info            = bdrv_qed_get_info,
-     .bdrv_refresh_limits      = bdrv_qed_refresh_limits,
-diff --git a/block/raw-format.c b/block/raw-format.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/raw-format.c
-+++ b/block/raw-format.c
-@@ -XXX,XX +XXX,XX @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp)
-     }
- }
--static int raw_truncate(BlockDriverState *bs, int64_t offset,
--                        PreallocMode prealloc, Error **errp)
-+static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
-+                                        PreallocMode prealloc, Error **errp)
- {
-     BDRVRawState *s = bs->opaque;
-@@ -XXX,XX +XXX,XX @@ static int raw_truncate(BlockDriverState *bs, int64_t offset,
-     s->size = offset;
-     offset += s->offset;
--    return bdrv_truncate(bs->file, offset, prealloc, errp);
-+    return bdrv_co_truncate(bs->file, offset, prealloc, errp);
- }
- static void raw_eject(BlockDriverState *bs, bool eject_flag)
-@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_raw = {
-     .bdrv_co_block_status = &raw_co_block_status,
-     .bdrv_co_copy_range_from = &raw_co_copy_range_from,
-     .bdrv_co_copy_range_to  = &raw_co_copy_range_to,
--    .bdrv_truncate        = &raw_truncate,
-+    .bdrv_co_truncate     = &raw_co_truncate,
-     .bdrv_getlength       = &raw_getlength,
-     .has_variable_length  = true,
-     .bdrv_measure         = &raw_measure,
-diff --git a/block/rbd.c b/block/rbd.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/rbd.c
-+++ b/block/rbd.c
-@@ -XXX,XX +XXX,XX @@ static int64_t qemu_rbd_getlength(BlockDriverState *bs)
-     return info.size;
- }
--static int qemu_rbd_truncate(BlockDriverState *bs, int64_t offset,
--                             PreallocMode prealloc, Error **errp)
-+static int coroutine_fn qemu_rbd_co_truncate(BlockDriverState *bs,
-+                                             int64_t offset,
-+                                             PreallocMode prealloc,
-+                                             Error **errp)
- {
-     BDRVRBDState *s = bs->opaque;
-     int r;
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_rbd = {
-     .bdrv_get_info          = qemu_rbd_getinfo,
-     .create_opts            = &qemu_rbd_create_opts,
-     .bdrv_getlength         = qemu_rbd_getlength,
--    .bdrv_truncate          = qemu_rbd_truncate,
-+    .bdrv_co_truncate       = qemu_rbd_co_truncate,
-     .protocol_name          = "rbd",
-     .bdrv_aio_preadv        = qemu_rbd_aio_preadv,
-diff --git a/block/sheepdog.c b/block/sheepdog.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/sheepdog.c
-+++ b/block/sheepdog.c
-@@ -XXX,XX +XXX,XX @@ static int64_t sd_getlength(BlockDriverState *bs)
-     return s->inode.vdi_size;
- }
--static int sd_truncate(BlockDriverState *bs, int64_t offset,
--                       PreallocMode prealloc, Error **errp)
-+static int coroutine_fn sd_co_truncate(BlockDriverState *bs, int64_t offset,
-+                                       PreallocMode prealloc, Error **errp)
- {
-     BDRVSheepdogState *s = bs->opaque;
-     int ret, fd;
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int sd_co_writev(BlockDriverState *bs, int64_t sector_num,
-     assert(!flags);
-     if (offset > s->inode.vdi_size) {
--        ret = sd_truncate(bs, offset, PREALLOC_MODE_OFF, NULL);
-+        ret = sd_co_truncate(bs, offset, PREALLOC_MODE_OFF, NULL);
-         if (ret < 0) {
-             return ret;
-         }
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_sheepdog = {
-     .bdrv_has_zero_init           = bdrv_has_zero_init_1,
-     .bdrv_getlength               = sd_getlength,
-     .bdrv_get_allocated_file_size = sd_get_allocated_file_size,
--    .bdrv_truncate                = sd_truncate,
-+    .bdrv_co_truncate             = sd_co_truncate,
-     .bdrv_co_readv                = sd_co_readv,
-     .bdrv_co_writev               = sd_co_writev,
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_sheepdog_tcp = {
-     .bdrv_has_zero_init           = bdrv_has_zero_init_1,
-     .bdrv_getlength               = sd_getlength,
-     .bdrv_get_allocated_file_size = sd_get_allocated_file_size,
--    .bdrv_truncate                = sd_truncate,
-+    .bdrv_co_truncate             = sd_co_truncate,
-     .bdrv_co_readv                = sd_co_readv,
-     .bdrv_co_writev               = sd_co_writev,
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_sheepdog_unix = {
-     .bdrv_has_zero_init           = bdrv_has_zero_init_1,
-     .bdrv_getlength               = sd_getlength,
-     .bdrv_get_allocated_file_size = sd_get_allocated_file_size,
--    .bdrv_truncate                = sd_truncate,
-+    .bdrv_co_truncate             = sd_co_truncate,
-     .bdrv_co_readv                = sd_co_readv,
-     .bdrv_co_writev               = sd_co_writev,
-diff --git a/block/ssh.c b/block/ssh.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/ssh.c
-+++ b/block/ssh.c
-@@ -XXX,XX +XXX,XX @@ static int64_t ssh_getlength(BlockDriverState *bs)
-     return length;
- }
--static int ssh_truncate(BlockDriverState *bs, int64_t offset,
--                        PreallocMode prealloc, Error **errp)
-+static int coroutine_fn ssh_co_truncate(BlockDriverState *bs, int64_t offset,
-+                                        PreallocMode prealloc, Error **errp)
- {
-     BDRVSSHState *s = bs->opaque;
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_ssh = {
-     .bdrv_co_readv                = ssh_co_readv,
-     .bdrv_co_writev               = ssh_co_writev,
-     .bdrv_getlength               = ssh_getlength,
--    .bdrv_truncate                = ssh_truncate,
-+    .bdrv_co_truncate             = ssh_co_truncate,
-     .bdrv_co_flush_to_disk        = ssh_co_flush,
-     .create_opts                  = &ssh_create_opts,
- };
---
-.13.6

-[Qemu-devel] [PULL 08/29] qcow2: Remove coroutine trampoline for preallocate_co()
+Deleted patch
-All callers are coroutine_fns now, so we can just directly call
-preallocate_co().
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- block/qcow2.c | 51 ++++++++-------------------------------------------
-file changed, 8 insertions(+), 43 deletions(-)
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static int qcow2_set_up_encryption(BlockDriverState *bs,
-     return ret;
- }
--
--typedef struct PreallocCo {
--    BlockDriverState *bs;
--    uint64_t offset;
--    uint64_t new_length;
--
--    int ret;
--} PreallocCo;
--
- /**
-  * Preallocates metadata structures for data clusters between @offset (in the
-  * guest disk) and @new_length (which is thus generally the new guest disk
-@@ -XXX,XX +XXX,XX @@ typedef struct PreallocCo {
-  *
-  * Returns: 0 on success, -errno on failure.
-  */
--static void coroutine_fn preallocate_co(void *opaque)
-+static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
-+                                       uint64_t new_length)
- {
--    PreallocCo *params = opaque;
--    BlockDriverState *bs = params->bs;
--    uint64_t offset = params->offset;
--    uint64_t new_length = params->new_length;
-     uint64_t bytes;
-     uint64_t host_offset = 0;
-     unsigned int cur_bytes;
-@@ -XXX,XX +XXX,XX @@ static void coroutine_fn preallocate_co(void *opaque)
-         ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,
-                                          &host_offset, &meta);
-         if (ret < 0) {
--            goto done;
-+            return ret;
-         }
-         while (meta) {
-@@ -XXX,XX +XXX,XX @@ static void coroutine_fn preallocate_co(void *opaque)
-             if (ret < 0) {
-                 qcow2_free_any_clusters(bs, meta->alloc_offset,
-                                         meta->nb_clusters, QCOW2_DISCARD_NEVER);
--                goto done;
-+                return ret;
-             }
-             /* There are no dependent requests, but we need to remove our
-@@ -XXX,XX +XXX,XX @@ static void coroutine_fn preallocate_co(void *opaque)
-         ret = bdrv_pwrite(bs->file, (host_offset + cur_bytes) - 1,
-                           &data, 1);
-         if (ret < 0) {
--            goto done;
-+            return ret;
-         }
-     }
--    ret = 0;
--
--done:
--    params->ret = ret;
--}
--
--static int preallocate(BlockDriverState *bs,
--                       uint64_t offset, uint64_t new_length)
--{
--    PreallocCo params = {
--        .bs         = bs,
--        .offset     = offset,
--        .new_length = new_length,
--        .ret        = -EINPROGRESS,
--    };
--
--    if (qemu_in_coroutine()) {
--        preallocate_co(&params);
--    } else {
--        Coroutine *co = qemu_coroutine_create(preallocate_co, &params);
--        bdrv_coroutine_enter(bs, co);
--        BDRV_POLL_WHILE(bs, params.ret == -EINPROGRESS);
--    }
--    return params.ret;
-+    return 0;
- }
- /* qcow2_refcount_metadata_size:
-@@ -XXX,XX +XXX,XX @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
-     if (qcow2_opts->preallocation != PREALLOC_MODE_OFF) {
-         BDRVQcow2State *s = blk_bs(blk)->opaque;
-         qemu_co_mutex_lock(&s->lock);
--        ret = preallocate(blk_bs(blk), 0, qcow2_opts->size);
-+        ret = preallocate_co(blk_bs(blk), 0, qcow2_opts->size);
-         qemu_co_mutex_unlock(&s->lock);
-         if (ret < 0) {
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
-         break;
-     case PREALLOC_MODE_METADATA:
--        ret = preallocate(bs, old_length, offset);
-+        ret = preallocate_co(bs, old_length, offset);
-         if (ret < 0) {
-             error_setg_errno(errp, -ret, "Preallocation failed");
-             goto fail;
---
-.13.6

-[Qemu-devel] [PULL 09/29] block: Move bdrv_truncate() implementation to io.c
+Deleted patch
-This moves the bdrv_truncate() implementation from block.c to block/io.c
-so it can have access to the tracked requests infrastructure.
-This involves making refresh_total_sectors() public (in block_int.h).
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- include/block/block_int.h |   2 +
- block.c                   | 111 +---------------------------------------------
- block/io.c                | 109 +++++++++++++++++++++++++++++++++++++++++++++
-files changed, 112 insertions(+), 110 deletions(-)
-diff --git a/include/block/block_int.h b/include/block/block_int.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/block_int.h
-+++ b/include/block/block_int.h
-@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_copy_range_to(BdrvChild *src, uint64_t src_offset,
-                                        BdrvChild *dst, uint64_t dst_offset,
-                                        uint64_t bytes, BdrvRequestFlags flags);
-+int refresh_total_sectors(BlockDriverState *bs, int64_t hint);
-+
- #endif /* BLOCK_INT_H */
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ static int find_image_format(BlockBackend *file, const char *filename,
-  * Set the current 'total_sectors' value
-  * Return 0 on success, -errno on error.
-  */
--static int refresh_total_sectors(BlockDriverState *bs, int64_t hint)
-+int refresh_total_sectors(BlockDriverState *bs, int64_t hint)
- {
-     BlockDriver *drv = bs->drv;
-@@ -XXX,XX +XXX,XX @@ static void bdrv_parent_cb_change_media(BlockDriverState *bs, bool load)
-     }
- }
--static void bdrv_parent_cb_resize(BlockDriverState *bs)
--{
--    BdrvChild *c;
--    QLIST_FOREACH(c, &bs->parents, next_parent) {
--        if (c->role->resize) {
--            c->role->resize(c);
--        }
--    }
--}
--
- /*
-  * Sets the backing file link of a BDS. A new reference is created; callers
-  * which don't need their own reference any more must call bdrv_unref().
-@@ -XXX,XX +XXX,XX @@ exit:
- }
- /**
-- * Truncate file to 'offset' bytes (needed only for file protocols)
-- */
--int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
--                                  PreallocMode prealloc, Error **errp)
--{
--    BlockDriverState *bs = child->bs;
--    BlockDriver *drv = bs->drv;
--    int ret;
--
--    assert(child->perm & BLK_PERM_RESIZE);
--
--    /* if bs->drv == NULL, bs is closed, so there's nothing to do here */
--    if (!drv) {
--        error_setg(errp, "No medium inserted");
--        return -ENOMEDIUM;
--    }
--    if (offset < 0) {
--        error_setg(errp, "Image size cannot be negative");
--        return -EINVAL;
--    }
--
--    bdrv_inc_in_flight(bs);
--
--    if (!drv->bdrv_co_truncate) {
--        if (bs->file && drv->is_filter) {
--            ret = bdrv_co_truncate(bs->file, offset, prealloc, errp);
--            goto out;
--        }
--        error_setg(errp, "Image format driver does not support resize");
--        ret = -ENOTSUP;
--        goto out;
--    }
--    if (bs->read_only) {
--        error_setg(errp, "Image is read-only");
--        ret = -EACCES;
--        goto out;
--    }
--
--    assert(!(bs->open_flags & BDRV_O_INACTIVE));
--
--    ret = drv->bdrv_co_truncate(bs, offset, prealloc, errp);
--    if (ret < 0) {
--        goto out;
--    }
--    ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);
--    if (ret < 0) {
--        error_setg_errno(errp, -ret, "Could not refresh total sector count");
--    } else {
--        offset = bs->total_sectors * BDRV_SECTOR_SIZE;
--    }
--    bdrv_dirty_bitmap_truncate(bs, offset);
--    bdrv_parent_cb_resize(bs);
--    atomic_inc(&bs->write_gen);
--
--out:
--    bdrv_dec_in_flight(bs);
--    return ret;
--}
--
--typedef struct TruncateCo {
--    BdrvChild *child;
--    int64_t offset;
--    PreallocMode prealloc;
--    Error **errp;
--    int ret;
--} TruncateCo;
--
--static void coroutine_fn bdrv_truncate_co_entry(void *opaque)
--{
--    TruncateCo *tco = opaque;
--    tco->ret = bdrv_co_truncate(tco->child, tco->offset, tco->prealloc,
--                                tco->errp);
--}
--
--int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
--                  Error **errp)
--{
--    Coroutine *co;
--    TruncateCo tco = {
--        .child      = child,
--        .offset     = offset,
--        .prealloc   = prealloc,
--        .errp       = errp,
--        .ret        = NOT_DONE,
--    };
--
--    if (qemu_in_coroutine()) {
--        /* Fast-path if already in coroutine context */
--        bdrv_truncate_co_entry(&tco);
--    } else {
--        co = qemu_coroutine_create(bdrv_truncate_co_entry, &tco);
--        qemu_coroutine_enter(co);
--        BDRV_POLL_WHILE(child->bs, tco.ret == NOT_DONE);
--    }
--
--    return tco.ret;
--}
--
--/**
-  * Length of a allocated file in bytes. Sparse files are counted by actual
-  * allocated space. Return < 0 if error or unknown.
-  */
-diff --git a/block/io.c b/block/io.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/io.c
-+++ b/block/io.c
-@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_copy_range(BdrvChild *src, uint64_t src_offset,
-     bdrv_dec_in_flight(dst_bs);
-     return ret;
- }
-+
-+static void bdrv_parent_cb_resize(BlockDriverState *bs)
-+{
-+    BdrvChild *c;
-+    QLIST_FOREACH(c, &bs->parents, next_parent) {
-+        if (c->role->resize) {
-+            c->role->resize(c);
-+        }
-+    }
-+}
-+
-+/**
-+ * Truncate file to 'offset' bytes (needed only for file protocols)
-+ */
-+int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
-+                                  PreallocMode prealloc, Error **errp)
-+{
-+    BlockDriverState *bs = child->bs;
-+    BlockDriver *drv = bs->drv;
-+    int ret;
-+
-+    assert(child->perm & BLK_PERM_RESIZE);
-+
-+    /* if bs->drv == NULL, bs is closed, so there's nothing to do here */
-+    if (!drv) {
-+        error_setg(errp, "No medium inserted");
-+        return -ENOMEDIUM;
-+    }
-+    if (offset < 0) {
-+        error_setg(errp, "Image size cannot be negative");
-+        return -EINVAL;
-+    }
-+
-+    bdrv_inc_in_flight(bs);
-+
-+    if (!drv->bdrv_co_truncate) {
-+        if (bs->file && drv->is_filter) {
-+            ret = bdrv_co_truncate(bs->file, offset, prealloc, errp);
-+            goto out;
-+        }
-+        error_setg(errp, "Image format driver does not support resize");
-+        ret = -ENOTSUP;
-+        goto out;
-+    }
-+    if (bs->read_only) {
-+        error_setg(errp, "Image is read-only");
-+        ret = -EACCES;
-+        goto out;
-+    }
-+
-+    assert(!(bs->open_flags & BDRV_O_INACTIVE));
-+
-+    ret = drv->bdrv_co_truncate(bs, offset, prealloc, errp);
-+    if (ret < 0) {
-+        goto out;
-+    }
-+    ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);
-+    if (ret < 0) {
-+        error_setg_errno(errp, -ret, "Could not refresh total sector count");
-+    } else {
-+        offset = bs->total_sectors * BDRV_SECTOR_SIZE;
-+    }
-+    bdrv_dirty_bitmap_truncate(bs, offset);
-+    bdrv_parent_cb_resize(bs);
-+    atomic_inc(&bs->write_gen);
-+
-+out:
-+    bdrv_dec_in_flight(bs);
-+    return ret;
-+}
-+
-+typedef struct TruncateCo {
-+    BdrvChild *child;
-+    int64_t offset;
-+    PreallocMode prealloc;
-+    Error **errp;
-+    int ret;
-+} TruncateCo;
-+
-+static void coroutine_fn bdrv_truncate_co_entry(void *opaque)
-+{
-+    TruncateCo *tco = opaque;
-+    tco->ret = bdrv_co_truncate(tco->child, tco->offset, tco->prealloc,
-+                                tco->errp);
-+}
-+
-+int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
-+                  Error **errp)
-+{
-+    Coroutine *co;
-+    TruncateCo tco = {
-+        .child      = child,
-+        .offset     = offset,
-+        .prealloc   = prealloc,
-+        .errp       = errp,
-+        .ret        = NOT_DONE,
-+    };
-+
-+    if (qemu_in_coroutine()) {
-+        /* Fast-path if already in coroutine context */
-+        bdrv_truncate_co_entry(&tco);
-+    } else {
-+        co = qemu_coroutine_create(bdrv_truncate_co_entry, &tco);
-+        qemu_coroutine_enter(co);
-+        BDRV_POLL_WHILE(child->bs, tco.ret == NOT_DONE);
-+    }
-+
-+    return tco.ret;
-+}
---
-.13.6

-[Qemu-devel] [PULL 10/29] block: Use tracked request for truncate
+Deleted patch
-When growing an image, block drivers (especially protocol drivers) may
-initialise the newly added area. I/O requests to the same area need to
-wait for this initialisation to be completed so that data writes don't
-get overwritten and reads don't read uninitialised data.
-To avoid overhead in the fast I/O path by adding new locking in the
-protocol drivers and to restrict the impact to requests that actually
-touch the new area, reuse the existing tracked request infrastructure in
-block/io.c and mark all discard requests as serialising.
-With this change, it is safe for protocol drivers to make
-.bdrv_co_truncate actually asynchronous.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- include/block/block_int.h |  1 +
- block/io.c                | 25 +++++++++++++++++++++++++
-files changed, 26 insertions(+)
-diff --git a/include/block/block_int.h b/include/block/block_int.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/block_int.h
-+++ b/include/block/block_int.h
-@@ -XXX,XX +XXX,XX @@ enum BdrvTrackedRequestType {
-     BDRV_TRACKED_READ,
-     BDRV_TRACKED_WRITE,
-     BDRV_TRACKED_DISCARD,
-+    BDRV_TRACKED_TRUNCATE,
- };
- typedef struct BdrvTrackedRequest {
-diff --git a/block/io.c b/block/io.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/io.c
-+++ b/block/io.c
-@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
- {
-     BlockDriverState *bs = child->bs;
-     BlockDriver *drv = bs->drv;
-+    BdrvTrackedRequest req;
-+    int64_t old_size, new_bytes;
-     int ret;
-     assert(child->perm & BLK_PERM_RESIZE);
-@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
-         return -EINVAL;
-     }
-+    old_size = bdrv_getlength(bs);
-+    if (old_size < 0) {
-+        error_setg_errno(errp, -old_size, "Failed to get old image size");
-+        return old_size;
-+    }
-+
-+    if (offset > old_size) {
-+        new_bytes = offset - old_size;
-+    } else {
-+        new_bytes = 0;
-+    }
-+
-     bdrv_inc_in_flight(bs);
-+    tracked_request_begin(&req, bs, offset, new_bytes, BDRV_TRACKED_TRUNCATE);
-+
-+    /* If we are growing the image and potentially using preallocation for the
-+     * new area, we need to make sure that no write requests are made to it
-+     * concurrently or they might be overwritten by preallocation. */
-+    if (new_bytes) {
-+        mark_request_serialising(&req, 1);
-+        wait_serialising_requests(&req);
-+    }
-     if (!drv->bdrv_co_truncate) {
-         if (bs->file && drv->is_filter) {
-@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
-     atomic_inc(&bs->write_gen);
- out:
-+    tracked_request_end(&req);
-     bdrv_dec_in_flight(bs);
-+
-     return ret;
- }
---
-.13.6

-[Qemu-devel] [PULL 11/29] file-posix: Make .bdrv_co_truncate asynchronous
+Deleted patch
-This moves the code to resize an image file to the thread pool to avoid
-blocking.
-Creating large images with preallocation with blockdev-create is now
-actually a background job instead of blocking the monitor (and most
-other things) until the preallocation has completed.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- include/block/raw-aio.h |   4 +-
- block/file-posix.c      | 266 +++++++++++++++++++++++++++---------------------
-files changed, 154 insertions(+), 116 deletions(-)
-diff --git a/include/block/raw-aio.h b/include/block/raw-aio.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/raw-aio.h
-+++ b/include/block/raw-aio.h
-@@ -XXX,XX +XXX,XX @@
- #define QEMU_AIO_DISCARD      0x0010
- #define QEMU_AIO_WRITE_ZEROES 0x0020
- #define QEMU_AIO_COPY_RANGE   0x0040
-+#define QEMU_AIO_TRUNCATE     0x0080
- #define QEMU_AIO_TYPE_MASK \
-         (QEMU_AIO_READ | \
-          QEMU_AIO_WRITE | \
-@@ -XXX,XX +XXX,XX @@
-          QEMU_AIO_FLUSH | \
-          QEMU_AIO_DISCARD | \
-          QEMU_AIO_WRITE_ZEROES | \
--         QEMU_AIO_COPY_RANGE)
-+         QEMU_AIO_COPY_RANGE | \
-+         QEMU_AIO_TRUNCATE)
- /* AIO flags */
- #define QEMU_AIO_MISALIGNED   0x1000
-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 RawPosixAIOData {
- #define aio_ioctl_cmd   aio_nbytes /* for QEMU_AIO_IOCTL */
-     off_t aio_offset;
-     int aio_type;
--    int aio_fd2;
--    off_t aio_offset2;
-+    union {
-+        struct {
-+            int aio_fd2;
-+            off_t aio_offset2;
-+        };
-+        struct {
-+            PreallocMode prealloc;
-+            Error **errp;
-+        };
-+    };
- } RawPosixAIOData;
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-@@ -XXX,XX +XXX,XX @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *aiocb)
-     return ret;
- }
-+static int handle_aiocb_truncate(RawPosixAIOData *aiocb)
-+{
-+    int result = 0;
-+    int64_t current_length = 0;
-+    char *buf = NULL;
-+    struct stat st;
-+    int fd = aiocb->aio_fildes;
-+    int64_t offset = aiocb->aio_offset;
-+    Error **errp = aiocb->errp;
-+
-+    if (fstat(fd, &st) < 0) {
-+        result = -errno;
-+        error_setg_errno(errp, -result, "Could not stat file");
-+        return result;
-+    }
-+
-+    current_length = st.st_size;
-+    if (current_length > offset && aiocb->prealloc != PREALLOC_MODE_OFF) {
-+        error_setg(errp, "Cannot use preallocation for shrinking files");
-+        return -ENOTSUP;
-+    }
-+
-+    switch (aiocb->prealloc) {
-+#ifdef CONFIG_POSIX_FALLOCATE
-+    case PREALLOC_MODE_FALLOC:
-+        /*
-+         * Truncating before posix_fallocate() makes it about twice slower on
-+         * file systems that do not support fallocate(), trying to check if a
-+         * block is allocated before allocating it, so don't do that here.
-+         */
-+        if (offset != current_length) {
-+            result = -posix_fallocate(fd, current_length,
-+                                      offset - current_length);
-+            if (result != 0) {
-+                /* posix_fallocate() doesn't set errno. */
-+                error_setg_errno(errp, -result,
-+                                 "Could not preallocate new data");
-+            }
-+        } else {
-+            result = 0;
-+        }
-+        goto out;
-+#endif
-+    case PREALLOC_MODE_FULL:
-+    {
-+        int64_t num = 0, left = offset - current_length;
-+        off_t seek_result;
-+
-+        /*
-+         * Knowing the final size from the beginning could allow the file
-+         * system driver to do less allocations and possibly avoid
-+         * fragmentation of the file.
-+         */
-+        if (ftruncate(fd, offset) != 0) {
-+            result = -errno;
-+            error_setg_errno(errp, -result, "Could not resize file");
-+            goto out;
-+        }
-+
-+        buf = g_malloc0(65536);
-+
-+        seek_result = lseek(fd, current_length, SEEK_SET);
-+        if (seek_result < 0) {
-+            result = -errno;
-+            error_setg_errno(errp, -result,
-+                             "Failed to seek to the old end of file");
-+            goto out;
-+        }
-+
-+        while (left > 0) {
-+            num = MIN(left, 65536);
-+            result = write(fd, buf, num);
-+            if (result < 0) {
-+                result = -errno;
-+                error_setg_errno(errp, -result,
-+                                 "Could not write zeros for preallocation");
-+                goto out;
-+            }
-+            left -= result;
-+        }
-+        if (result >= 0) {
-+            result = fsync(fd);
-+            if (result < 0) {
-+                result = -errno;
-+                error_setg_errno(errp, -result,
-+                                 "Could not flush file to disk");
-+                goto out;
-+            }
-+        }
-+        goto out;
-+    }
-+    case PREALLOC_MODE_OFF:
-+        if (ftruncate(fd, offset) != 0) {
-+            result = -errno;
-+            error_setg_errno(errp, -result, "Could not resize file");
-+        }
-+        return result;
-+    default:
-+        result = -ENOTSUP;
-+        error_setg(errp, "Unsupported preallocation mode: %s",
-+                   PreallocMode_str(aiocb->prealloc));
-+        return result;
-+    }
-+
-+out:
-+    if (result < 0) {
-+        if (ftruncate(fd, current_length) < 0) {
-+            error_report("Failed to restore old file length: %s",
-+                         strerror(errno));
-+        }
-+    }
-+
-+    g_free(buf);
-+    return result;
-+}
-+
- static int aio_worker(void *arg)
- {
-     RawPosixAIOData *aiocb = arg;
-@@ -XXX,XX +XXX,XX @@ static int aio_worker(void *arg)
-     case QEMU_AIO_COPY_RANGE:
-         ret = handle_aiocb_copy_range(aiocb);
-         break;
-+    case QEMU_AIO_TRUNCATE:
-+        ret = handle_aiocb_truncate(aiocb);
-+        break;
-     default:
-         fprintf(stderr, "invalid aio request (0x%x)\n", aiocb->aio_type);
-         ret = -EINVAL;
-@@ -XXX,XX +XXX,XX @@ static void raw_close(BlockDriverState *bs)
-  *
-  * Returns: 0 on success, -errno on failure.
-  */
--static int raw_regular_truncate(int fd, int64_t offset, PreallocMode prealloc,
--                                Error **errp)
-+static int coroutine_fn
-+raw_regular_truncate(BlockDriverState *bs, int fd, int64_t offset,
-+                     PreallocMode prealloc, Error **errp)
- {
--    int result = 0;
--    int64_t current_length = 0;
--    char *buf = NULL;
--    struct stat st;
--
--    if (fstat(fd, &st) < 0) {
--        result = -errno;
--        error_setg_errno(errp, -result, "Could not stat file");
--        return result;
--    }
--
--    current_length = st.st_size;
--    if (current_length > offset && prealloc != PREALLOC_MODE_OFF) {
--        error_setg(errp, "Cannot use preallocation for shrinking files");
--        return -ENOTSUP;
--    }
--
--    switch (prealloc) {
--#ifdef CONFIG_POSIX_FALLOCATE
--    case PREALLOC_MODE_FALLOC:
--        /*
--         * Truncating before posix_fallocate() makes it about twice slower on
--         * file systems that do not support fallocate(), trying to check if a
--         * block is allocated before allocating it, so don't do that here.
--         */
--        if (offset != current_length) {
--            result = -posix_fallocate(fd, current_length, offset - current_length);
--            if (result != 0) {
--                /* posix_fallocate() doesn't set errno. */
--                error_setg_errno(errp, -result,
--                                 "Could not preallocate new data");
--            }
--        } else {
--            result = 0;
--        }
--        goto out;
--#endif
--    case PREALLOC_MODE_FULL:
--    {
--        int64_t num = 0, left = offset - current_length;
--        off_t seek_result;
--
--        /*
--         * Knowing the final size from the beginning could allow the file
--         * system driver to do less allocations and possibly avoid
--         * fragmentation of the file.
--         */
--        if (ftruncate(fd, offset) != 0) {
--            result = -errno;
--            error_setg_errno(errp, -result, "Could not resize file");
--            goto out;
--        }
--
--        buf = g_malloc0(65536);
--
--        seek_result = lseek(fd, current_length, SEEK_SET);
--        if (seek_result < 0) {
--            result = -errno;
--            error_setg_errno(errp, -result,
--                             "Failed to seek to the old end of file");
--            goto out;
--        }
--
--        while (left > 0) {
--            num = MIN(left, 65536);
--            result = write(fd, buf, num);
--            if (result < 0) {
--                result = -errno;
--                error_setg_errno(errp, -result,
--                                 "Could not write zeros for preallocation");
--                goto out;
--            }
--            left -= result;
--        }
--        if (result >= 0) {
--            result = fsync(fd);
--            if (result < 0) {
--                result = -errno;
--                error_setg_errno(errp, -result,
--                                 "Could not flush file to disk");
--                goto out;
--            }
--        }
--        goto out;
--    }
--    case PREALLOC_MODE_OFF:
--        if (ftruncate(fd, offset) != 0) {
--            result = -errno;
--            error_setg_errno(errp, -result, "Could not resize file");
--        }
--        return result;
--    default:
--        result = -ENOTSUP;
--        error_setg(errp, "Unsupported preallocation mode: %s",
--                   PreallocMode_str(prealloc));
--        return result;
--    }
-+    RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);
-+    ThreadPool *pool;
--out:
--    if (result < 0) {
--        if (ftruncate(fd, current_length) < 0) {
--            error_report("Failed to restore old file length: %s",
--                         strerror(errno));
--        }
--    }
-+    *acb = (RawPosixAIOData) {
-+        .bs             = bs,
-+        .aio_fildes     = fd,
-+        .aio_type       = QEMU_AIO_TRUNCATE,
-+        .aio_offset     = offset,
-+        .prealloc       = prealloc,
-+        .errp           = errp,
-+    };
--    g_free(buf);
--    return result;
-+    /* @bs can be NULL, bdrv_get_aio_context() returns the main context then */
-+    pool = aio_get_thread_pool(bdrv_get_aio_context(bs));
-+    return thread_pool_submit_co(pool, aio_worker, acb);
- }
- static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
-     }
-     if (S_ISREG(st.st_mode)) {
--        return raw_regular_truncate(s->fd, offset, prealloc, errp);
-+        return raw_regular_truncate(bs, s->fd, offset, prealloc, errp);
-     }
-     if (prealloc != PREALLOC_MODE_OFF) {
-@@ -XXX,XX +XXX,XX @@ static int64_t raw_get_allocated_file_size(BlockDriverState *bs)
-     return (int64_t)st.st_blocks * 512;
- }
--static int raw_co_create(BlockdevCreateOptions *options, Error **errp)
-+static int coroutine_fn
-+raw_co_create(BlockdevCreateOptions *options, Error **errp)
- {
-     BlockdevCreateOptionsFile *file_opts;
-     int fd;
-@@ -XXX,XX +XXX,XX @@ static int raw_co_create(BlockdevCreateOptions *options, Error **errp)
-     }
-     /* Clear the file by truncating it to 0 */
--    result = raw_regular_truncate(fd, 0, PREALLOC_MODE_OFF, errp);
-+    result = raw_regular_truncate(NULL, fd, 0, PREALLOC_MODE_OFF, errp);
-     if (result < 0) {
-         goto out_close;
-     }
-@@ -XXX,XX +XXX,XX @@ static int raw_co_create(BlockdevCreateOptions *options, Error **errp)
-     /* Resize and potentially preallocate the file to the desired
-      * final size */
--    result = raw_regular_truncate(fd, file_opts->size, file_opts->preallocation,
--                                  errp);
-+    result = raw_regular_truncate(NULL, fd, file_opts->size,
-+                                  file_opts->preallocation, errp);
-     if (result < 0) {
-         goto out_close;
-     }
---
-.13.6

-[Qemu-devel] [PULL 12/29] qcow2: Remove dead check on !ret
+Deleted patch
-From: Fam Zheng <famz@redhat.com>
-In the beginning of the function, we initialize the local variable to 0,
-and in the body of the function, we check the assigned values and exit
-the loop immediately. So here it can never be non-zero.
-Reported-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Fam Zheng <famz@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow2.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_handle_l2meta(BlockDriverState *bs,
-     while (l2meta != NULL) {
-         QCowL2Meta *next;
--        if (!ret && link_l2) {
-+        if (link_l2) {
-             ret = qcow2_alloc_cluster_link_l2(bs, l2meta);
-             if (ret) {
-                 goto out;
---
-.13.6

-[Qemu-devel] [PULL 13/29] block: Move request tracking to children in copy offloading
+Deleted patch
-From: Fam Zheng <famz@redhat.com>
-in_flight and tracked requests need to be tracked in every layer during
-recursion. For now the only user is qemu-img convert where overlapping
-requests and IOThreads don't exist, therefore this change doesn't make
-much difference form user point of view, but it is incorrect as part of
-the API. Fix it.
-Reported-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Fam Zheng <famz@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/io.c | 59 ++++++++++++++++++++++++++++-------------------------------
-file changed, 28 insertions(+), 31 deletions(-)
-diff --git a/block/io.c b/block/io.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/io.c
-+++ b/block/io.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_co_copy_range_internal(BdrvChild *src,
-                                                     BdrvRequestFlags flags,
-                                                     bool recurse_src)
- {
-+    BdrvTrackedRequest src_req, dst_req;
-+    BlockDriverState *src_bs = src->bs;
-+    BlockDriverState *dst_bs = dst->bs;
-     int ret;
-     if (!src || !dst || !src->bs || !dst->bs) {
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_co_copy_range_internal(BdrvChild *src,
-         || src->bs->encrypted || dst->bs->encrypted) {
-         return -ENOTSUP;
-     }
-+    bdrv_inc_in_flight(src_bs);
-+    bdrv_inc_in_flight(dst_bs);
-+    tracked_request_begin(&src_req, src_bs, src_offset,
-+                          bytes, BDRV_TRACKED_READ);
-+    tracked_request_begin(&dst_req, dst_bs, dst_offset,
-+                          bytes, BDRV_TRACKED_WRITE);
-+
-+    wait_serialising_requests(&src_req);
-+    wait_serialising_requests(&dst_req);
-     if (recurse_src) {
--        return src->bs->drv->bdrv_co_copy_range_from(src->bs,
--                                                     src, src_offset,
--                                                     dst, dst_offset,
--                                                     bytes, flags);
-+        ret = src->bs->drv->bdrv_co_copy_range_from(src->bs,
-+                                                    src, src_offset,
-+                                                    dst, dst_offset,
-+                                                    bytes, flags);
-     } else {
--        return dst->bs->drv->bdrv_co_copy_range_to(dst->bs,
--                                                   src, src_offset,
--                                                   dst, dst_offset,
--                                                   bytes, flags);
-+        ret = dst->bs->drv->bdrv_co_copy_range_to(dst->bs,
-+                                                  src, src_offset,
-+                                                  dst, dst_offset,
-+                                                  bytes, flags);
-     }
-+    tracked_request_end(&src_req);
-+    tracked_request_end(&dst_req);
-+    bdrv_dec_in_flight(src_bs);
-+    bdrv_dec_in_flight(dst_bs);
-+    return ret;
- }
- /* Copy range from @src to @dst.
-@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_copy_range(BdrvChild *src, uint64_t src_offset,
-                                     BdrvChild *dst, uint64_t dst_offset,
-                                     uint64_t bytes, BdrvRequestFlags flags)
- {
--    BdrvTrackedRequest src_req, dst_req;
--    BlockDriverState *src_bs = src->bs;
--    BlockDriverState *dst_bs = dst->bs;
--    int ret;
--
--    bdrv_inc_in_flight(src_bs);
--    bdrv_inc_in_flight(dst_bs);
--    tracked_request_begin(&src_req, src_bs, src_offset,
--                          bytes, BDRV_TRACKED_READ);
--    tracked_request_begin(&dst_req, dst_bs, dst_offset,
--                          bytes, BDRV_TRACKED_WRITE);
--
--    wait_serialising_requests(&src_req);
--    wait_serialising_requests(&dst_req);
--    ret = bdrv_co_copy_range_from(src, src_offset,
--                                  dst, dst_offset,
--                                  bytes, flags);
--
--    tracked_request_end(&src_req);
--    tracked_request_end(&dst_req);
--    bdrv_dec_in_flight(src_bs);
--    bdrv_dec_in_flight(dst_bs);
--    return ret;
-+    return bdrv_co_copy_range_from(src, src_offset,
-+                                   dst, dst_offset,
-+                                   bytes, flags);
- }
- static void bdrv_parent_cb_resize(BlockDriverState *bs)
---
-.13.6

-[Qemu-devel] [PULL 14/29] block/crypto: Simplify block_crypto_{open, create}_opts_init()
+Deleted patch
-From: Markus Armbruster <armbru@redhat.com>
-block_crypto_open_opts_init() and block_crypto_create_opts_init()
-contain a virtual visit of QCryptoBlockOptions and
-QCryptoBlockCreateOptions less member "format", respectively.
-Change their callers to put member "format" in the QDict, so they can
-use the generated visitors for these types instead.
-Signed-off-by: Markus Armbruster <armbru@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/crypto.h |  8 ++---
- block/crypto.c | 99 +++++++++-------------------------------------------------
- block/qcow.c   |  5 ++-
- block/qcow2.c  | 10 +++---
-files changed, 22 insertions(+), 100 deletions(-)
-diff --git a/block/crypto.h b/block/crypto.h
-index XXXXXXX..XXXXXXX 100644
---- a/block/crypto.h
-+++ b/block/crypto.h
-@@ -XXX,XX +XXX,XX @@
-     }
- QCryptoBlockCreateOptions *
--block_crypto_create_opts_init(QCryptoBlockFormat format,
--                              QDict *opts,
--                              Error **errp);
-+block_crypto_create_opts_init(QDict *opts, Error **errp);
- QCryptoBlockOpenOptions *
--block_crypto_open_opts_init(QCryptoBlockFormat format,
--                            QDict *opts,
--                            Error **errp);
-+block_crypto_open_opts_init(QDict *opts, Error **errp);
- #endif /* BLOCK_CRYPTO_H__ */
-diff --git a/block/crypto.c b/block/crypto.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/crypto.c
-+++ b/block/crypto.c
-@@ -XXX,XX +XXX,XX @@ static QemuOptsList block_crypto_create_opts_luks = {
- QCryptoBlockOpenOptions *
--block_crypto_open_opts_init(QCryptoBlockFormat format,
--                            QDict *opts,
--                            Error **errp)
-+block_crypto_open_opts_init(QDict *opts, Error **errp)
- {
-     Visitor *v;
--    QCryptoBlockOpenOptions *ret = NULL;
--    Error *local_err = NULL;
--
--    ret = g_new0(QCryptoBlockOpenOptions, 1);
--    ret->format = format;
-+    QCryptoBlockOpenOptions *ret;
--    v = qobject_input_visitor_new_flat_confused(opts, &local_err);
-+    v = qobject_input_visitor_new_flat_confused(opts, errp);
-     if (!v) {
--        goto out;
--    }
--
--    visit_start_struct(v, NULL, NULL, 0, &local_err);
--    if (local_err) {
--        goto out;
--    }
--
--    switch (format) {
--    case Q_CRYPTO_BLOCK_FORMAT_LUKS:
--        visit_type_QCryptoBlockOptionsLUKS_members(
--            v, &ret->u.luks, &local_err);
--        break;
--
--    case Q_CRYPTO_BLOCK_FORMAT_QCOW:
--        visit_type_QCryptoBlockOptionsQCow_members(
--            v, &ret->u.qcow, &local_err);
--        break;
--
--    default:
--        error_setg(&local_err, "Unsupported block format %d", format);
--        break;
--    }
--    if (!local_err) {
--        visit_check_struct(v, &local_err);
-+        return NULL;
-     }
--    visit_end_struct(v, NULL);
-+    visit_type_QCryptoBlockOpenOptions(v, NULL, &ret, errp);
-- out:
--    if (local_err) {
--        error_propagate(errp, local_err);
--        qapi_free_QCryptoBlockOpenOptions(ret);
--        ret = NULL;
--    }
-     visit_free(v);
-     return ret;
- }
- QCryptoBlockCreateOptions *
--block_crypto_create_opts_init(QCryptoBlockFormat format,
--                              QDict *opts,
--                              Error **errp)
-+block_crypto_create_opts_init(QDict *opts, Error **errp)
- {
-     Visitor *v;
--    QCryptoBlockCreateOptions *ret = NULL;
--    Error *local_err = NULL;
--
--    ret = g_new0(QCryptoBlockCreateOptions, 1);
--    ret->format = format;
-+    QCryptoBlockCreateOptions *ret;
--    v = qobject_input_visitor_new_flat_confused(opts, &local_err);
-+    v = qobject_input_visitor_new_flat_confused(opts, errp);
-     if (!v) {
--        goto out;
--    }
--
--    visit_start_struct(v, NULL, NULL, 0, &local_err);
--    if (local_err) {
--        goto out;
--    }
--
--    switch (format) {
--    case Q_CRYPTO_BLOCK_FORMAT_LUKS:
--        visit_type_QCryptoBlockCreateOptionsLUKS_members(
--            v, &ret->u.luks, &local_err);
--        break;
--
--    case Q_CRYPTO_BLOCK_FORMAT_QCOW:
--        visit_type_QCryptoBlockOptionsQCow_members(
--            v, &ret->u.qcow, &local_err);
--        break;
--
--    default:
--        error_setg(&local_err, "Unsupported block format %d", format);
--        break;
--    }
--    if (!local_err) {
--        visit_check_struct(v, &local_err);
-+        return NULL;
-     }
--    visit_end_struct(v, NULL);
-+    visit_type_QCryptoBlockCreateOptions(v, NULL, &ret, errp);
-- out:
--    if (local_err) {
--        error_propagate(errp, local_err);
--        qapi_free_QCryptoBlockCreateOptions(ret);
--        ret = NULL;
--    }
-     visit_free(v);
-     return ret;
- }
-@@ -XXX,XX +XXX,XX @@ static int block_crypto_open_generic(QCryptoBlockFormat format,
-     }
-     cryptoopts = qemu_opts_to_qdict(opts, NULL);
-+    qdict_put_str(cryptoopts, "format", QCryptoBlockFormat_str(format));
--    open_opts = block_crypto_open_opts_init(format, cryptoopts, errp);
-+    open_opts = block_crypto_open_opts_init(cryptoopts, errp);
-     if (!open_opts) {
-         goto cleanup;
-     }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn block_crypto_co_create_opts_luks(const char *filename,
-                                              &block_crypto_create_opts_luks,
-                                              true);
--    create_opts = block_crypto_create_opts_init(Q_CRYPTO_BLOCK_FORMAT_LUKS,
--                                                cryptoopts, errp);
-+    qdict_put_str(cryptoopts, "format", "luks");
-+    create_opts = block_crypto_create_opts_init(cryptoopts, errp);
-     if (!create_opts) {
-         ret = -EINVAL;
-         goto fail;
-diff --git a/block/qcow.c b/block/qcow.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow.c
-+++ b/block/qcow.c
-@@ -XXX,XX +XXX,XX @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
-                 ret = -EINVAL;
-                 goto fail;
-             }
--            qdict_del(encryptopts, "format");
--            crypto_opts = block_crypto_open_opts_init(
--                Q_CRYPTO_BLOCK_FORMAT_QCOW, encryptopts, errp);
-+            qdict_put_str(encryptopts, "format", "qcow");
-+            crypto_opts = block_crypto_open_opts_init(encryptopts, errp);
-             if (!crypto_opts) {
-                 ret = -EINVAL;
-                 goto fail;
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ static int qcow2_update_options_prepare(BlockDriverState *bs,
-             ret = -EINVAL;
-             goto fail;
-         }
--        qdict_del(encryptopts, "format");
--        r->crypto_opts = block_crypto_open_opts_init(
--            Q_CRYPTO_BLOCK_FORMAT_QCOW, encryptopts, errp);
-+        qdict_put_str(encryptopts, "format", "qcow");
-+        r->crypto_opts = block_crypto_open_opts_init(encryptopts, errp);
-         break;
-     case QCOW_CRYPT_LUKS:
-@@ -XXX,XX +XXX,XX @@ static int qcow2_update_options_prepare(BlockDriverState *bs,
-             ret = -EINVAL;
-             goto fail;
-         }
--        qdict_del(encryptopts, "format");
--        r->crypto_opts = block_crypto_open_opts_init(
--            Q_CRYPTO_BLOCK_FORMAT_LUKS, encryptopts, errp);
-+        qdict_put_str(encryptopts, "format", "luks");
-+        r->crypto_opts = block_crypto_open_opts_init(encryptopts, errp);
-         break;
-     default:
---
-.13.6

-[Qemu-devel] [PULL 15/29] qemu-iotests: Update 026.out.nocache reference output
+Deleted patch
-Commit abf754fe406 updated 026.out, but forgot to also update
-.out.nocache.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/026.out.nocache | 6 +++---
-file changed, 3 insertions(+), 3 deletions(-)
-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 @@ Failed to flush the L2 table cache: No space left on device
- Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
--11 leaked clusters were found on the image.
-+10 leaked clusters were found on the image.
- This means waste of disk space, but no harm to data.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
-@@ -XXX,XX +XXX,XX @@ Failed to flush the L2 table cache: No space left on device
- Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
--11 leaked clusters were found on the image.
-+10 leaked clusters were found on the image.
- This means waste of disk space, but no harm to data.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
-@@ -XXX,XX +XXX,XX @@ Failed to flush the L2 table cache: No space left on device
- Failed to flush the refcount block cache: No space left on device
- write failed: No space left on device
--11 leaked clusters were found on the image.
-+10 leaked clusters were found on the image.
- This means waste of disk space, but no harm to data.
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
---
-.13.6

-[Qemu-devel] [PULL 16/29] qcow2: Free allocated clusters on write error
+Deleted patch
-If we managed to allocate the clusters, but then failed to write the
-data, there's a good chance that we'll still be able to free the
-clusters again in order to avoid cluster leaks (the refcounts are
-cached, so even if we can't write them out right now, we may be able to
-do so when the VM is resumed after a werror=stop/enospc pause).
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Tested-by: Eric Blake <eblake@redhat.com>
----
- block/qcow2.h         |  1 +
- block/qcow2-cluster.c | 11 +++++++++++
- block/qcow2.c         |  2 ++
-files changed, 14 insertions(+)
-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 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
-                                          int compressed_size);
- int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m);
-+void qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m);
- int qcow2_cluster_discard(BlockDriverState *bs, uint64_t offset,
-                           uint64_t bytes, enum qcow2_discard_type type,
-                           bool full_discard);
-diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2-cluster.c
-+++ b/block/qcow2-cluster.c
-@@ -XXX,XX +XXX,XX @@ err:
-     return ret;
-  }
-+/**
-+ * Frees the allocated clusters because the request failed and they won't
-+ * actually be linked.
-+ */
-+void qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m)
-+{
-+    BDRVQcow2State *s = bs->opaque;
-+    qcow2_free_clusters(bs, m->alloc_offset, m->nb_clusters << s->cluster_bits,
-+                        QCOW2_DISCARD_NEVER);
-+}
-+
- /*
-  * Returns the number of contiguous clusters that can be used for an allocating
-  * write, but require COW to be performed (this includes yet unallocated space,
-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 coroutine_fn int qcow2_handle_l2meta(BlockDriverState *bs,
-             if (ret) {
-                 goto out;
-             }
-+        } else {
-+            qcow2_alloc_cluster_abort(bs, l2meta);
-         }
-         /* Take the request off the list of running requests */
---
-.13.6

-[Qemu-devel] [PULL 17/29] qemu-iotests: Test qcow2 not leaking clusters on write error
+Deleted patch
-This adds a test for a temporary write failure, which simulates the
-situation after werror=stop/enospc has stopped the VM. We shouldn't
-leave leaked clusters behind in such cases.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/026             | 17 +++++++++++++++++
- tests/qemu-iotests/026.out         |  8 ++++++++
- tests/qemu-iotests/026.out.nocache |  8 ++++++++
-files changed, 33 insertions(+)
-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 @@ done
- done
- done
-+echo
-+echo === Avoid cluster leaks after temporary failure ===
-+echo
-+
-+cat > "$TEST_DIR/blkdebug.conf" <<EOF
-+[inject-error]
-+event = "write_aio"
-+errno = "5"
-+once = "on"
-+EOF
-+
-+# After the failed first write, do a second write so that the updated refcount
-+# block is actually written back
-+_make_test_img 64M
-+$QEMU_IO -c "write 0 1M" -c "write 0 1M" "$BLKDBG_TEST_IMG" | _filter_qemu_io
-+_check_test_img
-+
- # success, all done
- echo "*** done"
- rm -f $seq.full
-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 @@ write failed: No space left on device
-leaked clusters were found on the image.
- This means waste of disk space, but no harm to data.
-+
-+=== Avoid cluster leaks after temporary failure ===
-+
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-+write failed: Input/output error
-+wrote 1048576/1048576 bytes at offset 0
-+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+No errors were found on the image.
- *** done
-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 @@ write failed: No space left on device
-leaked clusters were found on the image.
- This means waste of disk space, but no harm to data.
-+
-+=== Avoid cluster leaks after temporary failure ===
-+
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-+write failed: Input/output error
-+wrote 1048576/1048576 bytes at offset 0
-+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+No errors were found on the image.
- *** done
---
-.13.6

-[Qemu-devel] [PULL 18/29] file-posix: Implement co versions of discard/flush
+Deleted patch
-This simplifies file-posix by implementing the coroutine variants of
-the discard and flush BlockDriver callbacks. These were the last
-remaining users of paio_submit(), which can be removed now.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- block/file-posix.c | 72 ++++++++++++++++++------------------------------------
-file changed, 24 insertions(+), 48 deletions(-)
-diff --git a/block/file-posix.c b/block/file-posix.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
-+++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ static inline int paio_submit_co(BlockDriverState *bs, int fd,
-     return paio_submit_co_full(bs, fd, offset, -1, 0, qiov, bytes, type);
- }
--static BlockAIOCB *paio_submit(BlockDriverState *bs, int fd,
--        int64_t offset, QEMUIOVector *qiov, int bytes,
--        BlockCompletionFunc *cb, void *opaque, int type)
--{
--    RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);
--    ThreadPool *pool;
--
--    acb->bs = bs;
--    acb->aio_type = type;
--    acb->aio_fildes = fd;
--
--    acb->aio_nbytes = bytes;
--    acb->aio_offset = offset;
--
--    if (qiov) {
--        acb->aio_iov = qiov->iov;
--        acb->aio_niov = qiov->niov;
--        assert(qiov->size == acb->aio_nbytes);
--    }
--
--    trace_paio_submit(acb, opaque, offset, bytes, type);
--    pool = aio_get_thread_pool(bdrv_get_aio_context(bs));
--    return thread_pool_submit_aio(pool, aio_worker, acb, cb, opaque);
--}
--
- static int coroutine_fn raw_co_prw(BlockDriverState *bs, uint64_t offset,
-                                    uint64_t bytes, QEMUIOVector *qiov, int type)
- {
-@@ -XXX,XX +XXX,XX @@ static void raw_aio_unplug(BlockDriverState *bs)
- #endif
- }
--static BlockAIOCB *raw_aio_flush(BlockDriverState *bs,
--        BlockCompletionFunc *cb, void *opaque)
-+static int raw_co_flush_to_disk(BlockDriverState *bs)
- {
-     BDRVRawState *s = bs->opaque;
-+    int ret;
--    if (fd_open(bs) < 0)
--        return NULL;
-+    ret = fd_open(bs);
-+    if (ret < 0) {
-+        return ret;
-+    }
--    return paio_submit(bs, s->fd, 0, NULL, 0, cb, opaque, QEMU_AIO_FLUSH);
-+    return paio_submit_co(bs, s->fd, 0, NULL, 0, QEMU_AIO_FLUSH);
- }
- static void raw_aio_attach_aio_context(BlockDriverState *bs,
-@@ -XXX,XX +XXX,XX @@ static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
- #endif /* !__linux__ */
- }
--static coroutine_fn BlockAIOCB *raw_aio_pdiscard(BlockDriverState *bs,
--    int64_t offset, int bytes,
--    BlockCompletionFunc *cb, void *opaque)
-+static coroutine_fn int
-+raw_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes)
- {
-     BDRVRawState *s = bs->opaque;
--    return paio_submit(bs, s->fd, offset, NULL, bytes,
--                       cb, opaque, QEMU_AIO_DISCARD);
-+    return paio_submit_co(bs, s->fd, offset, NULL, bytes, QEMU_AIO_DISCARD);
- }
- static int coroutine_fn raw_co_pwrite_zeroes(
-@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_file = {
-     .bdrv_co_preadv         = raw_co_preadv,
-     .bdrv_co_pwritev        = raw_co_pwritev,
--    .bdrv_aio_flush = raw_aio_flush,
--    .bdrv_aio_pdiscard = raw_aio_pdiscard,
-+    .bdrv_co_flush_to_disk  = raw_co_flush_to_disk,
-+    .bdrv_co_pdiscard       = raw_co_pdiscard,
-     .bdrv_co_copy_range_from = raw_co_copy_range_from,
-     .bdrv_co_copy_range_to  = raw_co_copy_range_to,
-     .bdrv_refresh_limits = raw_refresh_limits,
-@@ -XXX,XX +XXX,XX @@ static int fd_open(BlockDriverState *bs)
-     return -EIO;
- }
--static coroutine_fn BlockAIOCB *hdev_aio_pdiscard(BlockDriverState *bs,
--    int64_t offset, int bytes,
--    BlockCompletionFunc *cb, void *opaque)
-+static coroutine_fn int
-+hdev_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes)
- {
-     BDRVRawState *s = bs->opaque;
-+    int ret;
--    if (fd_open(bs) < 0) {
--        return NULL;
-+    ret = fd_open(bs);
-+    if (ret < 0) {
-+        return ret;
-     }
--    return paio_submit(bs, s->fd, offset, NULL, bytes,
--                       cb, opaque, QEMU_AIO_DISCARD|QEMU_AIO_BLKDEV);
-+    return paio_submit_co(bs, s->fd, offset, NULL, bytes,
-+                          QEMU_AIO_DISCARD | QEMU_AIO_BLKDEV);
- }
- static coroutine_fn int hdev_co_pwrite_zeroes(BlockDriverState *bs,
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
-     .bdrv_co_preadv         = raw_co_preadv,
-     .bdrv_co_pwritev        = raw_co_pwritev,
--    .bdrv_aio_flush    = raw_aio_flush,
--    .bdrv_aio_pdiscard   = hdev_aio_pdiscard,
-+    .bdrv_co_flush_to_disk  = raw_co_flush_to_disk,
-+    .bdrv_co_pdiscard       = hdev_co_pdiscard,
-     .bdrv_co_copy_range_from = raw_co_copy_range_from,
-     .bdrv_co_copy_range_to  = raw_co_copy_range_to,
-     .bdrv_refresh_limits = raw_refresh_limits,
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
-     .bdrv_co_preadv         = raw_co_preadv,
-     .bdrv_co_pwritev        = raw_co_pwritev,
--    .bdrv_aio_flush    = raw_aio_flush,
-+    .bdrv_co_flush_to_disk  = raw_co_flush_to_disk,
-     .bdrv_refresh_limits = raw_refresh_limits,
-     .bdrv_io_plug = raw_aio_plug,
-     .bdrv_io_unplug = raw_aio_unplug,
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
-     .bdrv_co_preadv         = raw_co_preadv,
-     .bdrv_co_pwritev        = raw_co_pwritev,
--    .bdrv_aio_flush    = raw_aio_flush,
-+    .bdrv_co_flush_to_disk  = raw_co_flush_to_disk,
-     .bdrv_refresh_limits = raw_refresh_limits,
-     .bdrv_io_plug = raw_aio_plug,
-     .bdrv_io_unplug = raw_aio_unplug,
---
-.13.6

-[Qemu-devel] [PULL 19/29] qcow2: Fix src_offset in copy offloading
+Deleted patch
-From: Fam Zheng <famz@redhat.com>
-Not updating src_offset will result in wrong data being written to dst
-image.
-Reported-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Fam Zheng <famz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow2.c              |  1 +
- tests/qemu-iotests/063     |  9 +++++++++
- tests/qemu-iotests/063.out | 12 ++++++++++++
-files changed, 22 insertions(+)
-diff --git a/block/qcow2.c b/block/qcow2.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -XXX,XX +XXX,XX @@ qcow2_co_copy_range_to(BlockDriverState *bs,
-         }
-         bytes -= cur_bytes;
-+        src_offset += cur_bytes;
-         dst_offset += cur_bytes;
-     }
-     ret = 0;
-diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/063
-+++ b/tests/qemu-iotests/063
-@@ -XXX,XX +XXX,XX @@ if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev
-     exit 1
- fi
-+echo "== Regression testing for copy offloading bug =="
-+
-+_make_test_img 1M
-+TEST_IMG="$TEST_IMG.target" _make_test_img 1M
-+$QEMU_IO -c 'write -P 1 0 512k' -c 'write -P 2 512k 512k' "$TEST_IMG" | _filter_qemu_io
-+$QEMU_IO -c 'write -P 4 512k 512k' -c 'write -P 3 0 512k' "$TEST_IMG.target" | _filter_qemu_io
-+$QEMU_IMG convert -n -O $IMGFMT "$TEST_IMG" "$TEST_IMG.target"
-+$QEMU_IMG compare "$TEST_IMG" "$TEST_IMG.target"
-+
- echo "*** done"
- rm -f $seq.full
- status=0
-diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/063.out
-+++ b/tests/qemu-iotests/063.out
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
- No errors were found on the image.
- == Testing conversion to a smaller file fails ==
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
-+== Regression testing for copy offloading bug ==
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
-+Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=1048576
-+wrote 524288/524288 bytes at offset 0
-+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+wrote 524288/524288 bytes at offset 524288
-+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+wrote 524288/524288 bytes at offset 524288
-+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+wrote 524288/524288 bytes at offset 0
-+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+Images are identical.
- *** done
---
-.13.6

-[Qemu-devel] [PULL 20/29] iscsi: Don't blindly use designator length in response for memcpy
+Deleted patch
-From: Fam Zheng <famz@redhat.com>
-Per SCSI definition the designator_length we receive from INQUIRY is 8,
-or at most 16, but we should be careful because the remote iscsi
-target may misbehave, otherwise we could have a buffer overflow.
-Reported-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Fam Zheng <famz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/iscsi.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/block/iscsi.c b/block/iscsi.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/iscsi.c
-+++ b/block/iscsi.c
-@@ -XXX,XX +XXX,XX @@ static void iscsi_populate_target_desc(unsigned char *desc, IscsiLun *lun)
-     desc[5] = (dd->designator_type & 0xF)
-         | ((dd->association & 3) << 4);
-     desc[7] = dd->designator_length;
--    memcpy(desc + 8, dd->designator, dd->designator_length);
-+    memcpy(desc + 8, dd->designator, MIN(dd->designator_length, 20));
-     desc[28] = 0;
-     desc[29] = (lun->block_size >> 16) & 0xFF;
---
-.13.6

-[Qemu-devel] [PULL 21/29] file-posix: Fix EINTR handling
+Deleted patch
-From: Fam Zheng <famz@redhat.com>
-EINTR should be checked against errno, not ret. While fixing the bug,
-collect the branches with a switch block.
-Also, change the return value from -ENOSTUP to -ENOSPC when the actual
-issue is request range passes EOF, which should be distinguishable from
-the case of error == ENOSYS by the caller, so that it could still retry
-with other byte ranges, whereas it shouldn't retry anymore upon ENOSYS.
-Signed-off-by: Fam Zheng <famz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/file-posix.c | 17 +++++++++--------
-file changed, 9 insertions(+), 8 deletions(-)
-diff --git a/block/file-posix.c b/block/file-posix.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
-+++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ static ssize_t handle_aiocb_copy_range(RawPosixAIOData *aiocb)
-         ssize_t ret = copy_file_range(aiocb->aio_fildes, &in_off,
-                                       aiocb->aio_fd2, &out_off,
-                                       bytes, 0);
--        if (ret == -EINTR) {
--            continue;
-+        if (ret == 0) {
-+            /* No progress (e.g. when beyond EOF), let the caller fall back to
-+             * buffer I/O. */
-+            return -ENOSPC;
-         }
-         if (ret < 0) {
--            if (errno == ENOSYS) {
-+            switch (errno) {
-+            case ENOSYS:
-                 return -ENOTSUP;
--            } else {
-+            case EINTR:
-+                continue;
-+            default:
-                 return -errno;
-             }
-         }
--        if (!ret) {
--            /* No progress (e.g. when beyond EOF), fall back to buffer I/O. */
--            return -ENOTSUP;
--        }
-         bytes -= ret;
-     }
-     return 0;
---
-.13.6

-[Qemu-devel] [PULL 22/29] parallels: Switch to byte-based calls
+Deleted patch
-From: Eric Blake <eblake@redhat.com>
-We are gradually moving away from sector-based interfaces, towards
-byte-based.  Make the change for the last few sector-based calls
-into the block layer from the parallels driver.
-Ideally, the parallels driver should switch to doing everything
-byte-based, but that's a more invasive change that requires a
-bit more auditing.
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Denis V. Lunev <den@openvz.org>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/parallels.c | 16 ++++++++++------
-file changed, 10 insertions(+), 6 deletions(-)
-diff --git a/block/parallels.c b/block/parallels.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/parallels.c
-+++ b/block/parallels.c
-@@ -XXX,XX +XXX,XX @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num,
-         };
-         qemu_iovec_init_external(&qiov, &iov, 1);
--        ret = bdrv_co_readv(bs->backing, idx * s->tracks, nb_cow_sectors,
--                            &qiov);
-+        ret = bdrv_co_preadv(bs->backing, idx * s->tracks * BDRV_SECTOR_SIZE,
-+                             nb_cow_bytes, &qiov, 0);
-         if (ret < 0) {
-             qemu_vfree(iov.iov_base);
-             return ret;
-         }
--        ret = bdrv_co_writev(bs->file, s->data_end, nb_cow_sectors, &qiov);
-+        ret = bdrv_co_pwritev(bs->file, s->data_end * BDRV_SECTOR_SIZE,
-+                              nb_cow_bytes, &qiov, 0);
-         qemu_vfree(iov.iov_base);
-         if (ret < 0) {
-             return ret;
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int parallels_co_writev(BlockDriverState *bs,
-         qemu_iovec_reset(&hd_qiov);
-         qemu_iovec_concat(&hd_qiov, qiov, bytes_done, nbytes);
--        ret = bdrv_co_writev(bs->file, position, n, &hd_qiov);
-+        ret = bdrv_co_pwritev(bs->file, position * BDRV_SECTOR_SIZE, nbytes,
-+                              &hd_qiov, 0);
-         if (ret < 0) {
-             break;
-         }
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int parallels_co_readv(BlockDriverState *bs,
-         if (position < 0) {
-             if (bs->backing) {
--                ret = bdrv_co_readv(bs->backing, sector_num, n, &hd_qiov);
-+                ret = bdrv_co_preadv(bs->backing, sector_num * BDRV_SECTOR_SIZE,
-+                                     nbytes, &hd_qiov, 0);
-                 if (ret < 0) {
-                     break;
-                 }
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int parallels_co_readv(BlockDriverState *bs,
-                 qemu_iovec_memset(&hd_qiov, 0, 0, nbytes);
-             }
-         } else {
--            ret = bdrv_co_readv(bs->file, position, n, &hd_qiov);
-+            ret = bdrv_co_preadv(bs->file, position * BDRV_SECTOR_SIZE, nbytes,
-+                                 &hd_qiov, 0);
-             if (ret < 0) {
-                 break;
-             }
---
-.13.6

-[Qemu-devel] [PULL 23/29] qcow: Switch get_cluster_offset to be byte-based
+Deleted patch
-From: Eric Blake <eblake@redhat.com>
-We are gradually moving away from sector-based interfaces, towards
-byte-based.  Make the change for the internal helper function
-get_cluster_offset(), by changing n_start and n_end to be byte
-offsets rather than sector indices within the cluster being
-allocated.  However, assert that these values are still
-sector-aligned (at least qcrypto_block_encrypt() still wants that).
-For now we get that alignment for free because we still use
-sector-based driver callbacks.
-A later patch will then switch the qcow driver as a whole over
-to byte-based operation; but will still leave things at sector
-alignments as it is not worth auditing the qcow image format
-to worry about sub-sector requests.
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow.c | 29 +++++++++++++++--------------
-file changed, 15 insertions(+), 14 deletions(-)
-diff --git a/block/qcow.c b/block/qcow.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow.c
-+++ b/block/qcow.c
-@@ -XXX,XX +XXX,XX @@ static int qcow_reopen_prepare(BDRVReopenState *state,
-  *
-  * 0 to not allocate.
-  *
-- * 1 to allocate a normal cluster (for sector indexes 'n_start' to
-- * 'n_end')
-+ * 1 to allocate a normal cluster (for sector-aligned byte offsets 'n_start'
-+ * to 'n_end' within the cluster)
-  *
-  * 2 to allocate a compressed cluster of size
-  * 'compressed_size'. 'compressed_size' must be > 0 and <
-@@ -XXX,XX +XXX,XX @@ static int get_cluster_offset(BlockDriverState *bs,
-         if (!allocate)
-             return 0;
-         BLKDBG_EVENT(bs->file, BLKDBG_CLUSTER_ALLOC);
-+        assert(QEMU_IS_ALIGNED(n_start | n_end, BDRV_SECTOR_SIZE));
-         /* allocate a new cluster */
-         if ((cluster_offset & QCOW_OFLAG_COMPRESSED) &&
--            (n_end - n_start) < s->cluster_sectors) {
-+            (n_end - n_start) < s->cluster_size) {
-             /* if the cluster is already compressed, we must
-                decompress it in the case it is not completely
-                overwritten */
-@@ -XXX,XX +XXX,XX @@ static int get_cluster_offset(BlockDriverState *bs,
-                 /* if encrypted, we must initialize the cluster
-                    content which won't be written */
-                 if (bs->encrypted &&
--                    (n_end - n_start) < s->cluster_sectors) {
--                    uint64_t start_sect;
-+                    (n_end - n_start) < s->cluster_size) {
-+                    uint64_t start_offset;
-                     assert(s->crypto);
--                    start_sect = (offset & ~(s->cluster_size - 1)) >> 9;
--                    for(i = 0; i < s->cluster_sectors; i++) {
-+                    start_offset = offset & ~(s->cluster_size - 1);
-+                    for (i = 0; i < s->cluster_size; i += BDRV_SECTOR_SIZE) {
-                         if (i < n_start || i >= n_end) {
--                            memset(s->cluster_data, 0x00, 512);
-+                            memset(s->cluster_data, 0x00, BDRV_SECTOR_SIZE);
-                             if (qcrypto_block_encrypt(s->crypto,
--                                                      (start_sect + i) *
--                                                      BDRV_SECTOR_SIZE,
-+                                                      start_offset + i,
-                                                       s->cluster_data,
-                                                       BDRV_SECTOR_SIZE,
-                                                       NULL) < 0) {
-@@ -XXX,XX +XXX,XX @@ static int get_cluster_offset(BlockDriverState *bs,
-                             }
-                             BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
-                             ret = bdrv_pwrite(bs->file,
--                                              cluster_offset + i * 512,
--                                              s->cluster_data, 512);
-+                                              cluster_offset + i,
-+                                              s->cluster_data,
-+                                              BDRV_SECTOR_SIZE);
-                             if (ret < 0) {
-                                 return ret;
-                             }
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
-             n = nb_sectors;
-         }
-         ret = get_cluster_offset(bs, sector_num << 9, 1, 0,
--                                 index_in_cluster,
--                                 index_in_cluster + n, &cluster_offset);
-+                                 index_in_cluster << 9,
-+                                 (index_in_cluster + n) << 9, &cluster_offset);
-         if (ret < 0) {
-             break;
-         }
---
-.13.6

-[Qemu-devel] [PULL 24/29] qcow: Switch qcow_co_readv to byte-based calls
+Deleted patch
-From: Eric Blake <eblake@redhat.com>
-We are gradually moving away from sector-based interfaces, towards
-byte-based.  Make the change for the internals of the qcow
-driver read function, by iterating over offset/bytes instead of
-sector_num/nb_sectors, and with a rename of index_in_cluster and
-repurposing of n to track bytes instead of sectors.
-A later patch will then switch the qcow driver as a whole over
-to byte-based operation.
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow.c | 42 ++++++++++++++++++++----------------------
-file changed, 20 insertions(+), 22 deletions(-)
-diff --git a/block/qcow.c b/block/qcow.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow.c
-+++ b/block/qcow.c
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
-                          int nb_sectors, QEMUIOVector *qiov)
- {
-     BDRVQcowState *s = bs->opaque;
--    int index_in_cluster;
-+    int offset_in_cluster;
-     int ret = 0, n;
-     uint64_t cluster_offset;
-     struct iovec hd_iov;
-     QEMUIOVector hd_qiov;
-     uint8_t *buf;
-     void *orig_buf;
-+    int64_t offset = sector_num * BDRV_SECTOR_SIZE;
-+    int64_t bytes = nb_sectors * BDRV_SECTOR_SIZE;
-     if (qiov->niov > 1) {
-         buf = orig_buf = qemu_try_blockalign(bs, qiov->size);
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
-     qemu_co_mutex_lock(&s->lock);
--    while (nb_sectors != 0) {
-+    while (bytes != 0) {
-         /* prepare next request */
--        ret = get_cluster_offset(bs, sector_num << 9,
--                                 0, 0, 0, 0, &cluster_offset);
-+        ret = get_cluster_offset(bs, offset, 0, 0, 0, 0, &cluster_offset);
-         if (ret < 0) {
-             break;
-         }
--        index_in_cluster = sector_num & (s->cluster_sectors - 1);
--        n = s->cluster_sectors - index_in_cluster;
--        if (n > nb_sectors) {
--            n = nb_sectors;
-+        offset_in_cluster = offset & (s->cluster_size - 1);
-+        n = s->cluster_size - offset_in_cluster;
-+        if (n > bytes) {
-+            n = bytes;
-         }
-         if (!cluster_offset) {
-             if (bs->backing) {
-                 /* read from the base image */
-                 hd_iov.iov_base = (void *)buf;
--                hd_iov.iov_len = n * 512;
-+                hd_iov.iov_len = n;
-                 qemu_iovec_init_external(&hd_qiov, &hd_iov, 1);
-                 qemu_co_mutex_unlock(&s->lock);
-                 /* qcow2 emits this on bs->file instead of bs->backing */
-                 BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
--                ret = bdrv_co_readv(bs->backing, sector_num, n, &hd_qiov);
-+                ret = bdrv_co_preadv(bs->backing, offset, n, &hd_qiov, 0);
-                 qemu_co_mutex_lock(&s->lock);
-                 if (ret < 0) {
-                     break;
-                 }
-             } else {
-                 /* Note: in this case, no need to wait */
--                memset(buf, 0, 512 * n);
-+                memset(buf, 0, n);
-             }
-         } else if (cluster_offset & QCOW_OFLAG_COMPRESSED) {
-             /* add AIO support for compressed blocks ? */
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
-                 ret = -EIO;
-                 break;
-             }
--            memcpy(buf,
--                   s->cluster_cache + index_in_cluster * 512, 512 * n);
-+            memcpy(buf, s->cluster_cache + offset_in_cluster, n);
-         } else {
-             if ((cluster_offset & 511) != 0) {
-                 ret = -EIO;
-                 break;
-             }
-             hd_iov.iov_base = (void *)buf;
--            hd_iov.iov_len = n * 512;
-+            hd_iov.iov_len = n;
-             qemu_iovec_init_external(&hd_qiov, &hd_iov, 1);
-             qemu_co_mutex_unlock(&s->lock);
-             BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
--            ret = bdrv_co_readv(bs->file,
--                                (cluster_offset >> 9) + index_in_cluster,
--                                n, &hd_qiov);
-+            ret = bdrv_co_preadv(bs->file, cluster_offset + offset_in_cluster,
-+                                 n, &hd_qiov, 0);
-             qemu_co_mutex_lock(&s->lock);
-             if (ret < 0) {
-                 break;
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
-             if (bs->encrypted) {
-                 assert(s->crypto);
-                 if (qcrypto_block_decrypt(s->crypto,
--                                          sector_num * BDRV_SECTOR_SIZE, buf,
--                                          n * BDRV_SECTOR_SIZE, NULL) < 0) {
-+                                          offset, buf, n, NULL) < 0) {
-                     ret = -EIO;
-                     break;
-                 }
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
-         }
-         ret = 0;
--        nb_sectors -= n;
--        sector_num += n;
--        buf += n * 512;
-+        bytes -= n;
-+        offset += n;
-+        buf += n;
-     }
-     qemu_co_mutex_unlock(&s->lock);
---
-.13.6

-[Qemu-devel] [PULL 25/29] qcow: Switch qcow_co_writev to byte-based calls
+Deleted patch
-From: Eric Blake <eblake@redhat.com>
-We are gradually moving away from sector-based interfaces, towards
-byte-based.  Make the change for the internals of the qcow
-driver write function, by iterating over offset/bytes instead of
-sector_num/nb_sectors, and with a rename of index_in_cluster and
-repurposing of n to track bytes instead of sectors.
-A later patch will then switch the qcow driver as a whole over
-to byte-based operation.
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow.c | 36 +++++++++++++++++-------------------
-file changed, 17 insertions(+), 19 deletions(-)
-diff --git a/block/qcow.c b/block/qcow.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow.c
-+++ b/block/qcow.c
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
-                                        int flags)
- {
-     BDRVQcowState *s = bs->opaque;
--    int index_in_cluster;
-+    int offset_in_cluster;
-     uint64_t cluster_offset;
-     int ret = 0, n;
-     struct iovec hd_iov;
-     QEMUIOVector hd_qiov;
-     uint8_t *buf;
-     void *orig_buf;
-+    int64_t offset = sector_num * BDRV_SECTOR_SIZE;
-+    int64_t bytes = nb_sectors * BDRV_SECTOR_SIZE;
-     assert(!flags);
-     s->cluster_cache_offset = -1; /* disable compressed cache */
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
-     qemu_co_mutex_lock(&s->lock);
--    while (nb_sectors != 0) {
--
--        index_in_cluster = sector_num & (s->cluster_sectors - 1);
--        n = s->cluster_sectors - index_in_cluster;
--        if (n > nb_sectors) {
--            n = nb_sectors;
-+    while (bytes != 0) {
-+        offset_in_cluster = offset & (s->cluster_size - 1);
-+        n = s->cluster_size - offset_in_cluster;
-+        if (n > bytes) {
-+            n = bytes;
-         }
--        ret = get_cluster_offset(bs, sector_num << 9, 1, 0,
--                                 index_in_cluster << 9,
--                                 (index_in_cluster + n) << 9, &cluster_offset);
-+        ret = get_cluster_offset(bs, offset, 1, 0, offset_in_cluster,
-+                                 offset_in_cluster + n, &cluster_offset);
-         if (ret < 0) {
-             break;
-         }
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
-         }
-         if (bs->encrypted) {
-             assert(s->crypto);
--            if (qcrypto_block_encrypt(s->crypto, sector_num * BDRV_SECTOR_SIZE,
--                                      buf, n * BDRV_SECTOR_SIZE, NULL) < 0) {
-+            if (qcrypto_block_encrypt(s->crypto, offset, buf, n, NULL) < 0) {
-                 ret = -EIO;
-                 break;
-             }
-         }
-         hd_iov.iov_base = (void *)buf;
--        hd_iov.iov_len = n * 512;
-+        hd_iov.iov_len = n;
-         qemu_iovec_init_external(&hd_qiov, &hd_iov, 1);
-         qemu_co_mutex_unlock(&s->lock);
-         BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
--        ret = bdrv_co_writev(bs->file,
--                             (cluster_offset >> 9) + index_in_cluster,
--                             n, &hd_qiov);
-+        ret = bdrv_co_pwritev(bs->file, cluster_offset + offset_in_cluster,
-+                              n, &hd_qiov, 0);
-         qemu_co_mutex_lock(&s->lock);
-         if (ret < 0) {
-             break;
-         }
-         ret = 0;
--        nb_sectors -= n;
--        sector_num += n;
--        buf += n * 512;
-+        bytes -= n;
-+        offset += n;
-+        buf += n;
-     }
-     qemu_co_mutex_unlock(&s->lock);
---
-.13.6

-[Qemu-devel] [PULL 26/29] qcow: Switch to a byte-based driver
+Deleted patch
-From: Eric Blake <eblake@redhat.com>
-We are gradually moving away from sector-based interfaces, towards
-byte-based.  The qcow driver is now ready to fully utilize the
-byte-based callback interface, as long as we override the default
-alignment to still be 512 (needed at least for asserts present
-because of encryption, but easier to do everywhere than to audit
-which sub-sector requests are handled correctly, especially since
-we no longer recommend qcow for new disk images).
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/qcow.c | 35 ++++++++++++++++++++---------------
-file changed, 20 insertions(+), 15 deletions(-)
-diff --git a/block/qcow.c b/block/qcow.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/qcow.c
-+++ b/block/qcow.c
-@@ -XXX,XX +XXX,XX @@ typedef struct QCowHeader {
- typedef struct BDRVQcowState {
-     int cluster_bits;
-     int cluster_size;
--    int cluster_sectors;
-     int l2_bits;
-     int l2_size;
-     unsigned int l1_size;
-@@ -XXX,XX +XXX,XX @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
-     }
-     s->cluster_bits = header.cluster_bits;
-     s->cluster_size = 1 << s->cluster_bits;
--    s->cluster_sectors = 1 << (s->cluster_bits - 9);
-     s->l2_bits = header.l2_bits;
-     s->l2_size = 1 << s->l2_bits;
-     bs->total_sectors = header.size / 512;
-@@ -XXX,XX +XXX,XX @@ static int decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset)
-     return 0;
- }
--static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
--                         int nb_sectors, QEMUIOVector *qiov)
-+static void qcow_refresh_limits(BlockDriverState *bs, Error **errp)
-+{
-+    /* At least encrypted images require 512-byte alignment. Apply the
-+     * limit universally, rather than just on encrypted images, as
-+     * it's easier to let the block layer handle rounding than to
-+     * audit this code further. */
-+    bs->bl.request_alignment = BDRV_SECTOR_SIZE;
-+}
-+
-+static coroutine_fn int qcow_co_preadv(BlockDriverState *bs, uint64_t offset,
-+                                       uint64_t bytes, QEMUIOVector *qiov,
-+                                       int flags)
- {
-     BDRVQcowState *s = bs->opaque;
-     int offset_in_cluster;
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
-     QEMUIOVector hd_qiov;
-     uint8_t *buf;
-     void *orig_buf;
--    int64_t offset = sector_num * BDRV_SECTOR_SIZE;
--    int64_t bytes = nb_sectors * BDRV_SECTOR_SIZE;
-+    assert(!flags);
-     if (qiov->niov > 1) {
-         buf = orig_buf = qemu_try_blockalign(bs, qiov->size);
-         if (buf == NULL) {
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
-     return ret;
- }
--static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
--                                       int nb_sectors, QEMUIOVector *qiov,
--                                       int flags)
-+static coroutine_fn int qcow_co_pwritev(BlockDriverState *bs, uint64_t offset,
-+                                        uint64_t bytes, QEMUIOVector *qiov,
-+                                        int flags)
- {
-     BDRVQcowState *s = bs->opaque;
-     int offset_in_cluster;
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
-     QEMUIOVector hd_qiov;
-     uint8_t *buf;
-     void *orig_buf;
--    int64_t offset = sector_num * BDRV_SECTOR_SIZE;
--    int64_t bytes = nb_sectors * BDRV_SECTOR_SIZE;
-     assert(!flags);
-     s->cluster_cache_offset = -1; /* disable compressed cache */
-@@ -XXX,XX +XXX,XX @@ qcow_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
-     if (ret != Z_STREAM_END || out_len >= s->cluster_size) {
-         /* could not compress: write normal cluster */
--        ret = qcow_co_writev(bs, offset >> BDRV_SECTOR_BITS,
--                             bytes >> BDRV_SECTOR_BITS, qiov, 0);
-+        ret = qcow_co_pwritev(bs, offset, bytes, qiov, 0);
-         if (ret < 0) {
-             goto fail;
-         }
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_qcow = {
-     .bdrv_co_create_opts    = qcow_co_create_opts,
-     .bdrv_has_zero_init     = bdrv_has_zero_init_1,
-     .supports_backing       = true,
-+    .bdrv_refresh_limits    = qcow_refresh_limits,
--    .bdrv_co_readv          = qcow_co_readv,
--    .bdrv_co_writev         = qcow_co_writev,
-+    .bdrv_co_preadv         = qcow_co_preadv,
-+    .bdrv_co_pwritev        = qcow_co_pwritev,
-     .bdrv_co_block_status   = qcow_co_block_status,
-     .bdrv_make_empty        = qcow_make_empty,
---
-.13.6

-[Qemu-devel] [PULL 27/29] replication: Switch to byte-based calls
+Deleted patch
-From: Eric Blake <eblake@redhat.com>
-We are gradually moving away from sector-based interfaces, towards
-byte-based.  Make the change for the last few sector-based calls
-into the block layer from the replication driver.
-Ideally, the replication driver should switch to doing everything
-byte-based, but that's a more invasive change that requires a
-bit more auditing.
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/replication.c | 14 ++++++++------
-file changed, 8 insertions(+), 6 deletions(-)
-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 coroutine_fn int replication_co_readv(BlockDriverState *bs,
-         backup_cow_request_begin(&req, child->bs->job,
-                                  sector_num * BDRV_SECTOR_SIZE,
-                                  remaining_bytes);
--        ret = bdrv_co_readv(bs->file, sector_num, remaining_sectors,
--                            qiov);
-+        ret = bdrv_co_preadv(bs->file, sector_num * BDRV_SECTOR_SIZE,
-+                             remaining_bytes, qiov, 0);
-         backup_cow_request_end(&req);
-         goto out;
-     }
--    ret = bdrv_co_readv(bs->file, sector_num, remaining_sectors, qiov);
-+    ret = bdrv_co_preadv(bs->file, sector_num * BDRV_SECTOR_SIZE,
-+                         remaining_sectors * BDRV_SECTOR_SIZE, qiov, 0);
- out:
-     return replication_return_value(s, ret);
- }
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int replication_co_writev(BlockDriverState *bs,
-     }
-     if (ret == 0) {
--        ret = bdrv_co_writev(top, sector_num,
--                             remaining_sectors, qiov);
-+        ret = bdrv_co_pwritev(top, sector_num * BDRV_SECTOR_SIZE,
-+                              remaining_sectors * BDRV_SECTOR_SIZE, qiov, 0);
-         return replication_return_value(s, ret);
-     }
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int replication_co_writev(BlockDriverState *bs,
-         qemu_iovec_concat(&hd_qiov, qiov, bytes_done, count);
-         target = ret ? top : base;
--        ret = bdrv_co_writev(target, sector_num, n, &hd_qiov);
-+        ret = bdrv_co_pwritev(target, sector_num * BDRV_SECTOR_SIZE,
-+                              n * BDRV_SECTOR_SIZE, &hd_qiov, 0);
-         if (ret < 0) {
-             goto out1;
-         }
---
-.13.6

-[Qemu-devel] [PULL 28/29] vhdx: Switch to byte-based calls
+Deleted patch
-From: Eric Blake <eblake@redhat.com>
-We are gradually moving away from sector-based interfaces, towards
-byte-based.  Make the change for the last few sector-based calls
-into the block layer from the vhdx driver.
-Ideally, the vhdx driver should switch to doing everything
-byte-based, but that's a more invasive change that requires a
-bit more auditing.
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/vhdx.c | 12 ++++++------
-file changed, 6 insertions(+), 6 deletions(-)
-diff --git a/block/vhdx.c b/block/vhdx.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vhdx.c
-+++ b/block/vhdx.c
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int vhdx_co_readv(BlockDriverState *bs, int64_t sector_num,
-                 break;
-             case PAYLOAD_BLOCK_FULLY_PRESENT:
-                 qemu_co_mutex_unlock(&s->lock);
--                ret = bdrv_co_readv(bs->file,
--                                    sinfo.file_offset >> BDRV_SECTOR_BITS,
--                                    sinfo.sectors_avail, &hd_qiov);
-+                ret = bdrv_co_preadv(bs->file, sinfo.file_offset,
-+                                     sinfo.sectors_avail * BDRV_SECTOR_SIZE,
-+                                     &hd_qiov, 0);
-                 qemu_co_mutex_lock(&s->lock);
-                 if (ret < 0) {
-                     goto exit;
-@@ -XXX,XX +XXX,XX @@ static coroutine_fn int vhdx_co_writev(BlockDriverState *bs, int64_t sector_num,
-                 }
-                 /* block exists, so we can just overwrite it */
-                 qemu_co_mutex_unlock(&s->lock);
--                ret = bdrv_co_writev(bs->file,
--                                    sinfo.file_offset >> BDRV_SECTOR_BITS,
--                                    sectors_to_write, &hd_qiov);
-+                ret = bdrv_co_pwritev(bs->file, sinfo.file_offset,
-+                                      sectors_to_write * BDRV_SECTOR_SIZE,
-+                                      &hd_qiov, 0);
-                 qemu_co_mutex_lock(&s->lock);
-                 if (ret < 0) {
-                     goto error_bat_restore;
---
-.13.6

-[Qemu-devel] [PULL 29/29] block: Remove unused sector-based vectored I/O
+Deleted patch
-From: Eric Blake <eblake@redhat.com>
-We are gradually moving away from sector-based interfaces, towards
-byte-based.  Now that all callers of vectored I/O have been converted
-to use our preferred byte-based bdrv_co_p{read,write}v(), we can
-delete the unused bdrv_co_{read,write}v().
-Furthermore, this gets rid of the signature difference between the
-public bdrv_co_writev() and the callback .bdrv_co_writev (the
-latter still exists, because some drivers still need more work
-before they are fully byte-based).
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- include/block/block.h |  4 ----
- block/io.c            | 36 ------------------------------------
-files changed, 40 deletions(-)
-diff --git a/include/block/block.h b/include/block/block.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/block.h
-+++ b/include/block/block.h
-@@ -XXX,XX +XXX,XX @@ int bdrv_pwrite(BdrvChild *child, int64_t offset, const void *buf, int bytes);
- int bdrv_pwritev(BdrvChild *child, int64_t offset, QEMUIOVector *qiov);
- int bdrv_pwrite_sync(BdrvChild *child, int64_t offset,
-                      const void *buf, int count);
--int coroutine_fn bdrv_co_readv(BdrvChild *child, int64_t sector_num,
--                               int nb_sectors, QEMUIOVector *qiov);
--int coroutine_fn bdrv_co_writev(BdrvChild *child, int64_t sector_num,
--                               int nb_sectors, QEMUIOVector *qiov);
- /*
-  * Efficiently zero a region of the disk image.  Note that this is a regular
-  * I/O request like read or write and should have a reasonable size.  This
-diff --git a/block/io.c b/block/io.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/io.c
-+++ b/block/io.c
-@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_preadv(BdrvChild *child,
-     return ret;
- }
--static int coroutine_fn bdrv_co_do_readv(BdrvChild *child,
--    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
--    BdrvRequestFlags flags)
--{
--    if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {
--        return -EINVAL;
--    }
--
--    return bdrv_co_preadv(child, sector_num << BDRV_SECTOR_BITS,
--                          nb_sectors << BDRV_SECTOR_BITS, qiov, flags);
--}
--
--int coroutine_fn bdrv_co_readv(BdrvChild *child, int64_t sector_num,
--                               int nb_sectors, QEMUIOVector *qiov)
--{
--    return bdrv_co_do_readv(child, sector_num, nb_sectors, qiov, 0);
--}
--
- static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,
-     int64_t offset, int bytes, BdrvRequestFlags flags)
- {
-@@ -XXX,XX +XXX,XX @@ out:
-     return ret;
- }
--static int coroutine_fn bdrv_co_do_writev(BdrvChild *child,
--    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
--    BdrvRequestFlags flags)
--{
--    if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {
--        return -EINVAL;
--    }
--
--    return bdrv_co_pwritev(child, sector_num << BDRV_SECTOR_BITS,
--                           nb_sectors << BDRV_SECTOR_BITS, qiov, flags);
--}
--
--int coroutine_fn bdrv_co_writev(BdrvChild *child, int64_t sector_num,
--    int nb_sectors, QEMUIOVector *qiov)
--{
--    return bdrv_co_do_writev(child, sector_num, nb_sectors, qiov, 0);
--}
--
- int coroutine_fn bdrv_co_pwrite_zeroes(BdrvChild *child, int64_t offset,
-                                        int bytes, BdrvRequestFlags flags)
- {
---
-.13.6

The following changes since commit 609ef9f451759151d0bfe7c3843410ab94d68f18:

Merge remote-tracking branch 'remotes/berrange/tags/qio-next-pull-request' into staging (2018-06-28 17:53:31 +0100)

are available in the git repository at:

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

for you to fetch changes up to 583c99d39368526dfb57a715b04a6ceea27dbe1e:

block: Remove unused sector-based vectored I/O (2018-06-29 14:20:56 +0200)

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

- Make truncate operations asynchronous (so that preallocation in
  blockdev-create doesn't block the main loop any more)
- usb-storage: Add rerror/werror properties
- nvme: Add num_queues property
- qemu-img convert: Copy offloading fixes (including data corruption fix)
- qcow2: Fix cluster leak on temporary write error
- Use byte-based functions instead of bdrv_co_readv/writev()
- Various small fixes and cleanups

----------------------------------------------------------------
Eric Blake (8):
      parallels: Switch to byte-based calls
      qcow: Switch get_cluster_offset to be byte-based
      qcow: Switch qcow_co_readv to byte-based calls
      qcow: Switch qcow_co_writev to byte-based calls
      qcow: Switch to a byte-based driver
      replication: Switch to byte-based calls
      vhdx: Switch to byte-based calls
      block: Remove unused sector-based vectored I/O

Fam Zheng (5):
      qcow2: Remove dead check on !ret
      block: Move request tracking to children in copy offloading
      qcow2: Fix src_offset in copy offloading
      iscsi: Don't blindly use designator length in response for memcpy
      file-posix: Fix EINTR handling

Kevin Wolf (12):
      qapi/job: The next release will be 3.0
      usb-storage: Add rerror/werror properties
      qcow2: Fix qcow2_truncate() error return value
      block: Convert .bdrv_truncate callback to coroutine_fn
      qcow2: Remove coroutine trampoline for preallocate_co()
      block: Move bdrv_truncate() implementation to io.c
      block: Use tracked request for truncate
      file-posix: Make .bdrv_co_truncate asynchronous
      qemu-iotests: Update 026.out.nocache reference output
      qcow2: Free allocated clusters on write error
      qemu-iotests: Test qcow2 not leaking clusters on write error
      file-posix: Implement co versions of discard/flush

Markus Armbruster (3):
      block-qdict: Pacify Coverity after commit f1b34a248e9
      block/crypto: Pacify Coverity after commit f853465aacb
      block/crypto: Simplify block_crypto_{open,create}_opts_init()

Weiping Zhang (1):
      hw/block/nvme: add optional parameter num_queues for nvme device

From: Markus Armbruster <armbru@redhat.com>

Commit f1b34a248e9 replaced less-than-obvious test in
qdict_flatten_qdict() by the obvious one.  Sadly, it made something
else non-obvious: the fact that @new_key passed to qdict_put_obj()
can't be null, because that depends on the function's precondition
(target == qdict) == !prefix.

Tweak the function some more to help Coverity and human readers alike.

Fixes: CID 1393620
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qobject/block-qdict.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c
index XXXXXXX..XXXXXXX 100644
--- a/qobject/block-qdict.c
+++ b/qobject/block-qdict.c
@@ -XXX,XX +XXX,XX @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
     const QDictEntry *entry, *next;
     QDict *dict_val;
     QList *list_val;
-    char *new_key;
+    char *key, *new_key;
 
     entry = qdict_first(qdict);
 
@@ -XXX,XX +XXX,XX @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
         value = qdict_entry_value(entry);
         dict_val = qobject_to(QDict, value);
         list_val = qobject_to(QList, value);
-        new_key = NULL;
 
         if (prefix) {
-            new_key = g_strdup_printf("%s.%s", prefix, entry->key);
+            key = new_key = g_strdup_printf("%s.%s", prefix, entry->key);
+        } else {
+            key = entry->key;
+            new_key = NULL;
         }
 
         /*
@@ -XXX,XX +XXX,XX @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
          * well advised not to modify them altogether.)
          */
         if (dict_val && qdict_size(dict_val)) {
-            qdict_flatten_qdict(dict_val, target,
-                                new_key ? new_key : entry->key);
+            qdict_flatten_qdict(dict_val, target, key);
             if (target == qdict) {
                 qdict_del(qdict, entry->key);
             }
         } else if (list_val && !qlist_empty(list_val)) {
-            qdict_flatten_qlist(list_val, target,
-                                new_key ? new_key : entry->key);
+            qdict_flatten_qlist(list_val, target, key);
             if (target == qdict) {
                 qdict_del(qdict, entry->key);
             }
         } else if (target != qdict) {
-            qdict_put_obj(target, new_key, qobject_ref(value));
+            qdict_put_obj(target, key, qobject_ref(value));
         }
 
         g_free(new_key);
-- 
2.13.6

From: Markus Armbruster <armbru@redhat.com>

Coverity can't see that qobject_input_visitor_new_flat_confused()
returns non-null when it doesn't set @local_err.  Check the return
value instead, like all the other callers do.

Fixes: CID 1393615
Fixes: CID 1393616
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/crypto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/crypto.c b/block/crypto.c
index XXXXXXX..XXXXXXX 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -XXX,XX +XXX,XX @@ block_crypto_open_opts_init(QCryptoBlockFormat format,
     ret->format = format;
 
     v = qobject_input_visitor_new_flat_confused(opts, &local_err);
-    if (local_err) {
+    if (!v) {
         goto out;
     }
 
@@ -XXX,XX +XXX,XX @@ block_crypto_create_opts_init(QCryptoBlockFormat format,
     ret->format = format;
 
     v = qobject_input_visitor_new_flat_confused(opts, &local_err);
-    if (local_err) {
+    if (!v) {
         goto out;
     }
 
-- 
2.13.6

Commit 51f63ec7d tried to change all references to 2.13 into 3.0, but
it failed to achieve this because it was not properly rebased on top of
the series introducing qapi/job.json. Change the references now.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 qapi/job.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/qapi/job.json b/qapi/job.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/job.json
+++ b/qapi/job.json
@@ -XXX,XX +XXX,XX @@
 # @id: The job identifier
 # @status: The new job status
 #
-# Since: 2.13
+# Since: 3.0
 ##
 { 'event': 'JOB_STATUS_CHANGE',
   'data': { 'id': 'str',
@@ -XXX,XX +XXX,XX @@
 #
 # @id: The job identifier.
 #
-# Since: 2.13
+# Since: 3.0
 ##
 { 'command': 'job-pause', 'data': { 'id': 'str' } }
 
@@ -XXX,XX +XXX,XX @@
 #
 # @id : The job identifier.
 #
-# Since: 2.13
+# Since: 3.0
 ##
 { 'command': 'job-resume', 'data': { 'id': 'str' } }
 
@@ -XXX,XX +XXX,XX @@
 #
 # @id: The job identifier.
 #
-# Since: 2.13
+# Since: 3.0
 ##
 { 'command': 'job-cancel', 'data': { 'id': 'str' } }
 
@@ -XXX,XX +XXX,XX @@
 #
 # @id: The job identifier.
 #
-# Since: 2.13
+# Since: 3.0
 ##
 { 'command': 'job-complete', 'data': { 'id': 'str' } }
 
@@ -XXX,XX +XXX,XX @@
 #
 # @id: The job identifier.
 #
-# Since: 2.13
+# Since: 3.0
 ##
 { 'command': 'job-dismiss', 'data': { 'id': 'str' } }
 
@@ -XXX,XX +XXX,XX @@
 # @id: The identifier of any job in the transaction, or of a job that is not
 #      part of any transaction.
 #
-# Since: 2.13
+# Since: 3.0
 ##
 { 'command': 'job-finalize', 'data': { 'id': 'str' } }
 
@@ -XXX,XX +XXX,XX @@
 #                       the reason for the job failure. It should not be parsed
 #                       by applications.
 #
-# Since: 2.13
+# Since: 3.0
 ##
 { 'struct': 'JobInfo',
   'data': { 'id': 'str', 'type': 'JobType', 'status': 'JobStatus',
@@ -XXX,XX +XXX,XX @@
 #
 # Returns: a list with a @JobInfo for each active job
 #
-# Since: 2.13
+# Since: 3.0
 ##
 { 'command': 'query-jobs', 'returns': ['JobInfo'] }
-- 
2.13.6

The error handling policy was traditionally set with -drive, but with
-blockdev it is no longer possible to set frontend options. scsi-disk
(and other block devices) have long supported qdev properties to
configure the error handling policy, so let's add these options to
usb-storage as well and just forward them to the internal scsi-disk
instance.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
 include/hw/scsi/scsi.h |  2 ++
 hw/scsi/scsi-bus.c     | 11 ++++++++++-
 hw/usb/dev-storage.c   |  2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/scsi/scsi.h
+++ b/include/hw/scsi/scsi.h
@@ -XXX,XX +XXX,XX @@ static inline SCSIBus *scsi_bus_from_device(SCSIDevice *d)
 SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
                                       int unit, bool removable, int bootindex,
                                       bool share_rw,
+                                      BlockdevOnError rerror,
+                                      BlockdevOnError werror,
                                       const char *serial, Error **errp);
 void scsi_bus_legacy_handle_cmdline(SCSIBus *bus);
 void scsi_legacy_handle_cmdline(void);
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -XXX,XX +XXX,XX @@ static void scsi_qdev_unrealize(DeviceState *qdev, Error **errp)
 SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
                                       int unit, bool removable, int bootindex,
                                       bool share_rw,
+                                      BlockdevOnError rerror,
+                                      BlockdevOnError werror,
                                       const char *serial, Error **errp)
 {
     const char *driver;
@@ -XXX,XX +XXX,XX @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
         object_unparent(OBJECT(dev));
         return NULL;
     }
+
+    qdev_prop_set_enum(dev, "rerror", rerror);
+    qdev_prop_set_enum(dev, "werror", werror);
+
     object_property_set_bool(OBJECT(dev), true, "realized", &err);
     if (err != NULL) {
         error_propagate(errp, err);
@@ -XXX,XX +XXX,XX @@ void scsi_bus_legacy_handle_cmdline(SCSIBus *bus)
         }
         qemu_opts_loc_restore(dinfo->opts);
         scsi_bus_legacy_add_drive(bus, blk_by_legacy_dinfo(dinfo),
-                                  unit, false, -1, false, NULL, &error_fatal);
+                                  unit, false, -1, false,
+                                  BLOCKDEV_ON_ERROR_AUTO,
+                                  BLOCKDEV_ON_ERROR_AUTO,
+                                  NULL, &error_fatal);
     }
     loc_pop(&loc);
 }
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -XXX,XX +XXX,XX @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp)
                  &usb_msd_scsi_info_storage, NULL);
     scsi_dev = scsi_bus_legacy_add_drive(&s->bus, blk, 0, !!s->removable,
                                          s->conf.bootindex, s->conf.share_rw,
+                                         s->conf.rerror, s->conf.werror,
                                          dev->serial,
                                          errp);
     blk_unref(blk);
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_usb_msd = {
 
 static Property msd_properties[] = {
     DEFINE_BLOCK_PROPERTIES(MSDState, conf),
+    DEFINE_BLOCK_ERROR_PROPERTIES(MSDState, conf),
     DEFINE_PROP_BIT("removable", MSDState, removable, 0, false),
     DEFINE_PROP_END_OF_LIST(),
 };
-- 
2.13.6

From: Weiping Zhang <zhangweiping@didichuxing.com>

Add an optional paramter num_queues for device, and set it
to 64 by default.

Signed-off-by: Weiping Zhang <zhangweiping@didichuxing.com>
Acked-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 hw/block/nvme.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -XXX,XX +XXX,XX @@
  * Usage: add options:
  *      -drive file=<file>,if=none,id=<drive_id>
  *      -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>, \
- *              cmb_size_mb=<cmb_size_mb[optional]>
+ *              cmb_size_mb=<cmb_size_mb[optional]>, \
+ *              num_queues=<N[optional]>
  *
  * Note cmb_size_mb denotes size of CMB in MB. CMB is assumed to be at
  * offset 0 in BAR2 and supports only WDS, RDS and SQS for now.
@@ -XXX,XX +XXX,XX @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
     pcie_endpoint_cap_init(&n->parent_obj, 0x80);
 
     n->num_namespaces = 1;
-    n->num_queues = 64;
     n->reg_size = pow2ceil(0x1004 + 2 * (n->num_queues + 1) * 4);
     n->ns_size = bs_size / (uint64_t)n->num_namespaces;
 
@@ -XXX,XX +XXX,XX @@ static Property nvme_props[] = {
     DEFINE_BLOCK_PROPERTIES(NvmeCtrl, conf),
     DEFINE_PROP_STRING("serial", NvmeCtrl, serial),
     DEFINE_PROP_UINT32("cmb_size_mb", NvmeCtrl, cmb_size_mb, 0),
+    DEFINE_PROP_UINT32("num_queues", NvmeCtrl, num_queues, 64),
     DEFINE_PROP_END_OF_LIST(),
 };
 
-- 
2.13.6

bdrv_truncate() is an operation that can block (even for a quite long
time, depending on the PreallocMode) in I/O paths that shouldn't block.
Convert it to a coroutine_fn so that we have the infrastructure for
drivers to make their .bdrv_co_truncate implementation asynchronous.

This change could potentially introduce new race conditions because
bdrv_truncate() isn't necessarily executed atomically any more. Whether
this is a problem needs to be evaluated for each block driver that
supports truncate:

* file-posix/win32, gluster, iscsi, nfs, rbd, ssh, sheepdog: The
  protocol drivers are trivially safe because they don't actually yield
  yet, so there is no change in behaviour.

* copy-on-read, crypto, raw-format: Essentially just filter drivers that
  pass the request to a child node, no problem.

* qcow2: The implementation modifies metadata, so it needs to hold
  s->lock to be safe with concurrent I/O requests. In order to avoid
  double locking, this requires pulling the locking out into
  preallocate_co() and using qcow2_write_caches() instead of
  bdrv_flush().

* qed: Does a single header update, this is fine without locking.

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 coroutine_fn bdrv_co_pwrite_zeroes(BdrvChild *child, int64_t offset,
 BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,
     const char *backing_file);
 void bdrv_refresh_filename(BlockDriverState *bs);
+
+int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
+                                  PreallocMode prealloc, Error **errp);
 int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
                   Error **errp);
+
 int64_t bdrv_nb_sectors(BlockDriverState *bs);
 int64_t bdrv_getlength(BlockDriverState *bs);
 int64_t bdrv_get_allocated_file_size(BlockDriverState *bs);
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 {
      * bdrv_parse_filename.
      */
     const char *protocol_name;
-    int (*bdrv_truncate)(BlockDriverState *bs, int64_t offset,
-                         PreallocMode prealloc, Error **errp);
+    int coroutine_fn (*bdrv_co_truncate)(BlockDriverState *bs, int64_t offset,
+                                         PreallocMode prealloc, Error **errp);
 
     int64_t (*bdrv_getlength)(BlockDriverState *bs);
     bool has_variable_length;
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ exit:
 /**
  * Truncate file to 'offset' bytes (needed only for file protocols)
  */
-int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
-                  Error **errp)
+int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
+                                  PreallocMode prealloc, Error **errp)
 {
     BlockDriverState *bs = child->bs;
     BlockDriver *drv = bs->drv;
@@ -XXX,XX +XXX,XX @@ int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
         return -EINVAL;
     }
 
-    if (!drv->bdrv_truncate) {
+    bdrv_inc_in_flight(bs);
+
+    if (!drv->bdrv_co_truncate) {
         if (bs->file && drv->is_filter) {
-            return bdrv_truncate(bs->file, offset, prealloc, errp);
+            ret = bdrv_co_truncate(bs->file, offset, prealloc, errp);
+            goto out;
         }
         error_setg(errp, "Image format driver does not support resize");
-        return -ENOTSUP;
+        ret = -ENOTSUP;
+        goto out;
     }
     if (bs->read_only) {
         error_setg(errp, "Image is read-only");
-        return -EACCES;
+        ret = -EACCES;
+        goto out;
     }
 
     assert(!(bs->open_flags & BDRV_O_INACTIVE));
 
-    ret = drv->bdrv_truncate(bs, offset, prealloc, errp);
+    ret = drv->bdrv_co_truncate(bs, offset, prealloc, errp);
     if (ret < 0) {
-        return ret;
+        goto out;
     }
     ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);
     if (ret < 0) {
@@ -XXX,XX +XXX,XX @@ int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
     bdrv_dirty_bitmap_truncate(bs, offset);
     bdrv_parent_cb_resize(bs);
     atomic_inc(&bs->write_gen);
+
+out:
+    bdrv_dec_in_flight(bs);
     return ret;
 }
 
+typedef struct TruncateCo {
+    BdrvChild *child;
+    int64_t offset;
+    PreallocMode prealloc;
+    Error **errp;
+    int ret;
+} TruncateCo;
+
+static void coroutine_fn bdrv_truncate_co_entry(void *opaque)
+{
+    TruncateCo *tco = opaque;
+    tco->ret = bdrv_co_truncate(tco->child, tco->offset, tco->prealloc,
+                                tco->errp);
+}
+
+int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
+                  Error **errp)
+{
+    Coroutine *co;
+    TruncateCo tco = {
+        .child      = child,
+        .offset     = offset,
+        .prealloc   = prealloc,
+        .errp       = errp,
+        .ret        = NOT_DONE,
+    };
+
+    if (qemu_in_coroutine()) {
+        /* Fast-path if already in coroutine context */
+        bdrv_truncate_co_entry(&tco);
+    } else {
+        co = qemu_coroutine_create(bdrv_truncate_co_entry, &tco);
+        qemu_coroutine_enter(co);
+        BDRV_POLL_WHILE(child->bs, tco.ret == NOT_DONE);
+    }
+
+    return tco.ret;
+}
+
 /**
  * Length of a allocated file in bytes. Sparse files are counted by actual
  * allocated space. Return < 0 if error or unknown.
diff --git a/block/copy-on-read.c b/block/copy-on-read.c
index XXXXXXX..XXXXXXX 100644
--- a/block/copy-on-read.c
+++ b/block/copy-on-read.c
@@ -XXX,XX +XXX,XX @@ static int64_t cor_getlength(BlockDriverState *bs)
 }
 
 
-static int cor_truncate(BlockDriverState *bs, int64_t offset,
-                        PreallocMode prealloc, Error **errp)
+static int coroutine_fn cor_co_truncate(BlockDriverState *bs, int64_t offset,
+                                        PreallocMode prealloc, Error **errp)
 {
-    return bdrv_truncate(bs->file, offset, prealloc, errp);
+    return bdrv_co_truncate(bs->file, offset, prealloc, errp);
 }
 
 
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_copy_on_read = {
     .bdrv_child_perm                    = cor_child_perm,
 
     .bdrv_getlength                     = cor_getlength,
-    .bdrv_truncate                      = cor_truncate,
+    .bdrv_co_truncate                   = cor_co_truncate,
 
     .bdrv_co_preadv                     = cor_co_preadv,
     .bdrv_co_pwritev                    = cor_co_pwritev,
diff --git a/block/crypto.c b/block/crypto.c
index XXXXXXX..XXXXXXX 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -XXX,XX +XXX,XX @@ static int block_crypto_co_create_generic(BlockDriverState *bs,
     return ret;
 }
 
-static int block_crypto_truncate(BlockDriverState *bs, int64_t offset,
-                                 PreallocMode prealloc, Error **errp)
+static int coroutine_fn
+block_crypto_co_truncate(BlockDriverState *bs, int64_t offset,
+                         PreallocMode prealloc, Error **errp)
 {
     BlockCrypto *crypto = bs->opaque;
     uint64_t payload_offset =
@@ -XXX,XX +XXX,XX @@ static int block_crypto_truncate(BlockDriverState *bs, int64_t offset,
 
     offset += payload_offset;
 
-    return bdrv_truncate(bs->file, offset, prealloc, errp);
+    return bdrv_co_truncate(bs->file, offset, prealloc, errp);
 }
 
 static void block_crypto_close(BlockDriverState *bs)
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_crypto_luks = {
     .bdrv_child_perm    = bdrv_format_default_perms,
     .bdrv_co_create     = block_crypto_co_create_luks,
     .bdrv_co_create_opts = block_crypto_co_create_opts_luks,
-    .bdrv_truncate      = block_crypto_truncate,
+    .bdrv_co_truncate   = block_crypto_co_truncate,
     .create_opts        = &block_crypto_create_opts_luks,
 
     .bdrv_reopen_prepare = block_crypto_reopen_prepare,
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 @@ out:
     return result;
 }
 
-static int raw_truncate(BlockDriverState *bs, int64_t offset,
-                        PreallocMode prealloc, Error **errp)
+static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
+                                        PreallocMode prealloc, Error **errp)
 {
     BDRVRawState *s = bs->opaque;
     struct stat st;
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_file = {
     .bdrv_io_unplug = raw_aio_unplug,
     .bdrv_attach_aio_context = raw_aio_attach_aio_context,
 
-    .bdrv_truncate = raw_truncate,
+    .bdrv_co_truncate = raw_co_truncate,
     .bdrv_getlength = raw_getlength,
     .bdrv_get_info = raw_get_info,
     .bdrv_get_allocated_file_size
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
     .bdrv_io_plug = raw_aio_plug,
     .bdrv_io_unplug = raw_aio_unplug,
 
-    .bdrv_truncate      = raw_truncate,
+    .bdrv_co_truncate       = raw_co_truncate,
     .bdrv_getlength	= raw_getlength,
     .bdrv_get_info = raw_get_info,
     .bdrv_get_allocated_file_size
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
     .bdrv_io_plug = raw_aio_plug,
     .bdrv_io_unplug = raw_aio_unplug,
 
-    .bdrv_truncate      = raw_truncate,
+    .bdrv_co_truncate    = raw_co_truncate,
     .bdrv_getlength      = raw_getlength,
     .has_variable_length = true,
     .bdrv_get_allocated_file_size
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
     .bdrv_io_plug = raw_aio_plug,
     .bdrv_io_unplug = raw_aio_unplug,
 
-    .bdrv_truncate      = raw_truncate,
+    .bdrv_co_truncate    = raw_co_truncate,
     .bdrv_getlength      = raw_getlength,
     .has_variable_length = true,
     .bdrv_get_allocated_file_size
diff --git a/block/file-win32.c b/block/file-win32.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-win32.c
+++ b/block/file-win32.c
@@ -XXX,XX +XXX,XX @@ static void raw_close(BlockDriverState *bs)
     }
 }
 
-static int raw_truncate(BlockDriverState *bs, int64_t offset,
-                        PreallocMode prealloc, Error **errp)
+static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
+                                        PreallocMode prealloc, Error **errp)
 {
     BDRVRawState *s = bs->opaque;
     LONG low, high;
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_file = {
     .bdrv_aio_pwritev   = raw_aio_pwritev,
     .bdrv_aio_flush     = raw_aio_flush,
 
-    .bdrv_truncate	= raw_truncate,
+    .bdrv_co_truncate   = raw_co_truncate,
     .bdrv_getlength	= raw_getlength,
     .bdrv_get_allocated_file_size
                         = raw_get_allocated_file_size,
diff --git a/block/gluster.c b/block/gluster.c
index XXXXXXX..XXXXXXX 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qemu_gluster_co_rw(BlockDriverState *bs,
     return acb.ret;
 }
 
-static int qemu_gluster_truncate(BlockDriverState *bs, int64_t offset,
-                                 PreallocMode prealloc, Error **errp)
+static coroutine_fn int qemu_gluster_co_truncate(BlockDriverState *bs,
+                                                 int64_t offset,
+                                                 PreallocMode prealloc,
+                                                 Error **errp)
 {
     BDRVGlusterState *s = bs->opaque;
     return qemu_gluster_do_truncate(s->fd, offset, prealloc, errp);
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_gluster = {
     .bdrv_co_create_opts          = qemu_gluster_co_create_opts,
     .bdrv_getlength               = qemu_gluster_getlength,
     .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,
-    .bdrv_truncate                = qemu_gluster_truncate,
+    .bdrv_co_truncate             = qemu_gluster_co_truncate,
     .bdrv_co_readv                = qemu_gluster_co_readv,
     .bdrv_co_writev               = qemu_gluster_co_writev,
     .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_gluster_tcp = {
     .bdrv_co_create_opts          = qemu_gluster_co_create_opts,
     .bdrv_getlength               = qemu_gluster_getlength,
     .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,
-    .bdrv_truncate                = qemu_gluster_truncate,
+    .bdrv_co_truncate             = qemu_gluster_co_truncate,
     .bdrv_co_readv                = qemu_gluster_co_readv,
     .bdrv_co_writev               = qemu_gluster_co_writev,
     .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_gluster_unix = {
     .bdrv_co_create_opts          = qemu_gluster_co_create_opts,
     .bdrv_getlength               = qemu_gluster_getlength,
     .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,
-    .bdrv_truncate                = qemu_gluster_truncate,
+    .bdrv_co_truncate             = qemu_gluster_co_truncate,
     .bdrv_co_readv                = qemu_gluster_co_readv,
     .bdrv_co_writev               = qemu_gluster_co_writev,
     .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_gluster_rdma = {
     .bdrv_co_create_opts          = qemu_gluster_co_create_opts,
     .bdrv_getlength               = qemu_gluster_getlength,
     .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,
-    .bdrv_truncate                = qemu_gluster_truncate,
+    .bdrv_co_truncate             = qemu_gluster_co_truncate,
     .bdrv_co_readv                = qemu_gluster_co_readv,
     .bdrv_co_writev               = qemu_gluster_co_writev,
     .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,
diff --git a/block/iscsi.c b/block/iscsi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -XXX,XX +XXX,XX @@ static void iscsi_reopen_commit(BDRVReopenState *reopen_state)
     }
 }
 
-static int iscsi_truncate(BlockDriverState *bs, int64_t offset,
-                          PreallocMode prealloc, Error **errp)
+static int coroutine_fn iscsi_co_truncate(BlockDriverState *bs, int64_t offset,
+                                          PreallocMode prealloc, Error **errp)
 {
     IscsiLun *iscsilun = bs->opaque;
     Error *local_err = NULL;
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_iscsi = {
 
     .bdrv_getlength  = iscsi_getlength,
     .bdrv_get_info   = iscsi_get_info,
-    .bdrv_truncate   = iscsi_truncate,
+    .bdrv_co_truncate    = iscsi_co_truncate,
     .bdrv_refresh_limits = iscsi_refresh_limits,
 
     .bdrv_co_block_status  = iscsi_co_block_status,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_iser = {
 
     .bdrv_getlength  = iscsi_getlength,
     .bdrv_get_info   = iscsi_get_info,
-    .bdrv_truncate   = iscsi_truncate,
+    .bdrv_co_truncate    = iscsi_co_truncate,
     .bdrv_refresh_limits = iscsi_refresh_limits,
 
     .bdrv_co_block_status  = iscsi_co_block_status,
diff --git a/block/nfs.c b/block/nfs.c
index XXXXXXX..XXXXXXX 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -XXX,XX +XXX,XX @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs)
     return (task.ret < 0 ? task.ret : st.st_blocks * 512);
 }
 
-static int nfs_file_truncate(BlockDriverState *bs, int64_t offset,
-                             PreallocMode prealloc, Error **errp)
+static int coroutine_fn
+nfs_file_co_truncate(BlockDriverState *bs, int64_t offset,
+                     PreallocMode prealloc, Error **errp)
 {
     NFSClient *client = bs->opaque;
     int ret;
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_nfs = {
 
     .bdrv_has_zero_init             = nfs_has_zero_init,
     .bdrv_get_allocated_file_size   = nfs_get_allocated_file_size,
-    .bdrv_truncate                  = nfs_file_truncate,
+    .bdrv_co_truncate               = nfs_file_co_truncate,
 
     .bdrv_file_open                 = nfs_file_open,
     .bdrv_close                     = nfs_file_close,
diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn preallocate_co(void *opaque)
     BlockDriverState *bs = params->bs;
     uint64_t offset = params->offset;
     uint64_t new_length = params->new_length;
-    BDRVQcow2State *s = bs->opaque;
     uint64_t bytes;
     uint64_t host_offset = 0;
     unsigned int cur_bytes;
     int ret;
     QCowL2Meta *meta;
 
-    qemu_co_mutex_lock(&s->lock);
-
     assert(offset <= new_length);
     bytes = new_length - offset;
 
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn preallocate_co(void *opaque)
     ret = 0;
 
 done:
-    qemu_co_mutex_unlock(&s->lock);
     params->ret = ret;
 }
 
@@ -XXX,XX +XXX,XX @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
 
     /* And if we're supposed to preallocate metadata, do that now */
     if (qcow2_opts->preallocation != PREALLOC_MODE_OFF) {
+        BDRVQcow2State *s = blk_bs(blk)->opaque;
+        qemu_co_mutex_lock(&s->lock);
         ret = preallocate(blk_bs(blk), 0, qcow2_opts->size);
+        qemu_co_mutex_unlock(&s->lock);
+
         if (ret < 0) {
             error_setg_errno(errp, -ret, "Could not preallocate metadata");
             goto out;
@@ -XXX,XX +XXX,XX @@ fail:
     return ret;
 }
 
-static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
-                          PreallocMode prealloc, Error **errp)
+static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
+                                          PreallocMode prealloc, Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
     uint64_t old_length;
@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
         return -EINVAL;
     }
 
+    qemu_co_mutex_lock(&s->lock);
+
     /* cannot proceed if image has snapshots */
     if (s->nb_snapshots) {
         error_setg(errp, "Can't resize an image which has snapshots");
-        return -ENOTSUP;
+        ret = -ENOTSUP;
+        goto fail;
     }
 
     /* cannot proceed if image has bitmaps */
     if (s->nb_bitmaps) {
         /* TODO: resize bitmaps in the image */
         error_setg(errp, "Can't resize an image which has bitmaps");
-        return -ENOTSUP;
+        ret = -ENOTSUP;
+        goto fail;
     }
 
     old_length = bs->total_sectors * 512;
@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
         if (prealloc != PREALLOC_MODE_OFF) {
             error_setg(errp,
                        "Preallocation can't be used for shrinking an image");
-            return -EINVAL;
+            ret = -EINVAL;
+            goto fail;
         }
 
         ret = qcow2_cluster_discard(bs, ROUND_UP(offset, s->cluster_size),
@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
                                     QCOW2_DISCARD_ALWAYS, true);
         if (ret < 0) {
             error_setg_errno(errp, -ret, "Failed to discard cropped clusters");
-            return ret;
+            goto fail;
         }
 
         ret = qcow2_shrink_l1_table(bs, new_l1_size);
         if (ret < 0) {
             error_setg_errno(errp, -ret,
                              "Failed to reduce the number of L2 tables");
-            return ret;
+            goto fail;
         }
 
         ret = qcow2_shrink_reftable(bs);
         if (ret < 0) {
             error_setg_errno(errp, -ret,
                              "Failed to discard unused refblocks");
-            return ret;
+            goto fail;
         }
 
         old_file_size = bdrv_getlength(bs->file->bs);
         if (old_file_size < 0) {
             error_setg_errno(errp, -old_file_size,
                              "Failed to inquire current file length");
-            return old_file_size;
+            ret = old_file_size;
+            goto fail;
         }
         last_cluster = qcow2_get_last_cluster(bs, old_file_size);
         if (last_cluster < 0) {
             error_setg_errno(errp, -last_cluster,
                              "Failed to find the last cluster");
-            return last_cluster;
+            ret = last_cluster;
+            goto fail;
         }
         if ((last_cluster + 1) * s->cluster_size < old_file_size) {
             Error *local_err = NULL;
 
-            bdrv_truncate(bs->file, (last_cluster + 1) * s->cluster_size,
-                          PREALLOC_MODE_OFF, &local_err);
+            bdrv_co_truncate(bs->file, (last_cluster + 1) * s->cluster_size,
+                             PREALLOC_MODE_OFF, &local_err);
             if (local_err) {
                 warn_reportf_err(local_err,
                                  "Failed to truncate the tail of the image: ");
@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
         ret = qcow2_grow_l1_table(bs, new_l1_size, true);
         if (ret < 0) {
             error_setg_errno(errp, -ret, "Failed to grow the L1 table");
-            return ret;
+            goto fail;
         }
     }
 
@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
         ret = preallocate(bs, old_length, offset);
         if (ret < 0) {
             error_setg_errno(errp, -ret, "Preallocation failed");
-            return ret;
+            goto fail;
         }
         break;
 
@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
         if (old_file_size < 0) {
             error_setg_errno(errp, -old_file_size,
                              "Failed to inquire current file length");
-            return old_file_size;
+            ret = old_file_size;
+            goto fail;
         }
         old_file_size = ROUND_UP(old_file_size, s->cluster_size);
 
@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
         if (allocation_start < 0) {
             error_setg_errno(errp, -allocation_start,
                              "Failed to resize refcount structures");
-            return allocation_start;
+            ret = allocation_start;
+            goto fail;
         }
 
         clusters_allocated = qcow2_alloc_clusters_at(bs, allocation_start,
@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
         if (clusters_allocated < 0) {
             error_setg_errno(errp, -clusters_allocated,
                              "Failed to allocate data clusters");
-            return clusters_allocated;
+            ret = clusters_allocated;
+            goto fail;
         }
 
         assert(clusters_allocated == nb_new_data_clusters);
@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
         /* Allocate the data area */
         new_file_size = allocation_start +
                         nb_new_data_clusters * s->cluster_size;
-        ret = bdrv_truncate(bs->file, new_file_size, prealloc, errp);
+        ret = bdrv_co_truncate(bs->file, new_file_size, prealloc, errp);
         if (ret < 0) {
             error_prepend(errp, "Failed to resize underlying file: ");
             qcow2_free_clusters(bs, allocation_start,
                                 nb_new_data_clusters * s->cluster_size,
                                 QCOW2_DISCARD_OTHER);
-            return ret;
+            goto fail;
         }
 
         /* Create the necessary L2 entries */
@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
                 qcow2_free_clusters(bs, host_offset,
                                     nb_new_data_clusters * s->cluster_size,
                                     QCOW2_DISCARD_OTHER);
-                return ret;
+                goto fail;
             }
 
             guest_offset += nb_clusters * s->cluster_size;
@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
 
     if (prealloc != PREALLOC_MODE_OFF) {
         /* Flush metadata before actually changing the image size */
-        ret = bdrv_flush(bs);
+        ret = qcow2_write_caches(bs);
         if (ret < 0) {
             error_setg_errno(errp, -ret,
                              "Failed to flush the preallocated area to disk");
-            return ret;
+            goto fail;
         }
     }
 
@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
                            &offset, sizeof(uint64_t));
     if (ret < 0) {
         error_setg_errno(errp, -ret, "Failed to update the image size");
-        return ret;
+        goto fail;
     }
 
     s->l1_vm_state_index = new_l1_size;
-    return 0;
+    ret = 0;
+fail:
+    qemu_co_mutex_unlock(&s->lock);
+    return ret;
 }
 
 /* XXX: put compressed sectors first, then all the cluster aligned
@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
         if (cluster_offset < 0) {
             return cluster_offset;
         }
-        return bdrv_truncate(bs->file, cluster_offset, PREALLOC_MODE_OFF, NULL);
+        return bdrv_co_truncate(bs->file, cluster_offset, PREALLOC_MODE_OFF,
+                                NULL);
     }
 
     if (offset_into_cluster(s, offset)) {
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_qcow2 = {
     .bdrv_co_pdiscard       = qcow2_co_pdiscard,
     .bdrv_co_copy_range_from = qcow2_co_copy_range_from,
     .bdrv_co_copy_range_to  = qcow2_co_copy_range_to,
-    .bdrv_truncate          = qcow2_truncate,
+    .bdrv_co_truncate       = qcow2_co_truncate,
     .bdrv_co_pwritev_compressed = qcow2_co_pwritev_compressed,
     .bdrv_make_empty        = qcow2_make_empty,
 
diff --git a/block/qed.c b/block/qed.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_qed_co_pwrite_zeroes(BlockDriverState *bs,
                           QED_AIOCB_WRITE | QED_AIOCB_ZERO);
 }
 
-static int bdrv_qed_truncate(BlockDriverState *bs, int64_t offset,
-                             PreallocMode prealloc, Error **errp)
+static int coroutine_fn bdrv_qed_co_truncate(BlockDriverState *bs,
+                                             int64_t offset,
+                                             PreallocMode prealloc,
+                                             Error **errp)
 {
     BDRVQEDState *s = bs->opaque;
     uint64_t old_image_size;
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_qed = {
     .bdrv_co_readv            = bdrv_qed_co_readv,
     .bdrv_co_writev           = bdrv_qed_co_writev,
     .bdrv_co_pwrite_zeroes    = bdrv_qed_co_pwrite_zeroes,
-    .bdrv_truncate            = bdrv_qed_truncate,
+    .bdrv_co_truncate         = bdrv_qed_co_truncate,
     .bdrv_getlength           = bdrv_qed_getlength,
     .bdrv_get_info            = bdrv_qed_get_info,
     .bdrv_refresh_limits      = bdrv_qed_refresh_limits,
diff --git a/block/raw-format.c b/block/raw-format.c
index XXXXXXX..XXXXXXX 100644
--- a/block/raw-format.c
+++ b/block/raw-format.c
@@ -XXX,XX +XXX,XX @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp)
     }
 }
 
-static int raw_truncate(BlockDriverState *bs, int64_t offset,
-                        PreallocMode prealloc, Error **errp)
+static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
+                                        PreallocMode prealloc, Error **errp)
 {
     BDRVRawState *s = bs->opaque;
 
@@ -XXX,XX +XXX,XX @@ static int raw_truncate(BlockDriverState *bs, int64_t offset,
 
     s->size = offset;
     offset += s->offset;
-    return bdrv_truncate(bs->file, offset, prealloc, errp);
+    return bdrv_co_truncate(bs->file, offset, prealloc, errp);
 }
 
 static void raw_eject(BlockDriverState *bs, bool eject_flag)
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_raw = {
     .bdrv_co_block_status = &raw_co_block_status,
     .bdrv_co_copy_range_from = &raw_co_copy_range_from,
     .bdrv_co_copy_range_to  = &raw_co_copy_range_to,
-    .bdrv_truncate        = &raw_truncate,
+    .bdrv_co_truncate     = &raw_co_truncate,
     .bdrv_getlength       = &raw_getlength,
     .has_variable_length  = true,
     .bdrv_measure         = &raw_measure,
diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ static int64_t qemu_rbd_getlength(BlockDriverState *bs)
     return info.size;
 }
 
-static int qemu_rbd_truncate(BlockDriverState *bs, int64_t offset,
-                             PreallocMode prealloc, Error **errp)
+static int coroutine_fn qemu_rbd_co_truncate(BlockDriverState *bs,
+                                             int64_t offset,
+                                             PreallocMode prealloc,
+                                             Error **errp)
 {
     BDRVRBDState *s = bs->opaque;
     int r;
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_rbd = {
     .bdrv_get_info          = qemu_rbd_getinfo,
     .create_opts            = &qemu_rbd_create_opts,
     .bdrv_getlength         = qemu_rbd_getlength,
-    .bdrv_truncate          = qemu_rbd_truncate,
+    .bdrv_co_truncate       = qemu_rbd_co_truncate,
     .protocol_name          = "rbd",
 
     .bdrv_aio_preadv        = qemu_rbd_aio_preadv,
diff --git a/block/sheepdog.c b/block/sheepdog.c
index XXXXXXX..XXXXXXX 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -XXX,XX +XXX,XX @@ static int64_t sd_getlength(BlockDriverState *bs)
     return s->inode.vdi_size;
 }
 
-static int sd_truncate(BlockDriverState *bs, int64_t offset,
-                       PreallocMode prealloc, Error **errp)
+static int coroutine_fn sd_co_truncate(BlockDriverState *bs, int64_t offset,
+                                       PreallocMode prealloc, Error **errp)
 {
     BDRVSheepdogState *s = bs->opaque;
     int ret, fd;
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int sd_co_writev(BlockDriverState *bs, int64_t sector_num,
 
     assert(!flags);
     if (offset > s->inode.vdi_size) {
-        ret = sd_truncate(bs, offset, PREALLOC_MODE_OFF, NULL);
+        ret = sd_co_truncate(bs, offset, PREALLOC_MODE_OFF, NULL);
         if (ret < 0) {
             return ret;
         }
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_sheepdog = {
     .bdrv_has_zero_init           = bdrv_has_zero_init_1,
     .bdrv_getlength               = sd_getlength,
     .bdrv_get_allocated_file_size = sd_get_allocated_file_size,
-    .bdrv_truncate                = sd_truncate,
+    .bdrv_co_truncate             = sd_co_truncate,
 
     .bdrv_co_readv                = sd_co_readv,
     .bdrv_co_writev               = sd_co_writev,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_sheepdog_tcp = {
     .bdrv_has_zero_init           = bdrv_has_zero_init_1,
     .bdrv_getlength               = sd_getlength,
     .bdrv_get_allocated_file_size = sd_get_allocated_file_size,
-    .bdrv_truncate                = sd_truncate,
+    .bdrv_co_truncate             = sd_co_truncate,
 
     .bdrv_co_readv                = sd_co_readv,
     .bdrv_co_writev               = sd_co_writev,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_sheepdog_unix = {
     .bdrv_has_zero_init           = bdrv_has_zero_init_1,
     .bdrv_getlength               = sd_getlength,
     .bdrv_get_allocated_file_size = sd_get_allocated_file_size,
-    .bdrv_truncate                = sd_truncate,
+    .bdrv_co_truncate             = sd_co_truncate,
 
     .bdrv_co_readv                = sd_co_readv,
     .bdrv_co_writev               = sd_co_writev,
diff --git a/block/ssh.c b/block/ssh.c
index XXXXXXX..XXXXXXX 100644
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -XXX,XX +XXX,XX @@ static int64_t ssh_getlength(BlockDriverState *bs)
     return length;
 }
 
-static int ssh_truncate(BlockDriverState *bs, int64_t offset,
-                        PreallocMode prealloc, Error **errp)
+static int coroutine_fn ssh_co_truncate(BlockDriverState *bs, int64_t offset,
+                                        PreallocMode prealloc, Error **errp)
 {
     BDRVSSHState *s = bs->opaque;
 
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_ssh = {
     .bdrv_co_readv                = ssh_co_readv,
     .bdrv_co_writev               = ssh_co_writev,
     .bdrv_getlength               = ssh_getlength,
-    .bdrv_truncate                = ssh_truncate,
+    .bdrv_co_truncate             = ssh_co_truncate,
     .bdrv_co_flush_to_disk        = ssh_co_flush,
     .create_opts                  = &ssh_create_opts,
 };
-- 
2.13.6

All callers are coroutine_fns now, so we can just directly call
preallocate_co().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/qcow2.c | 51 ++++++++-------------------------------------------
 1 file changed, 8 insertions(+), 43 deletions(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static int qcow2_set_up_encryption(BlockDriverState *bs,
     return ret;
 }
 
-
-typedef struct PreallocCo {
-    BlockDriverState *bs;
-    uint64_t offset;
-    uint64_t new_length;
-
-    int ret;
-} PreallocCo;
-
 /**
  * Preallocates metadata structures for data clusters between @offset (in the
  * guest disk) and @new_length (which is thus generally the new guest disk
@@ -XXX,XX +XXX,XX @@ typedef struct PreallocCo {
  *
  * Returns: 0 on success, -errno on failure.
  */
-static void coroutine_fn preallocate_co(void *opaque)
+static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
+                                       uint64_t new_length)
 {
-    PreallocCo *params = opaque;
-    BlockDriverState *bs = params->bs;
-    uint64_t offset = params->offset;
-    uint64_t new_length = params->new_length;
     uint64_t bytes;
     uint64_t host_offset = 0;
     unsigned int cur_bytes;
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn preallocate_co(void *opaque)
         ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,
                                          &host_offset, &meta);
         if (ret < 0) {
-            goto done;
+            return ret;
         }
 
         while (meta) {
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn preallocate_co(void *opaque)
             if (ret < 0) {
                 qcow2_free_any_clusters(bs, meta->alloc_offset,
                                         meta->nb_clusters, QCOW2_DISCARD_NEVER);
-                goto done;
+                return ret;
             }
 
             /* There are no dependent requests, but we need to remove our
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn preallocate_co(void *opaque)
         ret = bdrv_pwrite(bs->file, (host_offset + cur_bytes) - 1,
                           &data, 1);
         if (ret < 0) {
-            goto done;
+            return ret;
         }
     }
 
-    ret = 0;
-
-done:
-    params->ret = ret;
-}
-
-static int preallocate(BlockDriverState *bs,
-                       uint64_t offset, uint64_t new_length)
-{
-    PreallocCo params = {
-        .bs         = bs,
-        .offset     = offset,
-        .new_length = new_length,
-        .ret        = -EINPROGRESS,
-    };
-
-    if (qemu_in_coroutine()) {
-        preallocate_co(&params);
-    } else {
-        Coroutine *co = qemu_coroutine_create(preallocate_co, &params);
-        bdrv_coroutine_enter(bs, co);
-        BDRV_POLL_WHILE(bs, params.ret == -EINPROGRESS);
-    }
-    return params.ret;
+    return 0;
 }
 
 /* qcow2_refcount_metadata_size:
@@ -XXX,XX +XXX,XX @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
     if (qcow2_opts->preallocation != PREALLOC_MODE_OFF) {
         BDRVQcow2State *s = blk_bs(blk)->opaque;
         qemu_co_mutex_lock(&s->lock);
-        ret = preallocate(blk_bs(blk), 0, qcow2_opts->size);
+        ret = preallocate_co(blk_bs(blk), 0, qcow2_opts->size);
         qemu_co_mutex_unlock(&s->lock);
 
         if (ret < 0) {
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
         break;
 
     case PREALLOC_MODE_METADATA:
-        ret = preallocate(bs, old_length, offset);
+        ret = preallocate_co(bs, old_length, offset);
         if (ret < 0) {
             error_setg_errno(errp, -ret, "Preallocation failed");
             goto fail;
-- 
2.13.6

This moves the bdrv_truncate() implementation from block.c to block/io.c
so it can have access to the tracked requests infrastructure.

This involves making refresh_total_sectors() public (in block_int.h).

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/block/block_int.h |   2 +
 block.c                   | 111 +---------------------------------------------
 block/io.c                | 109 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 112 insertions(+), 110 deletions(-)

diff --git a/include/block/block_int.h b/include/block/block_int.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_copy_range_to(BdrvChild *src, uint64_t src_offset,
                                        BdrvChild *dst, uint64_t dst_offset,
                                        uint64_t bytes, BdrvRequestFlags flags);
 
+int refresh_total_sectors(BlockDriverState *bs, int64_t hint);
+
 #endif /* BLOCK_INT_H */
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ static int find_image_format(BlockBackend *file, const char *filename,
  * Set the current 'total_sectors' value
  * Return 0 on success, -errno on error.
  */
-static int refresh_total_sectors(BlockDriverState *bs, int64_t hint)
+int refresh_total_sectors(BlockDriverState *bs, int64_t hint)
 {
     BlockDriver *drv = bs->drv;
 
@@ -XXX,XX +XXX,XX @@ static void bdrv_parent_cb_change_media(BlockDriverState *bs, bool load)
     }
 }
 
-static void bdrv_parent_cb_resize(BlockDriverState *bs)
-{
-    BdrvChild *c;
-    QLIST_FOREACH(c, &bs->parents, next_parent) {
-        if (c->role->resize) {
-            c->role->resize(c);
-        }
-    }
-}
-
 /*
  * Sets the backing file link of a BDS. A new reference is created; callers
  * which don't need their own reference any more must call bdrv_unref().
@@ -XXX,XX +XXX,XX @@ exit:
 }
 
 /**
- * Truncate file to 'offset' bytes (needed only for file protocols)
- */
-int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
-                                  PreallocMode prealloc, Error **errp)
-{
-    BlockDriverState *bs = child->bs;
-    BlockDriver *drv = bs->drv;
-    int ret;
-
-    assert(child->perm & BLK_PERM_RESIZE);
-
-    /* if bs->drv == NULL, bs is closed, so there's nothing to do here */
-    if (!drv) {
-        error_setg(errp, "No medium inserted");
-        return -ENOMEDIUM;
-    }
-    if (offset < 0) {
-        error_setg(errp, "Image size cannot be negative");
-        return -EINVAL;
-    }
-
-    bdrv_inc_in_flight(bs);
-
-    if (!drv->bdrv_co_truncate) {
-        if (bs->file && drv->is_filter) {
-            ret = bdrv_co_truncate(bs->file, offset, prealloc, errp);
-            goto out;
-        }
-        error_setg(errp, "Image format driver does not support resize");
-        ret = -ENOTSUP;
-        goto out;
-    }
-    if (bs->read_only) {
-        error_setg(errp, "Image is read-only");
-        ret = -EACCES;
-        goto out;
-    }
-
-    assert(!(bs->open_flags & BDRV_O_INACTIVE));
-
-    ret = drv->bdrv_co_truncate(bs, offset, prealloc, errp);
-    if (ret < 0) {
-        goto out;
-    }
-    ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);
-    if (ret < 0) {
-        error_setg_errno(errp, -ret, "Could not refresh total sector count");
-    } else {
-        offset = bs->total_sectors * BDRV_SECTOR_SIZE;
-    }
-    bdrv_dirty_bitmap_truncate(bs, offset);
-    bdrv_parent_cb_resize(bs);
-    atomic_inc(&bs->write_gen);
-
-out:
-    bdrv_dec_in_flight(bs);
-    return ret;
-}
-
-typedef struct TruncateCo {
-    BdrvChild *child;
-    int64_t offset;
-    PreallocMode prealloc;
-    Error **errp;
-    int ret;
-} TruncateCo;
-
-static void coroutine_fn bdrv_truncate_co_entry(void *opaque)
-{
-    TruncateCo *tco = opaque;
-    tco->ret = bdrv_co_truncate(tco->child, tco->offset, tco->prealloc,
-                                tco->errp);
-}
-
-int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
-                  Error **errp)
-{
-    Coroutine *co;
-    TruncateCo tco = {
-        .child      = child,
-        .offset     = offset,
-        .prealloc   = prealloc,
-        .errp       = errp,
-        .ret        = NOT_DONE,
-    };
-
-    if (qemu_in_coroutine()) {
-        /* Fast-path if already in coroutine context */
-        bdrv_truncate_co_entry(&tco);
-    } else {
-        co = qemu_coroutine_create(bdrv_truncate_co_entry, &tco);
-        qemu_coroutine_enter(co);
-        BDRV_POLL_WHILE(child->bs, tco.ret == NOT_DONE);
-    }
-
-    return tco.ret;
-}
-
-/**
  * Length of a allocated file in bytes. Sparse files are counted by actual
  * allocated space. Return < 0 if error or unknown.
  */
diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_copy_range(BdrvChild *src, uint64_t src_offset,
     bdrv_dec_in_flight(dst_bs);
     return ret;
 }
+
+static void bdrv_parent_cb_resize(BlockDriverState *bs)
+{
+    BdrvChild *c;
+    QLIST_FOREACH(c, &bs->parents, next_parent) {
+        if (c->role->resize) {
+            c->role->resize(c);
+        }
+    }
+}
+
+/**
+ * Truncate file to 'offset' bytes (needed only for file protocols)
+ */
+int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
+                                  PreallocMode prealloc, Error **errp)
+{
+    BlockDriverState *bs = child->bs;
+    BlockDriver *drv = bs->drv;
+    int ret;
+
+    assert(child->perm & BLK_PERM_RESIZE);
+
+    /* if bs->drv == NULL, bs is closed, so there's nothing to do here */
+    if (!drv) {
+        error_setg(errp, "No medium inserted");
+        return -ENOMEDIUM;
+    }
+    if (offset < 0) {
+        error_setg(errp, "Image size cannot be negative");
+        return -EINVAL;
+    }
+
+    bdrv_inc_in_flight(bs);
+
+    if (!drv->bdrv_co_truncate) {
+        if (bs->file && drv->is_filter) {
+            ret = bdrv_co_truncate(bs->file, offset, prealloc, errp);
+            goto out;
+        }
+        error_setg(errp, "Image format driver does not support resize");
+        ret = -ENOTSUP;
+        goto out;
+    }
+    if (bs->read_only) {
+        error_setg(errp, "Image is read-only");
+        ret = -EACCES;
+        goto out;
+    }
+
+    assert(!(bs->open_flags & BDRV_O_INACTIVE));
+
+    ret = drv->bdrv_co_truncate(bs, offset, prealloc, errp);
+    if (ret < 0) {
+        goto out;
+    }
+    ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);
+    if (ret < 0) {
+        error_setg_errno(errp, -ret, "Could not refresh total sector count");
+    } else {
+        offset = bs->total_sectors * BDRV_SECTOR_SIZE;
+    }
+    bdrv_dirty_bitmap_truncate(bs, offset);
+    bdrv_parent_cb_resize(bs);
+    atomic_inc(&bs->write_gen);
+
+out:
+    bdrv_dec_in_flight(bs);
+    return ret;
+}
+
+typedef struct TruncateCo {
+    BdrvChild *child;
+    int64_t offset;
+    PreallocMode prealloc;
+    Error **errp;
+    int ret;
+} TruncateCo;
+
+static void coroutine_fn bdrv_truncate_co_entry(void *opaque)
+{
+    TruncateCo *tco = opaque;
+    tco->ret = bdrv_co_truncate(tco->child, tco->offset, tco->prealloc,
+                                tco->errp);
+}
+
+int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,
+                  Error **errp)
+{
+    Coroutine *co;
+    TruncateCo tco = {
+        .child      = child,
+        .offset     = offset,
+        .prealloc   = prealloc,
+        .errp       = errp,
+        .ret        = NOT_DONE,
+    };
+
+    if (qemu_in_coroutine()) {
+        /* Fast-path if already in coroutine context */
+        bdrv_truncate_co_entry(&tco);
+    } else {
+        co = qemu_coroutine_create(bdrv_truncate_co_entry, &tco);
+        qemu_coroutine_enter(co);
+        BDRV_POLL_WHILE(child->bs, tco.ret == NOT_DONE);
+    }
+
+    return tco.ret;
+}
-- 
2.13.6

When growing an image, block drivers (especially protocol drivers) may
initialise the newly added area. I/O requests to the same area need to
wait for this initialisation to be completed so that data writes don't
get overwritten and reads don't read uninitialised data.

To avoid overhead in the fast I/O path by adding new locking in the
protocol drivers and to restrict the impact to requests that actually
touch the new area, reuse the existing tracked request infrastructure in
block/io.c and mark all discard requests as serialising.

With this change, it is safe for protocol drivers to make
.bdrv_co_truncate actually asynchronous.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/block/block_int.h |  1 +
 block/io.c                | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/include/block/block_int.h b/include/block/block_int.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -XXX,XX +XXX,XX @@ enum BdrvTrackedRequestType {
     BDRV_TRACKED_READ,
     BDRV_TRACKED_WRITE,
     BDRV_TRACKED_DISCARD,
+    BDRV_TRACKED_TRUNCATE,
 };
 
 typedef struct BdrvTrackedRequest {
diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
 {
     BlockDriverState *bs = child->bs;
     BlockDriver *drv = bs->drv;
+    BdrvTrackedRequest req;
+    int64_t old_size, new_bytes;
     int ret;
 
     assert(child->perm & BLK_PERM_RESIZE);
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
         return -EINVAL;
     }
 
+    old_size = bdrv_getlength(bs);
+    if (old_size < 0) {
+        error_setg_errno(errp, -old_size, "Failed to get old image size");
+        return old_size;
+    }
+
+    if (offset > old_size) {
+        new_bytes = offset - old_size;
+    } else {
+        new_bytes = 0;
+    }
+
     bdrv_inc_in_flight(bs);
+    tracked_request_begin(&req, bs, offset, new_bytes, BDRV_TRACKED_TRUNCATE);
+
+    /* If we are growing the image and potentially using preallocation for the
+     * new area, we need to make sure that no write requests are made to it
+     * concurrently or they might be overwritten by preallocation. */
+    if (new_bytes) {
+        mark_request_serialising(&req, 1);
+        wait_serialising_requests(&req);
+    }
 
     if (!drv->bdrv_co_truncate) {
         if (bs->file && drv->is_filter) {
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
     atomic_inc(&bs->write_gen);
 
 out:
+    tracked_request_end(&req);
     bdrv_dec_in_flight(bs);
+
     return ret;
 }
 
-- 
2.13.6

This moves the code to resize an image file to the thread pool to avoid
blocking.

Creating large images with preallocation with blockdev-create is now
actually a background job instead of blocking the monitor (and most
other things) until the preallocation has completed.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/block/raw-aio.h |   4 +-
 block/file-posix.c      | 266 +++++++++++++++++++++++++++---------------------
 2 files changed, 154 insertions(+), 116 deletions(-)

diff --git a/include/block/raw-aio.h b/include/block/raw-aio.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/raw-aio.h
+++ b/include/block/raw-aio.h
@@ -XXX,XX +XXX,XX @@
 #define QEMU_AIO_DISCARD      0x0010
 #define QEMU_AIO_WRITE_ZEROES 0x0020
 #define QEMU_AIO_COPY_RANGE   0x0040
+#define QEMU_AIO_TRUNCATE     0x0080
 #define QEMU_AIO_TYPE_MASK \
         (QEMU_AIO_READ | \
          QEMU_AIO_WRITE | \
@@ -XXX,XX +XXX,XX @@
          QEMU_AIO_FLUSH | \
          QEMU_AIO_DISCARD | \
          QEMU_AIO_WRITE_ZEROES | \
-         QEMU_AIO_COPY_RANGE)
+         QEMU_AIO_COPY_RANGE | \
+         QEMU_AIO_TRUNCATE)
 
 /* AIO flags */
 #define QEMU_AIO_MISALIGNED   0x1000
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 RawPosixAIOData {
 #define aio_ioctl_cmd   aio_nbytes /* for QEMU_AIO_IOCTL */
     off_t aio_offset;
     int aio_type;
-    int aio_fd2;
-    off_t aio_offset2;
+    union {
+        struct {
+            int aio_fd2;
+            off_t aio_offset2;
+        };
+        struct {
+            PreallocMode prealloc;
+            Error **errp;
+        };
+    };
 } RawPosixAIOData;
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -XXX,XX +XXX,XX @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *aiocb)
     return ret;
 }
 
+static int handle_aiocb_truncate(RawPosixAIOData *aiocb)
+{
+    int result = 0;
+    int64_t current_length = 0;
+    char *buf = NULL;
+    struct stat st;
+    int fd = aiocb->aio_fildes;
+    int64_t offset = aiocb->aio_offset;
+    Error **errp = aiocb->errp;
+
+    if (fstat(fd, &st) < 0) {
+        result = -errno;
+        error_setg_errno(errp, -result, "Could not stat file");
+        return result;
+    }
+
+    current_length = st.st_size;
+    if (current_length > offset && aiocb->prealloc != PREALLOC_MODE_OFF) {
+        error_setg(errp, "Cannot use preallocation for shrinking files");
+        return -ENOTSUP;
+    }
+
+    switch (aiocb->prealloc) {
+#ifdef CONFIG_POSIX_FALLOCATE
+    case PREALLOC_MODE_FALLOC:
+        /*
+         * Truncating before posix_fallocate() makes it about twice slower on
+         * file systems that do not support fallocate(), trying to check if a
+         * block is allocated before allocating it, so don't do that here.
+         */
+        if (offset != current_length) {
+            result = -posix_fallocate(fd, current_length,
+                                      offset - current_length);
+            if (result != 0) {
+                /* posix_fallocate() doesn't set errno. */
+                error_setg_errno(errp, -result,
+                                 "Could not preallocate new data");
+            }
+        } else {
+            result = 0;
+        }
+        goto out;
+#endif
+    case PREALLOC_MODE_FULL:
+    {
+        int64_t num = 0, left = offset - current_length;
+        off_t seek_result;
+
+        /*
+         * Knowing the final size from the beginning could allow the file
+         * system driver to do less allocations and possibly avoid
+         * fragmentation of the file.
+         */
+        if (ftruncate(fd, offset) != 0) {
+            result = -errno;
+            error_setg_errno(errp, -result, "Could not resize file");
+            goto out;
+        }
+
+        buf = g_malloc0(65536);
+
+        seek_result = lseek(fd, current_length, SEEK_SET);
+        if (seek_result < 0) {
+            result = -errno;
+            error_setg_errno(errp, -result,
+                             "Failed to seek to the old end of file");
+            goto out;
+        }
+
+        while (left > 0) {
+            num = MIN(left, 65536);
+            result = write(fd, buf, num);
+            if (result < 0) {
+                result = -errno;
+                error_setg_errno(errp, -result,
+                                 "Could not write zeros for preallocation");
+                goto out;
+            }
+            left -= result;
+        }
+        if (result >= 0) {
+            result = fsync(fd);
+            if (result < 0) {
+                result = -errno;
+                error_setg_errno(errp, -result,
+                                 "Could not flush file to disk");
+                goto out;
+            }
+        }
+        goto out;
+    }
+    case PREALLOC_MODE_OFF:
+        if (ftruncate(fd, offset) != 0) {
+            result = -errno;
+            error_setg_errno(errp, -result, "Could not resize file");
+        }
+        return result;
+    default:
+        result = -ENOTSUP;
+        error_setg(errp, "Unsupported preallocation mode: %s",
+                   PreallocMode_str(aiocb->prealloc));
+        return result;
+    }
+
+out:
+    if (result < 0) {
+        if (ftruncate(fd, current_length) < 0) {
+            error_report("Failed to restore old file length: %s",
+                         strerror(errno));
+        }
+    }
+
+    g_free(buf);
+    return result;
+}
+
 static int aio_worker(void *arg)
 {
     RawPosixAIOData *aiocb = arg;
@@ -XXX,XX +XXX,XX @@ static int aio_worker(void *arg)
     case QEMU_AIO_COPY_RANGE:
         ret = handle_aiocb_copy_range(aiocb);
         break;
+    case QEMU_AIO_TRUNCATE:
+        ret = handle_aiocb_truncate(aiocb);
+        break;
     default:
         fprintf(stderr, "invalid aio request (0x%x)\n", aiocb->aio_type);
         ret = -EINVAL;
@@ -XXX,XX +XXX,XX @@ static void raw_close(BlockDriverState *bs)
  *
  * Returns: 0 on success, -errno on failure.
  */
-static int raw_regular_truncate(int fd, int64_t offset, PreallocMode prealloc,
-                                Error **errp)
+static int coroutine_fn
+raw_regular_truncate(BlockDriverState *bs, int fd, int64_t offset,
+                     PreallocMode prealloc, Error **errp)
 {
-    int result = 0;
-    int64_t current_length = 0;
-    char *buf = NULL;
-    struct stat st;
-
-    if (fstat(fd, &st) < 0) {
-        result = -errno;
-        error_setg_errno(errp, -result, "Could not stat file");
-        return result;
-    }
-
-    current_length = st.st_size;
-    if (current_length > offset && prealloc != PREALLOC_MODE_OFF) {
-        error_setg(errp, "Cannot use preallocation for shrinking files");
-        return -ENOTSUP;
-    }
-
-    switch (prealloc) {
-#ifdef CONFIG_POSIX_FALLOCATE
-    case PREALLOC_MODE_FALLOC:
-        /*
-         * Truncating before posix_fallocate() makes it about twice slower on
-         * file systems that do not support fallocate(), trying to check if a
-         * block is allocated before allocating it, so don't do that here.
-         */
-        if (offset != current_length) {
-            result = -posix_fallocate(fd, current_length, offset - current_length);
-            if (result != 0) {
-                /* posix_fallocate() doesn't set errno. */
-                error_setg_errno(errp, -result,
-                                 "Could not preallocate new data");
-            }
-        } else {
-            result = 0;
-        }
-        goto out;
-#endif
-    case PREALLOC_MODE_FULL:
-    {
-        int64_t num = 0, left = offset - current_length;
-        off_t seek_result;
-
-        /*
-         * Knowing the final size from the beginning could allow the file
-         * system driver to do less allocations and possibly avoid
-         * fragmentation of the file.
-         */
-        if (ftruncate(fd, offset) != 0) {
-            result = -errno;
-            error_setg_errno(errp, -result, "Could not resize file");
-            goto out;
-        }
-
-        buf = g_malloc0(65536);
-
-        seek_result = lseek(fd, current_length, SEEK_SET);
-        if (seek_result < 0) {
-            result = -errno;
-            error_setg_errno(errp, -result,
-                             "Failed to seek to the old end of file");
-            goto out;
-        }
-
-        while (left > 0) {
-            num = MIN(left, 65536);
-            result = write(fd, buf, num);
-            if (result < 0) {
-                result = -errno;
-                error_setg_errno(errp, -result,
-                                 "Could not write zeros for preallocation");
-                goto out;
-            }
-            left -= result;
-        }
-        if (result >= 0) {
-            result = fsync(fd);
-            if (result < 0) {
-                result = -errno;
-                error_setg_errno(errp, -result,
-                                 "Could not flush file to disk");
-                goto out;
-            }
-        }
-        goto out;
-    }
-    case PREALLOC_MODE_OFF:
-        if (ftruncate(fd, offset) != 0) {
-            result = -errno;
-            error_setg_errno(errp, -result, "Could not resize file");
-        }
-        return result;
-    default:
-        result = -ENOTSUP;
-        error_setg(errp, "Unsupported preallocation mode: %s",
-                   PreallocMode_str(prealloc));
-        return result;
-    }
+    RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);
+    ThreadPool *pool;
 
-out:
-    if (result < 0) {
-        if (ftruncate(fd, current_length) < 0) {
-            error_report("Failed to restore old file length: %s",
-                         strerror(errno));
-        }
-    }
+    *acb = (RawPosixAIOData) {
+        .bs             = bs,
+        .aio_fildes     = fd,
+        .aio_type       = QEMU_AIO_TRUNCATE,
+        .aio_offset     = offset,
+        .prealloc       = prealloc,
+        .errp           = errp,
+    };
 
-    g_free(buf);
-    return result;
+    /* @bs can be NULL, bdrv_get_aio_context() returns the main context then */
+    pool = aio_get_thread_pool(bdrv_get_aio_context(bs));
+    return thread_pool_submit_co(pool, aio_worker, acb);
 }
 
 static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
     }
 
     if (S_ISREG(st.st_mode)) {
-        return raw_regular_truncate(s->fd, offset, prealloc, errp);
+        return raw_regular_truncate(bs, s->fd, offset, prealloc, errp);
     }
 
     if (prealloc != PREALLOC_MODE_OFF) {
@@ -XXX,XX +XXX,XX @@ static int64_t raw_get_allocated_file_size(BlockDriverState *bs)
     return (int64_t)st.st_blocks * 512;
 }
 
-static int raw_co_create(BlockdevCreateOptions *options, Error **errp)
+static int coroutine_fn
+raw_co_create(BlockdevCreateOptions *options, Error **errp)
 {
     BlockdevCreateOptionsFile *file_opts;
     int fd;
@@ -XXX,XX +XXX,XX @@ static int raw_co_create(BlockdevCreateOptions *options, Error **errp)
     }
 
     /* Clear the file by truncating it to 0 */
-    result = raw_regular_truncate(fd, 0, PREALLOC_MODE_OFF, errp);
+    result = raw_regular_truncate(NULL, fd, 0, PREALLOC_MODE_OFF, errp);
     if (result < 0) {
         goto out_close;
     }
@@ -XXX,XX +XXX,XX @@ static int raw_co_create(BlockdevCreateOptions *options, Error **errp)
 
     /* Resize and potentially preallocate the file to the desired
      * final size */
-    result = raw_regular_truncate(fd, file_opts->size, file_opts->preallocation,
-                                  errp);
+    result = raw_regular_truncate(NULL, fd, file_opts->size,
+                                  file_opts->preallocation, errp);
     if (result < 0) {
         goto out_close;
     }
-- 
2.13.6

From: Fam Zheng <famz@redhat.com>

in_flight and tracked requests need to be tracked in every layer during
recursion. For now the only user is qemu-img convert where overlapping
requests and IOThreads don't exist, therefore this change doesn't make
much difference form user point of view, but it is incorrect as part of
the API. Fix it.

Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/io.c | 59 ++++++++++++++++++++++++++++-------------------------------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_co_copy_range_internal(BdrvChild *src,
                                                     BdrvRequestFlags flags,
                                                     bool recurse_src)
 {
+    BdrvTrackedRequest src_req, dst_req;
+    BlockDriverState *src_bs = src->bs;
+    BlockDriverState *dst_bs = dst->bs;
     int ret;
 
     if (!src || !dst || !src->bs || !dst->bs) {
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_co_copy_range_internal(BdrvChild *src,
         || src->bs->encrypted || dst->bs->encrypted) {
         return -ENOTSUP;
     }
+    bdrv_inc_in_flight(src_bs);
+    bdrv_inc_in_flight(dst_bs);
+    tracked_request_begin(&src_req, src_bs, src_offset,
+                          bytes, BDRV_TRACKED_READ);
+    tracked_request_begin(&dst_req, dst_bs, dst_offset,
+                          bytes, BDRV_TRACKED_WRITE);
+
+    wait_serialising_requests(&src_req);
+    wait_serialising_requests(&dst_req);
     if (recurse_src) {
-        return src->bs->drv->bdrv_co_copy_range_from(src->bs,
-                                                     src, src_offset,
-                                                     dst, dst_offset,
-                                                     bytes, flags);
+        ret = src->bs->drv->bdrv_co_copy_range_from(src->bs,
+                                                    src, src_offset,
+                                                    dst, dst_offset,
+                                                    bytes, flags);
     } else {
-        return dst->bs->drv->bdrv_co_copy_range_to(dst->bs,
-                                                   src, src_offset,
-                                                   dst, dst_offset,
-                                                   bytes, flags);
+        ret = dst->bs->drv->bdrv_co_copy_range_to(dst->bs,
+                                                  src, src_offset,
+                                                  dst, dst_offset,
+                                                  bytes, flags);
     }
+    tracked_request_end(&src_req);
+    tracked_request_end(&dst_req);
+    bdrv_dec_in_flight(src_bs);
+    bdrv_dec_in_flight(dst_bs);
+    return ret;
 }
 
 /* Copy range from @src to @dst.
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_copy_range(BdrvChild *src, uint64_t src_offset,
                                     BdrvChild *dst, uint64_t dst_offset,
                                     uint64_t bytes, BdrvRequestFlags flags)
 {
-    BdrvTrackedRequest src_req, dst_req;
-    BlockDriverState *src_bs = src->bs;
-    BlockDriverState *dst_bs = dst->bs;
-    int ret;
-
-    bdrv_inc_in_flight(src_bs);
-    bdrv_inc_in_flight(dst_bs);
-    tracked_request_begin(&src_req, src_bs, src_offset,
-                          bytes, BDRV_TRACKED_READ);
-    tracked_request_begin(&dst_req, dst_bs, dst_offset,
-                          bytes, BDRV_TRACKED_WRITE);
-
-    wait_serialising_requests(&src_req);
-    wait_serialising_requests(&dst_req);
-    ret = bdrv_co_copy_range_from(src, src_offset,
-                                  dst, dst_offset,
-                                  bytes, flags);
-
-    tracked_request_end(&src_req);
-    tracked_request_end(&dst_req);
-    bdrv_dec_in_flight(src_bs);
-    bdrv_dec_in_flight(dst_bs);
-    return ret;
+    return bdrv_co_copy_range_from(src, src_offset,
+                                   dst, dst_offset,
+                                   bytes, flags);
 }
 
 static void bdrv_parent_cb_resize(BlockDriverState *bs)
-- 
2.13.6

From: Markus Armbruster <armbru@redhat.com>

block_crypto_open_opts_init() and block_crypto_create_opts_init()
contain a virtual visit of QCryptoBlockOptions and
QCryptoBlockCreateOptions less member "format", respectively.

Change their callers to put member "format" in the QDict, so they can
use the generated visitors for these types instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/crypto.h |  8 ++---
 block/crypto.c | 99 +++++++++-------------------------------------------------
 block/qcow.c   |  5 ++-
 block/qcow2.c  | 10 +++---
 4 files changed, 22 insertions(+), 100 deletions(-)

diff --git a/block/crypto.h b/block/crypto.h
index XXXXXXX..XXXXXXX 100644
--- a/block/crypto.h
+++ b/block/crypto.h
@@ -XXX,XX +XXX,XX @@
     }
 
 QCryptoBlockCreateOptions *
-block_crypto_create_opts_init(QCryptoBlockFormat format,
-                              QDict *opts,
-                              Error **errp);
+block_crypto_create_opts_init(QDict *opts, Error **errp);
 
 QCryptoBlockOpenOptions *
-block_crypto_open_opts_init(QCryptoBlockFormat format,
-                            QDict *opts,
-                            Error **errp);
+block_crypto_open_opts_init(QDict *opts, Error **errp);
 
 #endif /* BLOCK_CRYPTO_H__ */
diff --git a/block/crypto.c b/block/crypto.c
index XXXXXXX..XXXXXXX 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -XXX,XX +XXX,XX @@ static QemuOptsList block_crypto_create_opts_luks = {
 
 
 QCryptoBlockOpenOptions *
-block_crypto_open_opts_init(QCryptoBlockFormat format,
-                            QDict *opts,
-                            Error **errp)
+block_crypto_open_opts_init(QDict *opts, Error **errp)
 {
     Visitor *v;
-    QCryptoBlockOpenOptions *ret = NULL;
-    Error *local_err = NULL;
-
-    ret = g_new0(QCryptoBlockOpenOptions, 1);
-    ret->format = format;
+    QCryptoBlockOpenOptions *ret;
 
-    v = qobject_input_visitor_new_flat_confused(opts, &local_err);
+    v = qobject_input_visitor_new_flat_confused(opts, errp);
     if (!v) {
-        goto out;
-    }
-
-    visit_start_struct(v, NULL, NULL, 0, &local_err);
-    if (local_err) {
-        goto out;
-    }
-
-    switch (format) {
-    case Q_CRYPTO_BLOCK_FORMAT_LUKS:
-        visit_type_QCryptoBlockOptionsLUKS_members(
-            v, &ret->u.luks, &local_err);
-        break;
-
-    case Q_CRYPTO_BLOCK_FORMAT_QCOW:
-        visit_type_QCryptoBlockOptionsQCow_members(
-            v, &ret->u.qcow, &local_err);
-        break;
-
-    default:
-        error_setg(&local_err, "Unsupported block format %d", format);
-        break;
-    }
-    if (!local_err) {
-        visit_check_struct(v, &local_err);
+        return NULL;
     }
 
-    visit_end_struct(v, NULL);
+    visit_type_QCryptoBlockOpenOptions(v, NULL, &ret, errp);
 
- out:
-    if (local_err) {
-        error_propagate(errp, local_err);
-        qapi_free_QCryptoBlockOpenOptions(ret);
-        ret = NULL;
-    }
     visit_free(v);
     return ret;
 }
 
 
 QCryptoBlockCreateOptions *
-block_crypto_create_opts_init(QCryptoBlockFormat format,
-                              QDict *opts,
-                              Error **errp)
+block_crypto_create_opts_init(QDict *opts, Error **errp)
 {
     Visitor *v;
-    QCryptoBlockCreateOptions *ret = NULL;
-    Error *local_err = NULL;
-
-    ret = g_new0(QCryptoBlockCreateOptions, 1);
-    ret->format = format;
+    QCryptoBlockCreateOptions *ret;
 
-    v = qobject_input_visitor_new_flat_confused(opts, &local_err);
+    v = qobject_input_visitor_new_flat_confused(opts, errp);
     if (!v) {
-        goto out;
-    }
-
-    visit_start_struct(v, NULL, NULL, 0, &local_err);
-    if (local_err) {
-        goto out;
-    }
-
-    switch (format) {
-    case Q_CRYPTO_BLOCK_FORMAT_LUKS:
-        visit_type_QCryptoBlockCreateOptionsLUKS_members(
-            v, &ret->u.luks, &local_err);
-        break;
-
-    case Q_CRYPTO_BLOCK_FORMAT_QCOW:
-        visit_type_QCryptoBlockOptionsQCow_members(
-            v, &ret->u.qcow, &local_err);
-        break;
-
-    default:
-        error_setg(&local_err, "Unsupported block format %d", format);
-        break;
-    }
-    if (!local_err) {
-        visit_check_struct(v, &local_err);
+        return NULL;
     }
 
-    visit_end_struct(v, NULL);
+    visit_type_QCryptoBlockCreateOptions(v, NULL, &ret, errp);
 
- out:
-    if (local_err) {
-        error_propagate(errp, local_err);
-        qapi_free_QCryptoBlockCreateOptions(ret);
-        ret = NULL;
-    }
     visit_free(v);
     return ret;
 }
@@ -XXX,XX +XXX,XX @@ static int block_crypto_open_generic(QCryptoBlockFormat format,
     }
 
     cryptoopts = qemu_opts_to_qdict(opts, NULL);
+    qdict_put_str(cryptoopts, "format", QCryptoBlockFormat_str(format));
 
-    open_opts = block_crypto_open_opts_init(format, cryptoopts, errp);
+    open_opts = block_crypto_open_opts_init(cryptoopts, errp);
     if (!open_opts) {
         goto cleanup;
     }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn block_crypto_co_create_opts_luks(const char *filename,
                                              &block_crypto_create_opts_luks,
                                              true);
 
-    create_opts = block_crypto_create_opts_init(Q_CRYPTO_BLOCK_FORMAT_LUKS,
-                                                cryptoopts, errp);
+    qdict_put_str(cryptoopts, "format", "luks");
+    create_opts = block_crypto_create_opts_init(cryptoopts, errp);
     if (!create_opts) {
         ret = -EINVAL;
         goto fail;
diff --git a/block/qcow.c b/block/qcow.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -XXX,XX +XXX,XX @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
                 ret = -EINVAL;
                 goto fail;
             }
-            qdict_del(encryptopts, "format");
-            crypto_opts = block_crypto_open_opts_init(
-                Q_CRYPTO_BLOCK_FORMAT_QCOW, encryptopts, errp);
+            qdict_put_str(encryptopts, "format", "qcow");
+            crypto_opts = block_crypto_open_opts_init(encryptopts, errp);
             if (!crypto_opts) {
                 ret = -EINVAL;
                 goto fail;
diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static int qcow2_update_options_prepare(BlockDriverState *bs,
             ret = -EINVAL;
             goto fail;
         }
-        qdict_del(encryptopts, "format");
-        r->crypto_opts = block_crypto_open_opts_init(
-            Q_CRYPTO_BLOCK_FORMAT_QCOW, encryptopts, errp);
+        qdict_put_str(encryptopts, "format", "qcow");
+        r->crypto_opts = block_crypto_open_opts_init(encryptopts, errp);
         break;
 
     case QCOW_CRYPT_LUKS:
@@ -XXX,XX +XXX,XX @@ static int qcow2_update_options_prepare(BlockDriverState *bs,
             ret = -EINVAL;
             goto fail;
         }
-        qdict_del(encryptopts, "format");
-        r->crypto_opts = block_crypto_open_opts_init(
-            Q_CRYPTO_BLOCK_FORMAT_LUKS, encryptopts, errp);
+        qdict_put_str(encryptopts, "format", "luks");
+        r->crypto_opts = block_crypto_open_opts_init(encryptopts, errp);
         break;
 
     default:
-- 
2.13.6

Commit abf754fe406 updated 026.out, but forgot to also update
026.out.nocache.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/026.out.nocache | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 @@ Failed to flush the L2 table cache: No space left on device
 Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
-11 leaked clusters were found on the image.
+10 leaked clusters were found on the image.
 This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
@@ -XXX,XX +XXX,XX @@ Failed to flush the L2 table cache: No space left on device
 Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
-11 leaked clusters were found on the image.
+10 leaked clusters were found on the image.
 This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
@@ -XXX,XX +XXX,XX @@ Failed to flush the L2 table cache: No space left on device
 Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
-11 leaked clusters were found on the image.
+10 leaked clusters were found on the image.
 This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
-- 
2.13.6

If we managed to allocate the clusters, but then failed to write the
data, there's a good chance that we'll still be able to free the
clusters again in order to avoid cluster leaks (the refcounts are
cached, so even if we can't write them out right now, we may be able to
do so when the VM is resumed after a werror=stop/enospc pause).

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>
---
 block/qcow2.h         |  1 +
 block/qcow2-cluster.c | 11 +++++++++++
 block/qcow2.c         |  2 ++
 3 files changed, 14 insertions(+)

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 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
                                          int compressed_size);
 
 int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m);
+void qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m);
 int qcow2_cluster_discard(BlockDriverState *bs, uint64_t offset,
                           uint64_t bytes, enum qcow2_discard_type type,
                           bool full_discard);
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -XXX,XX +XXX,XX @@ err:
     return ret;
  }
 
+/**
+ * Frees the allocated clusters because the request failed and they won't
+ * actually be linked.
+ */
+void qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m)
+{
+    BDRVQcow2State *s = bs->opaque;
+    qcow2_free_clusters(bs, m->alloc_offset, m->nb_clusters << s->cluster_bits,
+                        QCOW2_DISCARD_NEVER);
+}
+
 /*
  * Returns the number of contiguous clusters that can be used for an allocating
  * write, but require COW to be performed (this includes yet unallocated space,
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 coroutine_fn int qcow2_handle_l2meta(BlockDriverState *bs,
             if (ret) {
                 goto out;
             }
+        } else {
+            qcow2_alloc_cluster_abort(bs, l2meta);
         }
 
         /* Take the request off the list of running requests */
-- 
2.13.6

This adds a test for a temporary write failure, which simulates the
situation after werror=stop/enospc has stopped the VM. We shouldn't
leave leaked clusters behind in such cases.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/026             | 17 +++++++++++++++++
 tests/qemu-iotests/026.out         |  8 ++++++++
 tests/qemu-iotests/026.out.nocache |  8 ++++++++
 3 files changed, 33 insertions(+)

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 @@ done
 done
 done
 
+echo
+echo === Avoid cluster leaks after temporary failure ===
+echo
+
+cat > "$TEST_DIR/blkdebug.conf" <<EOF
+[inject-error]
+event = "write_aio"
+errno = "5"
+once = "on"
+EOF
+
+# After the failed first write, do a second write so that the updated refcount
+# block is actually written back
+_make_test_img 64M
+$QEMU_IO -c "write 0 1M" -c "write 0 1M" "$BLKDBG_TEST_IMG" | _filter_qemu_io
+_check_test_img
+
 # success, all done
 echo "*** done"
 rm -f $seq.full
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 @@ 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.
+
+=== Avoid cluster leaks after temporary failure ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+write failed: Input/output error
+wrote 1048576/1048576 bytes at offset 0
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+No errors were found on the image.
 *** done
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 @@ 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.
+
+=== Avoid cluster leaks after temporary failure ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+write failed: Input/output error
+wrote 1048576/1048576 bytes at offset 0
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+No errors were found on the image.
 *** done
-- 
2.13.6

This simplifies file-posix by implementing the coroutine variants of
the discard and flush BlockDriver callbacks. These were the last
remaining users of paio_submit(), which can be removed now.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 block/file-posix.c | 72 ++++++++++++++++++------------------------------------
 1 file changed, 24 insertions(+), 48 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static inline int paio_submit_co(BlockDriverState *bs, int fd,
     return paio_submit_co_full(bs, fd, offset, -1, 0, qiov, bytes, type);
 }
 
-static BlockAIOCB *paio_submit(BlockDriverState *bs, int fd,
-        int64_t offset, QEMUIOVector *qiov, int bytes,
-        BlockCompletionFunc *cb, void *opaque, int type)
-{
-    RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);
-    ThreadPool *pool;
-
-    acb->bs = bs;
-    acb->aio_type = type;
-    acb->aio_fildes = fd;
-
-    acb->aio_nbytes = bytes;
-    acb->aio_offset = offset;
-
-    if (qiov) {
-        acb->aio_iov = qiov->iov;
-        acb->aio_niov = qiov->niov;
-        assert(qiov->size == acb->aio_nbytes);
-    }
-
-    trace_paio_submit(acb, opaque, offset, bytes, type);
-    pool = aio_get_thread_pool(bdrv_get_aio_context(bs));
-    return thread_pool_submit_aio(pool, aio_worker, acb, cb, opaque);
-}
-
 static int coroutine_fn raw_co_prw(BlockDriverState *bs, uint64_t offset,
                                    uint64_t bytes, QEMUIOVector *qiov, int type)
 {
@@ -XXX,XX +XXX,XX @@ static void raw_aio_unplug(BlockDriverState *bs)
 #endif
 }
 
-static BlockAIOCB *raw_aio_flush(BlockDriverState *bs,
-        BlockCompletionFunc *cb, void *opaque)
+static int raw_co_flush_to_disk(BlockDriverState *bs)
 {
     BDRVRawState *s = bs->opaque;
+    int ret;
 
-    if (fd_open(bs) < 0)
-        return NULL;
+    ret = fd_open(bs);
+    if (ret < 0) {
+        return ret;
+    }
 
-    return paio_submit(bs, s->fd, 0, NULL, 0, cb, opaque, QEMU_AIO_FLUSH);
+    return paio_submit_co(bs, s->fd, 0, NULL, 0, QEMU_AIO_FLUSH);
 }
 
 static void raw_aio_attach_aio_context(BlockDriverState *bs,
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
 #endif /* !__linux__ */
 }
 
-static coroutine_fn BlockAIOCB *raw_aio_pdiscard(BlockDriverState *bs,
-    int64_t offset, int bytes,
-    BlockCompletionFunc *cb, void *opaque)
+static coroutine_fn int
+raw_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes)
 {
     BDRVRawState *s = bs->opaque;
 
-    return paio_submit(bs, s->fd, offset, NULL, bytes,
-                       cb, opaque, QEMU_AIO_DISCARD);
+    return paio_submit_co(bs, s->fd, offset, NULL, bytes, QEMU_AIO_DISCARD);
 }
 
 static int coroutine_fn raw_co_pwrite_zeroes(
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_file = {
 
     .bdrv_co_preadv         = raw_co_preadv,
     .bdrv_co_pwritev        = raw_co_pwritev,
-    .bdrv_aio_flush = raw_aio_flush,
-    .bdrv_aio_pdiscard = raw_aio_pdiscard,
+    .bdrv_co_flush_to_disk  = raw_co_flush_to_disk,
+    .bdrv_co_pdiscard       = raw_co_pdiscard,
     .bdrv_co_copy_range_from = raw_co_copy_range_from,
     .bdrv_co_copy_range_to  = raw_co_copy_range_to,
     .bdrv_refresh_limits = raw_refresh_limits,
@@ -XXX,XX +XXX,XX @@ static int fd_open(BlockDriverState *bs)
     return -EIO;
 }
 
-static coroutine_fn BlockAIOCB *hdev_aio_pdiscard(BlockDriverState *bs,
-    int64_t offset, int bytes,
-    BlockCompletionFunc *cb, void *opaque)
+static coroutine_fn int
+hdev_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes)
 {
     BDRVRawState *s = bs->opaque;
+    int ret;
 
-    if (fd_open(bs) < 0) {
-        return NULL;
+    ret = fd_open(bs);
+    if (ret < 0) {
+        return ret;
     }
-    return paio_submit(bs, s->fd, offset, NULL, bytes,
-                       cb, opaque, QEMU_AIO_DISCARD|QEMU_AIO_BLKDEV);
+    return paio_submit_co(bs, s->fd, offset, NULL, bytes,
+                          QEMU_AIO_DISCARD | QEMU_AIO_BLKDEV);
 }
 
 static coroutine_fn int hdev_co_pwrite_zeroes(BlockDriverState *bs,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
 
     .bdrv_co_preadv         = raw_co_preadv,
     .bdrv_co_pwritev        = raw_co_pwritev,
-    .bdrv_aio_flush	= raw_aio_flush,
-    .bdrv_aio_pdiscard   = hdev_aio_pdiscard,
+    .bdrv_co_flush_to_disk  = raw_co_flush_to_disk,
+    .bdrv_co_pdiscard       = hdev_co_pdiscard,
     .bdrv_co_copy_range_from = raw_co_copy_range_from,
     .bdrv_co_copy_range_to  = raw_co_copy_range_to,
     .bdrv_refresh_limits = raw_refresh_limits,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
 
     .bdrv_co_preadv         = raw_co_preadv,
     .bdrv_co_pwritev        = raw_co_pwritev,
-    .bdrv_aio_flush	= raw_aio_flush,
+    .bdrv_co_flush_to_disk  = raw_co_flush_to_disk,
     .bdrv_refresh_limits = raw_refresh_limits,
     .bdrv_io_plug = raw_aio_plug,
     .bdrv_io_unplug = raw_aio_unplug,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
 
     .bdrv_co_preadv         = raw_co_preadv,
     .bdrv_co_pwritev        = raw_co_pwritev,
-    .bdrv_aio_flush	= raw_aio_flush,
+    .bdrv_co_flush_to_disk  = raw_co_flush_to_disk,
     .bdrv_refresh_limits = raw_refresh_limits,
     .bdrv_io_plug = raw_aio_plug,
     .bdrv_io_unplug = raw_aio_unplug,
-- 
2.13.6

From: Fam Zheng <famz@redhat.com>

Not updating src_offset will result in wrong data being written to dst
image.

Reported-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.c              |  1 +
 tests/qemu-iotests/063     |  9 +++++++++
 tests/qemu-iotests/063.out | 12 ++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ qcow2_co_copy_range_to(BlockDriverState *bs,
         }
 
         bytes -= cur_bytes;
+        src_offset += cur_bytes;
         dst_offset += cur_bytes;
     }
     ret = 0;
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -XXX,XX +XXX,XX @@ if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev
     exit 1
 fi
 
+echo "== Regression testing for copy offloading bug =="
+
+_make_test_img 1M
+TEST_IMG="$TEST_IMG.target" _make_test_img 1M
+$QEMU_IO -c 'write -P 1 0 512k' -c 'write -P 2 512k 512k' "$TEST_IMG" | _filter_qemu_io
+$QEMU_IO -c 'write -P 4 512k 512k' -c 'write -P 3 0 512k' "$TEST_IMG.target" | _filter_qemu_io
+$QEMU_IMG convert -n -O $IMGFMT "$TEST_IMG" "$TEST_IMG.target"
+$QEMU_IMG compare "$TEST_IMG" "$TEST_IMG.target"
+
 echo "*** done"
 rm -f $seq.full
 status=0
diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/063.out
+++ b/tests/qemu-iotests/063.out
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
 No errors were found on the image.
 == Testing conversion to a smaller file fails ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
+== Regression testing for copy offloading bug ==
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=1048576
+wrote 524288/524288 bytes at offset 0
+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 524288/524288 bytes at offset 524288
+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 524288/524288 bytes at offset 524288
+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 524288/524288 bytes at offset 0
+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+Images are identical.
 *** done
-- 
2.13.6

From: Fam Zheng <famz@redhat.com>

EINTR should be checked against errno, not ret. While fixing the bug,
collect the branches with a switch block.

Also, change the return value from -ENOSTUP to -ENOSPC when the actual
issue is request range passes EOF, which should be distinguishable from
the case of error == ENOSYS by the caller, so that it could still retry
with other byte ranges, whereas it shouldn't retry anymore upon ENOSYS.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/file-posix.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static ssize_t handle_aiocb_copy_range(RawPosixAIOData *aiocb)
         ssize_t ret = copy_file_range(aiocb->aio_fildes, &in_off,
                                       aiocb->aio_fd2, &out_off,
                                       bytes, 0);
-        if (ret == -EINTR) {
-            continue;
+        if (ret == 0) {
+            /* No progress (e.g. when beyond EOF), let the caller fall back to
+             * buffer I/O. */
+            return -ENOSPC;
         }
         if (ret < 0) {
-            if (errno == ENOSYS) {
+            switch (errno) {
+            case ENOSYS:
                 return -ENOTSUP;
-            } else {
+            case EINTR:
+                continue;
+            default:
                 return -errno;
             }
         }
-        if (!ret) {
-            /* No progress (e.g. when beyond EOF), fall back to buffer I/O. */
-            return -ENOTSUP;
-        }
         bytes -= ret;
     }
     return 0;
-- 
2.13.6

From: Eric Blake <eblake@redhat.com>

We are gradually moving away from sector-based interfaces, towards
byte-based.  Make the change for the last few sector-based calls
into the block layer from the parallels driver.

Ideally, the parallels driver should switch to doing everything
byte-based, but that's a more invasive change that requires a
bit more auditing.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/parallels.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/block/parallels.c b/block/parallels.c
index XXXXXXX..XXXXXXX 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -XXX,XX +XXX,XX @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num,
         };
         qemu_iovec_init_external(&qiov, &iov, 1);
 
-        ret = bdrv_co_readv(bs->backing, idx * s->tracks, nb_cow_sectors,
-                            &qiov);
+        ret = bdrv_co_preadv(bs->backing, idx * s->tracks * BDRV_SECTOR_SIZE,
+                             nb_cow_bytes, &qiov, 0);
         if (ret < 0) {
             qemu_vfree(iov.iov_base);
             return ret;
         }
 
-        ret = bdrv_co_writev(bs->file, s->data_end, nb_cow_sectors, &qiov);
+        ret = bdrv_co_pwritev(bs->file, s->data_end * BDRV_SECTOR_SIZE,
+                              nb_cow_bytes, &qiov, 0);
         qemu_vfree(iov.iov_base);
         if (ret < 0) {
             return ret;
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int parallels_co_writev(BlockDriverState *bs,
         qemu_iovec_reset(&hd_qiov);
         qemu_iovec_concat(&hd_qiov, qiov, bytes_done, nbytes);
 
-        ret = bdrv_co_writev(bs->file, position, n, &hd_qiov);
+        ret = bdrv_co_pwritev(bs->file, position * BDRV_SECTOR_SIZE, nbytes,
+                              &hd_qiov, 0);
         if (ret < 0) {
             break;
         }
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int parallels_co_readv(BlockDriverState *bs,
 
         if (position < 0) {
             if (bs->backing) {
-                ret = bdrv_co_readv(bs->backing, sector_num, n, &hd_qiov);
+                ret = bdrv_co_preadv(bs->backing, sector_num * BDRV_SECTOR_SIZE,
+                                     nbytes, &hd_qiov, 0);
                 if (ret < 0) {
                     break;
                 }
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int parallels_co_readv(BlockDriverState *bs,
                 qemu_iovec_memset(&hd_qiov, 0, 0, nbytes);
             }
         } else {
-            ret = bdrv_co_readv(bs->file, position, n, &hd_qiov);
+            ret = bdrv_co_preadv(bs->file, position * BDRV_SECTOR_SIZE, nbytes,
+                                 &hd_qiov, 0);
             if (ret < 0) {
                 break;
             }
-- 
2.13.6

From: Eric Blake <eblake@redhat.com>

We are gradually moving away from sector-based interfaces, towards
byte-based.  Make the change for the internal helper function
get_cluster_offset(), by changing n_start and n_end to be byte
offsets rather than sector indices within the cluster being
allocated.  However, assert that these values are still
sector-aligned (at least qcrypto_block_encrypt() still wants that).
For now we get that alignment for free because we still use
sector-based driver callbacks.

A later patch will then switch the qcow driver as a whole over
to byte-based operation; but will still leave things at sector
alignments as it is not worth auditing the qcow image format
to worry about sub-sector requests.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/block/qcow.c b/block/qcow.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -XXX,XX +XXX,XX @@ static int qcow_reopen_prepare(BDRVReopenState *state,
  *
  * 0 to not allocate.
  *
- * 1 to allocate a normal cluster (for sector indexes 'n_start' to
- * 'n_end')
+ * 1 to allocate a normal cluster (for sector-aligned byte offsets 'n_start'
+ * to 'n_end' within the cluster)
  *
  * 2 to allocate a compressed cluster of size
  * 'compressed_size'. 'compressed_size' must be > 0 and <
@@ -XXX,XX +XXX,XX @@ static int get_cluster_offset(BlockDriverState *bs,
         if (!allocate)
             return 0;
         BLKDBG_EVENT(bs->file, BLKDBG_CLUSTER_ALLOC);
+        assert(QEMU_IS_ALIGNED(n_start | n_end, BDRV_SECTOR_SIZE));
         /* allocate a new cluster */
         if ((cluster_offset & QCOW_OFLAG_COMPRESSED) &&
-            (n_end - n_start) < s->cluster_sectors) {
+            (n_end - n_start) < s->cluster_size) {
             /* if the cluster is already compressed, we must
                decompress it in the case it is not completely
                overwritten */
@@ -XXX,XX +XXX,XX @@ static int get_cluster_offset(BlockDriverState *bs,
                 /* if encrypted, we must initialize the cluster
                    content which won't be written */
                 if (bs->encrypted &&
-                    (n_end - n_start) < s->cluster_sectors) {
-                    uint64_t start_sect;
+                    (n_end - n_start) < s->cluster_size) {
+                    uint64_t start_offset;
                     assert(s->crypto);
-                    start_sect = (offset & ~(s->cluster_size - 1)) >> 9;
-                    for(i = 0; i < s->cluster_sectors; i++) {
+                    start_offset = offset & ~(s->cluster_size - 1);
+                    for (i = 0; i < s->cluster_size; i += BDRV_SECTOR_SIZE) {
                         if (i < n_start || i >= n_end) {
-                            memset(s->cluster_data, 0x00, 512);
+                            memset(s->cluster_data, 0x00, BDRV_SECTOR_SIZE);
                             if (qcrypto_block_encrypt(s->crypto,
-                                                      (start_sect + i) *
-                                                      BDRV_SECTOR_SIZE,
+                                                      start_offset + i,
                                                       s->cluster_data,
                                                       BDRV_SECTOR_SIZE,
                                                       NULL) < 0) {
@@ -XXX,XX +XXX,XX @@ static int get_cluster_offset(BlockDriverState *bs,
                             }
                             BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
                             ret = bdrv_pwrite(bs->file,
-                                              cluster_offset + i * 512,
-                                              s->cluster_data, 512);
+                                              cluster_offset + i,
+                                              s->cluster_data,
+                                              BDRV_SECTOR_SIZE);
                             if (ret < 0) {
                                 return ret;
                             }
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
             n = nb_sectors;
         }
         ret = get_cluster_offset(bs, sector_num << 9, 1, 0,
-                                 index_in_cluster,
-                                 index_in_cluster + n, &cluster_offset);
+                                 index_in_cluster << 9,
+                                 (index_in_cluster + n) << 9, &cluster_offset);
         if (ret < 0) {
             break;
         }
-- 
2.13.6

From: Eric Blake <eblake@redhat.com>

We are gradually moving away from sector-based interfaces, towards
byte-based.  Make the change for the internals of the qcow
driver read function, by iterating over offset/bytes instead of
sector_num/nb_sectors, and with a rename of index_in_cluster and
repurposing of n to track bytes instead of sectors.

A later patch will then switch the qcow driver as a whole over
to byte-based operation.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow.c | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/block/qcow.c b/block/qcow.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
                          int nb_sectors, QEMUIOVector *qiov)
 {
     BDRVQcowState *s = bs->opaque;
-    int index_in_cluster;
+    int offset_in_cluster;
     int ret = 0, n;
     uint64_t cluster_offset;
     struct iovec hd_iov;
     QEMUIOVector hd_qiov;
     uint8_t *buf;
     void *orig_buf;
+    int64_t offset = sector_num * BDRV_SECTOR_SIZE;
+    int64_t bytes = nb_sectors * BDRV_SECTOR_SIZE;
 
     if (qiov->niov > 1) {
         buf = orig_buf = qemu_try_blockalign(bs, qiov->size);
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
 
     qemu_co_mutex_lock(&s->lock);
 
-    while (nb_sectors != 0) {
+    while (bytes != 0) {
         /* prepare next request */
-        ret = get_cluster_offset(bs, sector_num << 9,
-                                 0, 0, 0, 0, &cluster_offset);
+        ret = get_cluster_offset(bs, offset, 0, 0, 0, 0, &cluster_offset);
         if (ret < 0) {
             break;
         }
-        index_in_cluster = sector_num & (s->cluster_sectors - 1);
-        n = s->cluster_sectors - index_in_cluster;
-        if (n > nb_sectors) {
-            n = nb_sectors;
+        offset_in_cluster = offset & (s->cluster_size - 1);
+        n = s->cluster_size - offset_in_cluster;
+        if (n > bytes) {
+            n = bytes;
         }
 
         if (!cluster_offset) {
             if (bs->backing) {
                 /* read from the base image */
                 hd_iov.iov_base = (void *)buf;
-                hd_iov.iov_len = n * 512;
+                hd_iov.iov_len = n;
                 qemu_iovec_init_external(&hd_qiov, &hd_iov, 1);
                 qemu_co_mutex_unlock(&s->lock);
                 /* qcow2 emits this on bs->file instead of bs->backing */
                 BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
-                ret = bdrv_co_readv(bs->backing, sector_num, n, &hd_qiov);
+                ret = bdrv_co_preadv(bs->backing, offset, n, &hd_qiov, 0);
                 qemu_co_mutex_lock(&s->lock);
                 if (ret < 0) {
                     break;
                 }
             } else {
                 /* Note: in this case, no need to wait */
-                memset(buf, 0, 512 * n);
+                memset(buf, 0, n);
             }
         } else if (cluster_offset & QCOW_OFLAG_COMPRESSED) {
             /* add AIO support for compressed blocks ? */
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
                 ret = -EIO;
                 break;
             }
-            memcpy(buf,
-                   s->cluster_cache + index_in_cluster * 512, 512 * n);
+            memcpy(buf, s->cluster_cache + offset_in_cluster, n);
         } else {
             if ((cluster_offset & 511) != 0) {
                 ret = -EIO;
                 break;
             }
             hd_iov.iov_base = (void *)buf;
-            hd_iov.iov_len = n * 512;
+            hd_iov.iov_len = n;
             qemu_iovec_init_external(&hd_qiov, &hd_iov, 1);
             qemu_co_mutex_unlock(&s->lock);
             BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
-            ret = bdrv_co_readv(bs->file,
-                                (cluster_offset >> 9) + index_in_cluster,
-                                n, &hd_qiov);
+            ret = bdrv_co_preadv(bs->file, cluster_offset + offset_in_cluster,
+                                 n, &hd_qiov, 0);
             qemu_co_mutex_lock(&s->lock);
             if (ret < 0) {
                 break;
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
             if (bs->encrypted) {
                 assert(s->crypto);
                 if (qcrypto_block_decrypt(s->crypto,
-                                          sector_num * BDRV_SECTOR_SIZE, buf,
-                                          n * BDRV_SECTOR_SIZE, NULL) < 0) {
+                                          offset, buf, n, NULL) < 0) {
                     ret = -EIO;
                     break;
                 }
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
         }
         ret = 0;
 
-        nb_sectors -= n;
-        sector_num += n;
-        buf += n * 512;
+        bytes -= n;
+        offset += n;
+        buf += n;
     }
 
     qemu_co_mutex_unlock(&s->lock);
-- 
2.13.6

From: Eric Blake <eblake@redhat.com>

We are gradually moving away from sector-based interfaces, towards
byte-based.  Make the change for the internals of the qcow
driver write function, by iterating over offset/bytes instead of
sector_num/nb_sectors, and with a rename of index_in_cluster and
repurposing of n to track bytes instead of sectors.

A later patch will then switch the qcow driver as a whole over
to byte-based operation.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow.c | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/block/qcow.c b/block/qcow.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
                                        int flags)
 {
     BDRVQcowState *s = bs->opaque;
-    int index_in_cluster;
+    int offset_in_cluster;
     uint64_t cluster_offset;
     int ret = 0, n;
     struct iovec hd_iov;
     QEMUIOVector hd_qiov;
     uint8_t *buf;
     void *orig_buf;
+    int64_t offset = sector_num * BDRV_SECTOR_SIZE;
+    int64_t bytes = nb_sectors * BDRV_SECTOR_SIZE;
 
     assert(!flags);
     s->cluster_cache_offset = -1; /* disable compressed cache */
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
 
     qemu_co_mutex_lock(&s->lock);
 
-    while (nb_sectors != 0) {
-
-        index_in_cluster = sector_num & (s->cluster_sectors - 1);
-        n = s->cluster_sectors - index_in_cluster;
-        if (n > nb_sectors) {
-            n = nb_sectors;
+    while (bytes != 0) {
+        offset_in_cluster = offset & (s->cluster_size - 1);
+        n = s->cluster_size - offset_in_cluster;
+        if (n > bytes) {
+            n = bytes;
         }
-        ret = get_cluster_offset(bs, sector_num << 9, 1, 0,
-                                 index_in_cluster << 9,
-                                 (index_in_cluster + n) << 9, &cluster_offset);
+        ret = get_cluster_offset(bs, offset, 1, 0, offset_in_cluster,
+                                 offset_in_cluster + n, &cluster_offset);
         if (ret < 0) {
             break;
         }
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
         }
         if (bs->encrypted) {
             assert(s->crypto);
-            if (qcrypto_block_encrypt(s->crypto, sector_num * BDRV_SECTOR_SIZE,
-                                      buf, n * BDRV_SECTOR_SIZE, NULL) < 0) {
+            if (qcrypto_block_encrypt(s->crypto, offset, buf, n, NULL) < 0) {
                 ret = -EIO;
                 break;
             }
         }
 
         hd_iov.iov_base = (void *)buf;
-        hd_iov.iov_len = n * 512;
+        hd_iov.iov_len = n;
         qemu_iovec_init_external(&hd_qiov, &hd_iov, 1);
         qemu_co_mutex_unlock(&s->lock);
         BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
-        ret = bdrv_co_writev(bs->file,
-                             (cluster_offset >> 9) + index_in_cluster,
-                             n, &hd_qiov);
+        ret = bdrv_co_pwritev(bs->file, cluster_offset + offset_in_cluster,
+                              n, &hd_qiov, 0);
         qemu_co_mutex_lock(&s->lock);
         if (ret < 0) {
             break;
         }
         ret = 0;
 
-        nb_sectors -= n;
-        sector_num += n;
-        buf += n * 512;
+        bytes -= n;
+        offset += n;
+        buf += n;
     }
     qemu_co_mutex_unlock(&s->lock);
 
-- 
2.13.6

From: Eric Blake <eblake@redhat.com>

We are gradually moving away from sector-based interfaces, towards
byte-based.  The qcow driver is now ready to fully utilize the
byte-based callback interface, as long as we override the default
alignment to still be 512 (needed at least for asserts present
because of encryption, but easier to do everywhere than to audit
which sub-sector requests are handled correctly, especially since
we no longer recommend qcow for new disk images).

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow.c | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/block/qcow.c b/block/qcow.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -XXX,XX +XXX,XX @@ typedef struct QCowHeader {
 typedef struct BDRVQcowState {
     int cluster_bits;
     int cluster_size;
-    int cluster_sectors;
     int l2_bits;
     int l2_size;
     unsigned int l1_size;
@@ -XXX,XX +XXX,XX @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
     }
     s->cluster_bits = header.cluster_bits;
     s->cluster_size = 1 << s->cluster_bits;
-    s->cluster_sectors = 1 << (s->cluster_bits - 9);
     s->l2_bits = header.l2_bits;
     s->l2_size = 1 << s->l2_bits;
     bs->total_sectors = header.size / 512;
@@ -XXX,XX +XXX,XX @@ static int decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset)
     return 0;
 }
 
-static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
-                         int nb_sectors, QEMUIOVector *qiov)
+static void qcow_refresh_limits(BlockDriverState *bs, Error **errp)
+{
+    /* At least encrypted images require 512-byte alignment. Apply the
+     * limit universally, rather than just on encrypted images, as
+     * it's easier to let the block layer handle rounding than to
+     * audit this code further. */
+    bs->bl.request_alignment = BDRV_SECTOR_SIZE;
+}
+
+static coroutine_fn int qcow_co_preadv(BlockDriverState *bs, uint64_t offset,
+                                       uint64_t bytes, QEMUIOVector *qiov,
+                                       int flags)
 {
     BDRVQcowState *s = bs->opaque;
     int offset_in_cluster;
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
     QEMUIOVector hd_qiov;
     uint8_t *buf;
     void *orig_buf;
-    int64_t offset = sector_num * BDRV_SECTOR_SIZE;
-    int64_t bytes = nb_sectors * BDRV_SECTOR_SIZE;
 
+    assert(!flags);
     if (qiov->niov > 1) {
         buf = orig_buf = qemu_try_blockalign(bs, qiov->size);
         if (buf == NULL) {
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
     return ret;
 }
 
-static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
-                                       int nb_sectors, QEMUIOVector *qiov,
-                                       int flags)
+static coroutine_fn int qcow_co_pwritev(BlockDriverState *bs, uint64_t offset,
+                                        uint64_t bytes, QEMUIOVector *qiov,
+                                        int flags)
 {
     BDRVQcowState *s = bs->opaque;
     int offset_in_cluster;
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
     QEMUIOVector hd_qiov;
     uint8_t *buf;
     void *orig_buf;
-    int64_t offset = sector_num * BDRV_SECTOR_SIZE;
-    int64_t bytes = nb_sectors * BDRV_SECTOR_SIZE;
 
     assert(!flags);
     s->cluster_cache_offset = -1; /* disable compressed cache */
@@ -XXX,XX +XXX,XX @@ qcow_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
 
     if (ret != Z_STREAM_END || out_len >= s->cluster_size) {
         /* could not compress: write normal cluster */
-        ret = qcow_co_writev(bs, offset >> BDRV_SECTOR_BITS,
-                             bytes >> BDRV_SECTOR_BITS, qiov, 0);
+        ret = qcow_co_pwritev(bs, offset, bytes, qiov, 0);
         if (ret < 0) {
             goto fail;
         }
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_qcow = {
     .bdrv_co_create_opts    = qcow_co_create_opts,
     .bdrv_has_zero_init     = bdrv_has_zero_init_1,
     .supports_backing       = true,
+    .bdrv_refresh_limits    = qcow_refresh_limits,
 
-    .bdrv_co_readv          = qcow_co_readv,
-    .bdrv_co_writev         = qcow_co_writev,
+    .bdrv_co_preadv         = qcow_co_preadv,
+    .bdrv_co_pwritev        = qcow_co_pwritev,
     .bdrv_co_block_status   = qcow_co_block_status,
 
     .bdrv_make_empty        = qcow_make_empty,
-- 
2.13.6

From: Eric Blake <eblake@redhat.com>

We are gradually moving away from sector-based interfaces, towards
byte-based.  Make the change for the last few sector-based calls
into the block layer from the replication driver.

Ideally, the replication driver should switch to doing everything
byte-based, but that's a more invasive change that requires a
bit more auditing.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/replication.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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 coroutine_fn int replication_co_readv(BlockDriverState *bs,
         backup_cow_request_begin(&req, child->bs->job,
                                  sector_num * BDRV_SECTOR_SIZE,
                                  remaining_bytes);
-        ret = bdrv_co_readv(bs->file, sector_num, remaining_sectors,
-                            qiov);
+        ret = bdrv_co_preadv(bs->file, sector_num * BDRV_SECTOR_SIZE,
+                             remaining_bytes, qiov, 0);
         backup_cow_request_end(&req);
         goto out;
     }
 
-    ret = bdrv_co_readv(bs->file, sector_num, remaining_sectors, qiov);
+    ret = bdrv_co_preadv(bs->file, sector_num * BDRV_SECTOR_SIZE,
+                         remaining_sectors * BDRV_SECTOR_SIZE, qiov, 0);
 out:
     return replication_return_value(s, ret);
 }
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int replication_co_writev(BlockDriverState *bs,
     }
 
     if (ret == 0) {
-        ret = bdrv_co_writev(top, sector_num,
-                             remaining_sectors, qiov);
+        ret = bdrv_co_pwritev(top, sector_num * BDRV_SECTOR_SIZE,
+                              remaining_sectors * BDRV_SECTOR_SIZE, qiov, 0);
         return replication_return_value(s, ret);
     }
 
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int replication_co_writev(BlockDriverState *bs,
         qemu_iovec_concat(&hd_qiov, qiov, bytes_done, count);
 
         target = ret ? top : base;
-        ret = bdrv_co_writev(target, sector_num, n, &hd_qiov);
+        ret = bdrv_co_pwritev(target, sector_num * BDRV_SECTOR_SIZE,
+                              n * BDRV_SECTOR_SIZE, &hd_qiov, 0);
         if (ret < 0) {
             goto out1;
         }
-- 
2.13.6

From: Eric Blake <eblake@redhat.com>

We are gradually moving away from sector-based interfaces, towards
byte-based.  Make the change for the last few sector-based calls
into the block layer from the vhdx driver.

Ideally, the vhdx driver should switch to doing everything
byte-based, but that's a more invasive change that requires a
bit more auditing.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/vhdx.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/block/vhdx.c b/block/vhdx.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int vhdx_co_readv(BlockDriverState *bs, int64_t sector_num,
                 break;
             case PAYLOAD_BLOCK_FULLY_PRESENT:
                 qemu_co_mutex_unlock(&s->lock);
-                ret = bdrv_co_readv(bs->file,
-                                    sinfo.file_offset >> BDRV_SECTOR_BITS,
-                                    sinfo.sectors_avail, &hd_qiov);
+                ret = bdrv_co_preadv(bs->file, sinfo.file_offset,
+                                     sinfo.sectors_avail * BDRV_SECTOR_SIZE,
+                                     &hd_qiov, 0);
                 qemu_co_mutex_lock(&s->lock);
                 if (ret < 0) {
                     goto exit;
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int vhdx_co_writev(BlockDriverState *bs, int64_t sector_num,
                 }
                 /* block exists, so we can just overwrite it */
                 qemu_co_mutex_unlock(&s->lock);
-                ret = bdrv_co_writev(bs->file,
-                                    sinfo.file_offset >> BDRV_SECTOR_BITS,
-                                    sectors_to_write, &hd_qiov);
+                ret = bdrv_co_pwritev(bs->file, sinfo.file_offset,
+                                      sectors_to_write * BDRV_SECTOR_SIZE,
+                                      &hd_qiov, 0);
                 qemu_co_mutex_lock(&s->lock);
                 if (ret < 0) {
                     goto error_bat_restore;
-- 
2.13.6

From: Eric Blake <eblake@redhat.com>

We are gradually moving away from sector-based interfaces, towards
byte-based.  Now that all callers of vectored I/O have been converted
to use our preferred byte-based bdrv_co_p{read,write}v(), we can
delete the unused bdrv_co_{read,write}v().

Furthermore, this gets rid of the signature difference between the
public bdrv_co_writev() and the callback .bdrv_co_writev (the
latter still exists, because some drivers still need more work
before they are fully byte-based).

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block.h |  4 ----
 block/io.c            | 36 ------------------------------------
 2 files changed, 40 deletions(-)

diff --git a/include/block/block.h b/include/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ int bdrv_pwrite(BdrvChild *child, int64_t offset, const void *buf, int bytes);
 int bdrv_pwritev(BdrvChild *child, int64_t offset, QEMUIOVector *qiov);
 int bdrv_pwrite_sync(BdrvChild *child, int64_t offset,
                      const void *buf, int count);
-int coroutine_fn bdrv_co_readv(BdrvChild *child, int64_t sector_num,
-                               int nb_sectors, QEMUIOVector *qiov);
-int coroutine_fn bdrv_co_writev(BdrvChild *child, int64_t sector_num,
-                               int nb_sectors, QEMUIOVector *qiov);
 /*
  * Efficiently zero a region of the disk image.  Note that this is a regular
  * I/O request like read or write and should have a reasonable size.  This
diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_preadv(BdrvChild *child,
     return ret;
 }
 
-static int coroutine_fn bdrv_co_do_readv(BdrvChild *child,
-    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
-    BdrvRequestFlags flags)
-{
-    if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {
-        return -EINVAL;
-    }
-
-    return bdrv_co_preadv(child, sector_num << BDRV_SECTOR_BITS,
-                          nb_sectors << BDRV_SECTOR_BITS, qiov, flags);
-}
-
-int coroutine_fn bdrv_co_readv(BdrvChild *child, int64_t sector_num,
-                               int nb_sectors, QEMUIOVector *qiov)
-{
-    return bdrv_co_do_readv(child, sector_num, nb_sectors, qiov, 0);
-}
-
 static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,
     int64_t offset, int bytes, BdrvRequestFlags flags)
 {
@@ -XXX,XX +XXX,XX @@ out:
     return ret;
 }
 
-static int coroutine_fn bdrv_co_do_writev(BdrvChild *child,
-    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
-    BdrvRequestFlags flags)
-{
-    if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {
-        return -EINVAL;
-    }
-
-    return bdrv_co_pwritev(child, sector_num << BDRV_SECTOR_BITS,
-                           nb_sectors << BDRV_SECTOR_BITS, qiov, flags);
-}
-
-int coroutine_fn bdrv_co_writev(BdrvChild *child, int64_t sector_num,
-    int nb_sectors, QEMUIOVector *qiov)
-{
-    return bdrv_co_do_writev(child, sector_num, nb_sectors, qiov, 0);
-}
-
 int coroutine_fn bdrv_co_pwrite_zeroes(BdrvChild *child, int64_t offset,
                                        int bytes, BdrvRequestFlags flags)
 {
-- 
2.13.6

The following changes since commit 138d2931979cb7ee4a54a434a54088231f6980ff:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210308' into staging (2021-03-08 11:57:36 +0000)

are available in the Git repository at:

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

for you to fetch changes up to ef2e38a1a1d2915b148c4a49f61626e62c46fbb6:

blockdev: Clarify error messages pertaining to 'node-name' (2021-03-08 14:56:55 +0100)

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

- qemu-storage-daemon: add --pidfile option
- qemu-storage-daemon: CLI error messages include the option name now
- vhost-user-blk export: Misc fixes
- docs: Improvements for qemu-storage-daemon documentation
- parallels: load bitmap extension
- backup-top: Don't crash on post-finalize accesses
- Improve error messages related to node-name options
- iotests improvements

----------------------------------------------------------------
Alberto Garcia (1):
      iotests: Drop deprecated 'props' from object-add

Connor Kuehl (2):
      block: Clarify error messages pertaining to 'node-name'
      blockdev: Clarify error messages pertaining to 'node-name'

Eric Blake (1):
      iotests: Fix up python style in 300

Kevin Wolf (1):
      docs: qsd: Explain --export nbd,name=... default

Max Reitz (3):
      backup: Remove nodes from job in .clean()
      backup-top: Refuse I/O in inactive state
      iotests/283: Check that finalize drops backup-top

Paolo Bonzini (2):
      storage-daemon: report unexpected arguments on the fly
      storage-daemon: include current command line option in the errors

Stefan Hajnoczi (12):
      qemu-storage-daemon: add --pidfile option
      docs: show how to spawn qemu-storage-daemon with fd passing
      docs: replace insecure /tmp examples in qsd docs
      vhost-user-blk: fix blkcfg->num_queues endianness
      libqtest: add qtest_socket_server()
      libqtest: add qtest_kill_qemu()
      libqtest: add qtest_remove_abrt_handler()
      block/export: fix blk_size double byteswap
      block/export: use VIRTIO_BLK_SECTOR_BITS
      block/export: fix vhost-user-blk export sector number calculation
      block/export: port virtio-blk discard/write zeroes input validation
      block/export: port virtio-blk read/write range check

Stefano Garzarella (1):
      blockjob: report a better error message

Vladimir Sementsov-Ogievskiy (7):
      qcow2-bitmap: make bytes_covered_by_bitmap_cluster() public
      parallels.txt: fix bitmap L1 table description
      block/parallels: BDRVParallelsState: add cluster_size field
      parallels: support bitmap extension for read-only mode
      iotests.py: add unarchive_sample_image() helper
      iotests: add parallels-read-bitmap test
      MAINTAINERS: update parallels block driver