Series comparison

-[Qemu-devel] [PULL 0/2] Block layer patches
+[PULL v2 00/23] Block layer patches
-The following changes since commit f55a585d1037e5de6088f25e75443c2776786e29:
+The following changes since commit 825b96dbcee23d134b691fc75618b59c5f53da32:
-  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2019-04-07 14:54:55 +0100)
+  Merge tag 'migration-20250310-pull-request' of https://gitlab.com/farosas/qemu into staging (2025-03-11 09:32:07 +0800)
 are available in the Git repository at:
-  git://repo.or.cz/qemu/kevin.git tags/for-upstream
+  https://repo.or.cz/qemu/kevin.git tags/for-upstream
-for you to fetch changes up to ab63817119b03b95f7dce6fae036e6d063ad63fb:
+for you to fetch changes up to df957115c46845e2c0ccc29ac0a75eb9700a9a0d:
-  hmp: Fix drive_add ... format=help crash (2019-04-08 17:42:06 +0200)
+  scripts/qcow2-to-stdout.py: Add script to write qcow2 images to stdout (2025-03-13 17:57:23 +0100)
 ----------------------------------------------------------------
-Block layer patches:
+Block layer patches
-- hmp: Fix drive_add ... format=help crash
+- virtio-scsi: add iothread-vq-mapping parameter
-- block: Forward 'discard' to temporary overlay
+- Improve writethrough performance
 - Fix missing zero init in bdrv_snapshot_goto()
 - Added scripts/qcow2-to-stdout.py
 - Code cleanup and iotests fixes
 ----------------------------------------------------------------
-Kevin Wolf (1):
+Alberto Garcia (1):
-      block: Forward 'discard' to temporary overlay
+      scripts/qcow2-to-stdout.py: Add script to write qcow2 images to stdout
-Markus Armbruster (1):
+Kevin Wolf (8):
-      hmp: Fix drive_add ... format=help crash
+      block: Remove unused blk_op_is_blocked()
       block: Zero block driver state before reopening
       file-posix: Support FUA writes
       block/io: Ignore FUA with cache.no-flush=on
       aio: Create AioPolledEvent
       aio-posix: Factor out adjust_polling_time()
       aio-posix: Separate AioPolledEvent per AioHandler
       aio-posix: Adjust polling time also for new handlers
- block.c          | 3 ++-
+Stefan Hajnoczi (13):
- device-hotplug.c | 2 +-
+      scsi-disk: drop unused SCSIDiskState->bh field
- tests/test-hmp.c | 1 +
+      dma: use current AioContext for dma_blk_io()
-files changed, 4 insertions(+), 2 deletions(-)
+      scsi: track per-SCSIRequest AioContext
       scsi: introduce requests_lock
       virtio-scsi: introduce event and ctrl virtqueue locks
       virtio-scsi: protect events_dropped field
       virtio-scsi: perform TMFs in appropriate AioContexts
       virtio-blk: extract cleanup_iothread_vq_mapping() function
       virtio-blk: tidy up iothread_vq_mapping functions
       virtio: extract iothread-vq-mapping.h API
       virtio-scsi: add iothread-vq-mapping parameter
       virtio-scsi: handle ctrl virtqueue in main loop
       virtio-scsi: only expose cmd vqs via iothread-vq-mapping
+Thomas Huth (1):
+      iotests: Limit qsd-migrate to working formats
+ include/block/aio.h                         |   5 +-
+ include/block/raw-aio.h                     |  19 +-
+ include/hw/scsi/scsi.h                      |   8 +-
+ include/hw/virtio/iothread-vq-mapping.h     |  45 +++
+ include/hw/virtio/virtio-scsi.h             |  15 +-
+ include/system/block-backend-global-state.h |   1 -
+ include/system/dma.h                        |   3 +-
+ util/aio-posix.h                            |   1 +
+ block/block-backend.c                       |  12 -
+ block/file-posix.c                          |  29 +-
+ block/io.c                                  |   4 +
+ block/io_uring.c                            |  25 +-
+ block/linux-aio.c                           |  25 +-
+ block/snapshot.c                            |   1 +
+ hw/block/virtio-blk.c                       | 132 +-------
+ hw/ide/core.c                               |   3 +-
+ hw/ide/macio.c                              |   3 +-
+ hw/scsi/scsi-bus.c                          | 121 +++++--
+ hw/scsi/scsi-disk.c                         |  24 +-
+ hw/scsi/virtio-scsi-dataplane.c             | 103 ++++--
+ hw/scsi/virtio-scsi.c                       | 502 ++++++++++++++++------------
+ hw/virtio/iothread-vq-mapping.c             | 131 ++++++++
+ system/dma-helpers.c                        |   8 +-
+ util/aio-posix.c                            | 114 ++++---
+ util/async.c                                |   1 -
+ scripts/qcow2-to-stdout.py                  | 449 +++++++++++++++++++++++++
+ hw/virtio/meson.build                       |   1 +
+ meson.build                                 |   8 +
+ tests/qemu-iotests/051.pc.out               |   2 +-
+ tests/qemu-iotests/tests/qsd-migrate        |   2 +-
+files changed, 1286 insertions(+), 511 deletions(-)
+ create mode 100644 include/hw/virtio/iothread-vq-mapping.h
+ create mode 100644 hw/virtio/iothread-vq-mapping.c
+ create mode 100755 scripts/qcow2-to-stdout.py

-[Qemu-devel] [PULL 1/2] block: Forward 'discard' to temporary overlay
+Deleted patch
-When bdrv_temp_snapshot_options() is called for snapshot=on, the
-'discard' option in the options QDict hasn't been parsed and merged into
-the flags yet. So copy the dict entry to make sure that the temporary
-overlay enables discard when it was requested for the drive.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
----
- block.c | 3 ++-
-file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ static void bdrv_temp_snapshot_options(int *child_flags, QDict *child_options,
-     qdict_set_default_str(child_options, BDRV_OPT_CACHE_DIRECT, "off");
-     qdict_set_default_str(child_options, BDRV_OPT_CACHE_NO_FLUSH, "on");
--    /* Copy the read-only option from the parent */
-+    /* Copy the read-only and discard options from the parent */
-     qdict_copy_default(child_options, parent_options, BDRV_OPT_READ_ONLY);
-+    qdict_copy_default(child_options, parent_options, BDRV_OPT_DISCARD);
-     /* aio=native doesn't work for cache.direct=off, so disable it for the
-      * temporary snapshot */
---
-.20.1

-[Qemu-devel] [PULL 2/2] hmp: Fix drive_add ... format=help crash
+Deleted patch
-From: Markus Armbruster <armbru@redhat.com>
-drive_new() returns null without setting an error when it provided
-help.  add_init_drive() assumes null means failure, and crashes trying
-to report a null error.
-Fixes: c4f26c9f37ce511e5fe629c21c180dc6eb7c5a25
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Markus Armbruster <armbru@redhat.com>
-Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- device-hotplug.c | 2 +-
- tests/test-hmp.c | 1 +
-files changed, 2 insertions(+), 1 deletion(-)
-diff --git a/device-hotplug.c b/device-hotplug.c
-index XXXXXXX..XXXXXXX 100644
---- a/device-hotplug.c
-+++ b/device-hotplug.c
-@@ -XXX,XX +XXX,XX @@ static DriveInfo *add_init_drive(const char *optstr)
-     mc = MACHINE_GET_CLASS(current_machine);
-     dinfo = drive_new(opts, mc->block_default_type, &err);
--    if (!dinfo) {
-+    if (err) {
-         error_report_err(err);
-         qemu_opts_del(opts);
-         return NULL;
-diff --git a/tests/test-hmp.c b/tests/test-hmp.c
-index XXXXXXX..XXXXXXX 100644
---- a/tests/test-hmp.c
-+++ b/tests/test-hmp.c
-@@ -XXX,XX +XXX,XX @@ static const char *hmp_cmds[] = {
-     "cpu 0",
-     "device_add ?",
-     "device_add usb-mouse,id=mouse1",
-+    "drive_add ignored format=help",
-     "mouse_button 7",
-     "mouse_move 10 10",
-     "mouse_button 0",
---
-.20.1

When bdrv_temp_snapshot_options() is called for snapshot=on, the
'discard' option in the options QDict hasn't been parsed and merged into
the flags yet. So copy the dict entry to make sure that the temporary
overlay enables discard when it was requested for the drive.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
---
 block.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ static void bdrv_temp_snapshot_options(int *child_flags, QDict *child_options,
     qdict_set_default_str(child_options, BDRV_OPT_CACHE_DIRECT, "off");
     qdict_set_default_str(child_options, BDRV_OPT_CACHE_NO_FLUSH, "on");
 
-    /* Copy the read-only option from the parent */
+    /* Copy the read-only and discard options from the parent */
     qdict_copy_default(child_options, parent_options, BDRV_OPT_READ_ONLY);
+    qdict_copy_default(child_options, parent_options, BDRV_OPT_DISCARD);
 
     /* aio=native doesn't work for cache.direct=off, so disable it for the
      * temporary snapshot */
-- 
2.20.1

From: Markus Armbruster <armbru@redhat.com>

drive_new() returns null without setting an error when it provided
help.  add_init_drive() assumes null means failure, and crashes trying
to report a null error.

Fixes: c4f26c9f37ce511e5fe629c21c180dc6eb7c5a25
Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 device-hotplug.c | 2 +-
 tests/test-hmp.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/device-hotplug.c b/device-hotplug.c
index XXXXXXX..XXXXXXX 100644
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -XXX,XX +XXX,XX @@ static DriveInfo *add_init_drive(const char *optstr)
 
     mc = MACHINE_GET_CLASS(current_machine);
     dinfo = drive_new(opts, mc->block_default_type, &err);
-    if (!dinfo) {
+    if (err) {
         error_report_err(err);
         qemu_opts_del(opts);
         return NULL;
diff --git a/tests/test-hmp.c b/tests/test-hmp.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/test-hmp.c
+++ b/tests/test-hmp.c
@@ -XXX,XX +XXX,XX @@ static const char *hmp_cmds[] = {
     "cpu 0",
     "device_add ?",
     "device_add usb-mouse,id=mouse1",
+    "drive_add ignored format=help",
     "mouse_button 7",
     "mouse_move 10 10",
     "mouse_button 0",
-- 
2.20.1

The following changes since commit 825b96dbcee23d134b691fc75618b59c5f53da32:

Merge tag 'migration-20250310-pull-request' of https://gitlab.com/farosas/qemu into staging (2025-03-11 09:32:07 +0800)

are available in the Git repository at:

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

for you to fetch changes up to df957115c46845e2c0ccc29ac0a75eb9700a9a0d:

scripts/qcow2-to-stdout.py: Add script to write qcow2 images to stdout (2025-03-13 17:57:23 +0100)

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

- virtio-scsi: add iothread-vq-mapping parameter
- Improve writethrough performance
- Fix missing zero init in bdrv_snapshot_goto()
- Added scripts/qcow2-to-stdout.py
- Code cleanup and iotests fixes

----------------------------------------------------------------
Alberto Garcia (1):
      scripts/qcow2-to-stdout.py: Add script to write qcow2 images to stdout

Kevin Wolf (8):
      block: Remove unused blk_op_is_blocked()
      block: Zero block driver state before reopening
      file-posix: Support FUA writes
      block/io: Ignore FUA with cache.no-flush=on
      aio: Create AioPolledEvent
      aio-posix: Factor out adjust_polling_time()
      aio-posix: Separate AioPolledEvent per AioHandler
      aio-posix: Adjust polling time also for new handlers

Stefan Hajnoczi (13):
      scsi-disk: drop unused SCSIDiskState->bh field
      dma: use current AioContext for dma_blk_io()
      scsi: track per-SCSIRequest AioContext
      scsi: introduce requests_lock
      virtio-scsi: introduce event and ctrl virtqueue locks
      virtio-scsi: protect events_dropped field
      virtio-scsi: perform TMFs in appropriate AioContexts
      virtio-blk: extract cleanup_iothread_vq_mapping() function
      virtio-blk: tidy up iothread_vq_mapping functions
      virtio: extract iothread-vq-mapping.h API
      virtio-scsi: add iothread-vq-mapping parameter
      virtio-scsi: handle ctrl virtqueue in main loop
      virtio-scsi: only expose cmd vqs via iothread-vq-mapping

Thomas Huth (1):
      iotests: Limit qsd-migrate to working formats