Series comparison

-[PULL 0/5] Block patches
+[PULL v2 0/2] Block patches
-The following changes since commit 711c0418c8c1ce3a24346f058b001c4c5a2f0f81:
+The following changes since commit d88d5a3806d78dcfca648c62dae9d88d3e803bd2:
-  Merge remote-tracking branch 'remotes/philmd/tags/mips-20210702' into staging (2021-07-04 14:04:12 +0100)
+  Merge remote-tracking branch 'remotes/philmd-gitlab/tags/renesas-hw-20200622' into staging (2020-06-23 13:55:52 +0100)
 are available in the Git repository at:
-  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
+  https://github.com/XanClic/qemu.git tags/pull-block-2020-06-24
-for you to fetch changes up to 9f460c64e13897117f35ffb61f6f5e0102cabc70:
+for you to fetch changes up to 24b861c0386a17ea31eb824310c21118fb7be883:
-  block/io: Merge discard request alignments (2021-07-06 14:28:55 +0100)
+  iotests: don't test qcow2.py inside 291 (2020-06-24 10:00:04 +0200)
 ----------------------------------------------------------------
-Pull request
+Block patches:
 - Two iotest fixes
 ----------------------------------------------------------------
+This is v2, where I dropped Maxim’s LUKS keyslot amendment series and my
+iotest patches, because both caused iotest failures on some test
+machines.
+----------------------------------------------------------------
+Philippe Mathieu-Daudé (1):
+  iotests: Fix 051 output after qdev_init_nofail() removal
-Akihiko Odaki (3):
+Vladimir Sementsov-Ogievskiy (1):
-  block/file-posix: Optimize for macOS
+  iotests: don't test qcow2.py inside 291
   block: Add backend_defaults property
   block/io: Merge discard request alignments
-Stefan Hajnoczi (2):
+ tests/qemu-iotests/051.pc.out |  4 ++--
-  util/async: add a human-readable name to BHs for debugging
+ tests/qemu-iotests/291        |  4 ----
-  util/async: print leaked BH name when AioContext finalizes
+ tests/qemu-iotests/291.out    | 33 ---------------------------------
+files changed, 2 insertions(+), 39 deletions(-)
  include/block/aio.h            | 31 ++++++++++++++++++++++---
  include/hw/block/block.h       |  3 +++
  include/qemu/main-loop.h       |  4 +++-
  block/file-posix.c             | 27 ++++++++++++++++++++--
  block/io.c                     |  2 ++
  hw/block/block.c               | 42 ++++++++++++++++++++++++++++++----
  tests/unit/ptimer-test-stubs.c |  2 +-
  util/async.c                   | 25 ++++++++++++++++----
  util/main-loop.c               |  4 ++--
  tests/qemu-iotests/172.out     | 38 ++++++++++++++++++++++++++++++
 files changed, 161 insertions(+), 17 deletions(-)
 --
-.31.1
+.26.2

-[PULL 1/5] util/async: add a human-readable name to BHs for debugging
+Deleted patch
-It can be difficult to debug issues with BHs in production environments.
-Although BHs can usually be identified by looking up their ->cb()
-function pointer, this requires debug information for the program. It is
-also not possible to print human-readable diagnostics about BHs because
-they have no identifier.
-This patch adds a name to each BH. The name is not unique per instance
-but differentiates between cb() functions, which is usually enough. It's
-done by changing aio_bh_new() and friends to macros that stringify cb.
-The next patch will use the name field when reporting leaked BHs.
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Message-Id: <20210414200247.917496-2-stefanha@redhat.com>
----
- include/block/aio.h            | 31 ++++++++++++++++++++++++++++---
- include/qemu/main-loop.h       |  4 +++-
- tests/unit/ptimer-test-stubs.c |  2 +-
- util/async.c                   |  9 +++++++--
- util/main-loop.c               |  4 ++--
-files changed, 41 insertions(+), 9 deletions(-)
-diff --git a/include/block/aio.h b/include/block/aio.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/aio.h
-+++ b/include/block/aio.h
-@@ -XXX,XX +XXX,XX @@ void aio_context_acquire(AioContext *ctx);
- /* Relinquish ownership of the AioContext. */
- void aio_context_release(AioContext *ctx);
-+/**
-+ * aio_bh_schedule_oneshot_full: Allocate a new bottom half structure that will
-+ * run only once and as soon as possible.
-+ *
-+ * @name: A human-readable identifier for debugging purposes.
-+ */
-+void aio_bh_schedule_oneshot_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
-+                                  const char *name);
-+
- /**
-  * aio_bh_schedule_oneshot: Allocate a new bottom half structure that will run
-  * only once and as soon as possible.
-+ *
-+ * A convenience wrapper for aio_bh_schedule_oneshot_full() that uses cb as the
-+ * name string.
-  */
--void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
-+#define aio_bh_schedule_oneshot(ctx, cb, opaque) \
-+    aio_bh_schedule_oneshot_full((ctx), (cb), (opaque), (stringify(cb)))
- /**
-- * aio_bh_new: Allocate a new bottom half structure.
-+ * aio_bh_new_full: Allocate a new bottom half structure.
-  *
-  * Bottom halves are lightweight callbacks whose invocation is guaranteed
-  * to be wait-free, thread-safe and signal-safe.  The #QEMUBH structure
-  * is opaque and must be allocated prior to its use.
-+ *
-+ * @name: A human-readable identifier for debugging purposes.
-  */
--QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
-+QEMUBH *aio_bh_new_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
-+                        const char *name);
-+
-+/**
-+ * aio_bh_new: Allocate a new bottom half structure
-+ *
-+ * A convenience wrapper for aio_bh_new_full() that uses the cb as the name
-+ * string.
-+ */
-+#define aio_bh_new(ctx, cb, opaque) \
-+    aio_bh_new_full((ctx), (cb), (opaque), (stringify(cb)))
- /**
-  * aio_notify: Force processing of pending events.
-diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/qemu/main-loop.h
-+++ b/include/qemu/main-loop.h
-@@ -XXX,XX +XXX,XX @@ void qemu_cond_timedwait_iothread(QemuCond *cond, int ms);
- void qemu_fd_register(int fd);
--QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque);
-+#define qemu_bh_new(cb, opaque) \
-+    qemu_bh_new_full((cb), (opaque), (stringify(cb)))
-+QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name);
- void qemu_bh_schedule_idle(QEMUBH *bh);
- enum {
-diff --git a/tests/unit/ptimer-test-stubs.c b/tests/unit/ptimer-test-stubs.c
-index XXXXXXX..XXXXXXX 100644
---- a/tests/unit/ptimer-test-stubs.c
-+++ b/tests/unit/ptimer-test-stubs.c
-@@ -XXX,XX +XXX,XX @@ int64_t qemu_clock_deadline_ns_all(QEMUClockType type, int attr_mask)
-     return deadline;
- }
--QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
-+QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name)
- {
-     QEMUBH *bh = g_new(QEMUBH, 1);
-diff --git a/util/async.c b/util/async.c
-index XXXXXXX..XXXXXXX 100644
---- a/util/async.c
-+++ b/util/async.c
-@@ -XXX,XX +XXX,XX @@ enum {
- struct QEMUBH {
-     AioContext *ctx;
-+    const char *name;
-     QEMUBHFunc *cb;
-     void *opaque;
-     QSLIST_ENTRY(QEMUBH) next;
-@@ -XXX,XX +XXX,XX @@ static QEMUBH *aio_bh_dequeue(BHList *head, unsigned *flags)
-     return bh;
- }
--void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
-+void aio_bh_schedule_oneshot_full(AioContext *ctx, QEMUBHFunc *cb,
-+                                  void *opaque, const char *name)
- {
-     QEMUBH *bh;
-     bh = g_new(QEMUBH, 1);
-@@ -XXX,XX +XXX,XX @@ void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
-         .ctx = ctx,
-         .cb = cb,
-         .opaque = opaque,
-+        .name = name,
-     };
-     aio_bh_enqueue(bh, BH_SCHEDULED | BH_ONESHOT);
- }
--QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
-+QEMUBH *aio_bh_new_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
-+                        const char *name)
- {
-     QEMUBH *bh;
-     bh = g_new(QEMUBH, 1);
-@@ -XXX,XX +XXX,XX @@ QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
-         .ctx = ctx,
-         .cb = cb,
-         .opaque = opaque,
-+        .name = name,
-     };
-     return bh;
- }
-diff --git a/util/main-loop.c b/util/main-loop.c
-index XXXXXXX..XXXXXXX 100644
---- a/util/main-loop.c
-+++ b/util/main-loop.c
-@@ -XXX,XX +XXX,XX @@ void main_loop_wait(int nonblocking)
- /* Functions to operate on the main QEMU AioContext.  */
--QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
-+QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name)
- {
--    return aio_bh_new(qemu_aio_context, cb, opaque);
-+    return aio_bh_new_full(qemu_aio_context, cb, opaque, name);
- }
- /*
---
-.31.1

-[PULL 2/5] util/async: print leaked BH name when AioContext finalizes
+Deleted patch
-BHs must be deleted before the AioContext is finalized. If not, it's a
-bug and probably indicates that some part of the program still expects
-the BH to run in the future. That can lead to memory leaks, inconsistent
-state, or just hangs.
-Unfortunately the assert(flags & BH_DELETED) call in aio_ctx_finalize()
-is difficult to debug because the assertion failure contains no
-information about the BH!
-Use the QEMUBH name field added in the previous patch to show a useful
-error when a leaked BH is detected.
-Suggested-by: Eric Ernst <eric.g.ernst@gmail.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Message-Id: <20210414200247.917496-3-stefanha@redhat.com>
----
- util/async.c | 16 ++++++++++++++--
-file changed, 14 insertions(+), 2 deletions(-)
-diff --git a/util/async.c b/util/async.c
-index XXXXXXX..XXXXXXX 100644
---- a/util/async.c
-+++ b/util/async.c
-@@ -XXX,XX +XXX,XX @@ aio_ctx_finalize(GSource     *source)
-     assert(QSIMPLEQ_EMPTY(&ctx->bh_slice_list));
-     while ((bh = aio_bh_dequeue(&ctx->bh_list, &flags))) {
--        /* qemu_bh_delete() must have been called on BHs in this AioContext */
--        assert(flags & BH_DELETED);
-+        /*
-+         * qemu_bh_delete() must have been called on BHs in this AioContext. In
-+         * many cases memory leaks, hangs, or inconsistent state occur when a
-+         * BH is leaked because something still expects it to run.
-+         *
-+         * If you hit this, fix the lifecycle of the BH so that
-+         * qemu_bh_delete() and any associated cleanup is called before the
-+         * AioContext is finalized.
-+         */
-+        if (unlikely(!(flags & BH_DELETED))) {
-+            fprintf(stderr, "%s: BH '%s' leaked, aborting...\n",
-+                    __func__, bh->name);
-+            abort();
-+        }
-         g_free(bh);
-     }
---
-.31.1

-[PULL 3/5] block/file-posix: Optimize for macOS
+Deleted patch
-From: Akihiko Odaki <akihiko.odaki@gmail.com>
-This commit introduces "punch hole" operation and optimizes transfer
-block size for macOS.
-Thanks to Konstantin Nazarov for detailed analysis of a flaw in an
-old version of this change:
-https://gist.github.com/akihikodaki/87df4149e7ca87f18dc56807ec5a1bc5#gistcomment-3654667
-Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
-Message-id: 20210705130458.97642-1-akihiko.odaki@gmail.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- block/file-posix.c | 27 +++++++++++++++++++++++++--
-file changed, 25 insertions(+), 2 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 @@
- #if defined(HAVE_HOST_BLOCK_DEVICE)
- #include <paths.h>
- #include <sys/param.h>
-+#include <sys/mount.h>
- #include <IOKit/IOKitLib.h>
- #include <IOKit/IOBSD.h>
- #include <IOKit/storage/IOMediaBSDClient.h>
-@@ -XXX,XX +XXX,XX @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp)
-         return;
-     }
-+#if defined(__APPLE__) && (__MACH__)
-+    struct statfs buf;
-+
-+    if (!fstatfs(s->fd, &buf)) {
-+        bs->bl.opt_transfer = buf.f_iosize;
-+        bs->bl.pdiscard_alignment = buf.f_bsize;
-+    }
-+#endif
-+
-     if (bs->sg || S_ISBLK(st.st_mode)) {
-         int ret = hdev_get_max_hw_transfer(s->fd, &st);
-@@ -XXX,XX +XXX,XX @@ out:
-     }
- }
-+#if defined(CONFIG_FALLOCATE) || defined(BLKZEROOUT) || defined(BLKDISCARD)
- static int translate_err(int err)
- {
-     if (err == -ENODEV || err == -ENOSYS || err == -EOPNOTSUPP ||
-@@ -XXX,XX +XXX,XX @@ static int translate_err(int err)
-     }
-     return err;
- }
-+#endif
- #ifdef CONFIG_FALLOCATE
- static int do_fallocate(int fd, int mode, off_t offset, off_t len)
-@@ -XXX,XX +XXX,XX @@ static int handle_aiocb_discard(void *opaque)
-             }
-         } while (errno == EINTR);
--        ret = -errno;
-+        ret = translate_err(-errno);
- #endif
-     } else {
- #ifdef CONFIG_FALLOCATE_PUNCH_HOLE
-         ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
-                            aiocb->aio_offset, aiocb->aio_nbytes);
-+        ret = translate_err(-errno);
-+#elif defined(__APPLE__) && (__MACH__)
-+        fpunchhole_t fpunchhole;
-+        fpunchhole.fp_flags = 0;
-+        fpunchhole.reserved = 0;
-+        fpunchhole.fp_offset = aiocb->aio_offset;
-+        fpunchhole.fp_length = aiocb->aio_nbytes;
-+        if (fcntl(s->fd, F_PUNCHHOLE, &fpunchhole) == -1) {
-+            ret = errno == ENODEV ? -ENOTSUP : -errno;
-+        } else {
-+            ret = 0;
-+        }
- #endif
-     }
--    ret = translate_err(ret);
-     if (ret == -ENOTSUP) {
-         s->has_discard = false;
-     }
---
-.31.1

-[PULL 5/5] block/io: Merge discard request alignments
+[PULL v2 1/2] iotests: Fix 051 output after qdev_init_nofail() removal
-From: Akihiko Odaki <akihiko.odaki@gmail.com>
+From: Philippe Mathieu-Daudé <philmd@redhat.com>
-Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
+Commit 96927c744 replaced qdev_init_nofail() call by
-Message-id: 20210705130458.97642-3-akihiko.odaki@gmail.com
+isa_realize_and_unref() which has a different error
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+message. Update the test output accordingly.
 Gitlab CI error after merging b77b5b3dc7:
 https://gitlab.com/qemu-project/qemu/-/jobs/597414772#L4375
 Reported-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Message-Id: <20200616154949.6586-1-philmd@redhat.com>
 Reviewed-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
- block/io.c | 2 ++
+ tests/qemu-iotests/051.pc.out | 4 ++--
-file changed, 2 insertions(+)
+file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/block/io.c b/block/io.c
+diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
 index XXXXXXX..XXXXXXX 100644
---- a/block/io.c
+--- a/tests/qemu-iotests/051.pc.out
-+++ b/block/io.c
++++ b/tests/qemu-iotests/051.pc.out
-@@ -XXX,XX +XXX,XX @@ void bdrv_parent_drained_begin_single(BdrvChild *c, bool poll)
+@@ -XXX,XX +XXX,XX @@ QEMU X.Y.Z monitor - type 'help' for more information
- static void bdrv_merge_limits(BlockLimits *dst, const BlockLimits *src)
+ Testing: -drive if=ide
- {
+ QEMU X.Y.Z monitor - type 'help' for more information
-+    dst->pdiscard_alignment = MAX(dst->pdiscard_alignment,
+-(qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty
-+                                  src->pdiscard_alignment);
++(qemu) QEMU_PROG: Device needs media, but drive is empty
-     dst->opt_transfer = MAX(dst->opt_transfer, src->opt_transfer);
-     dst->max_transfer = MIN_NON_ZERO(dst->max_transfer, src->max_transfer);
+ Testing: -drive if=virtio
-     dst->max_hw_transfer = MIN_NON_ZERO(dst->max_hw_transfer,
+ QEMU X.Y.Z monitor - type 'help' for more information
@@ -XXX,XX +XXX,XX @@ QEMU X.Y.Z monitor - type 'help' for more information
  Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
  QEMU X.Y.Z monitor - type 'help' for more information
 -(qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only
 +(qemu) QEMU_PROG: Block node is read-only
  Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
  QEMU X.Y.Z monitor - type 'help' for more information
 --
-.31.1
+.26.2

-[PULL 4/5] block: Add backend_defaults property
+[PULL v2 2/2] iotests: don't test qcow2.py inside 291
-From: Akihiko Odaki <akihiko.odaki@gmail.com>
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-backend_defaults property allow users to control if default block
+c6bee534ec3b added testing of qcow2.py into 291, and it breaks 291
-properties should be decided with backend information.
+with external data file. Actually, 291 is bad place for qcow2.py
 testing, better add a separate test.
-If it is off, any backend information will be discarded, which is
+For now, drop qcow2.py testing from 291 to fix the regression.
 suitable if you plan to perform live migration to a different disk backend.
-If it is on, a block device may utilize backend information more
+Fixes: 820c6bee534ec3b
-aggressively.
+Reported-by: Max Reitz <mreitz@redhat.com>
 Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Message-Id: <20200618154052.8629-1-vsementsov@virtuozzo.com>
 Reviewed-by: Eric Blake <eblake@redhat.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
  tests/qemu-iotests/291     |  4 ----
  tests/qemu-iotests/291.out | 33 ---------------------------------
 files changed, 37 deletions(-)
-By default, it is auto, which uses backend information for block
+diff --git a/tests/qemu-iotests/291 b/tests/qemu-iotests/291
-sizes and ignores the others, which is consistent with the older
+index XXXXXXX..XXXXXXX 100755
-versions.
+--- a/tests/qemu-iotests/291
 +++ b/tests/qemu-iotests/291
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c 'w 1M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
  $QEMU_IMG bitmap --disable -f $IMGFMT "$TEST_IMG" b1
  $QEMU_IMG bitmap --enable -f $IMGFMT "$TEST_IMG" b2
  $QEMU_IO -c 'w 2M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
 -echo "Check resulting qcow2 header extensions:"
 -$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
  echo
  echo "=== Bitmap preservation not possible to non-qcow2 ==="
@@ -XXX,XX +XXX,XX @@ $QEMU_IMG bitmap --merge tmp -f $IMGFMT "$TEST_IMG" b0
  $QEMU_IMG bitmap --remove --image-opts \
      driver=$IMGFMT,file.driver=file,file.filename="$TEST_IMG" tmp
  _img_info --format-specific
 -echo "Check resulting qcow2 header extensions:"
 -$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
  echo
  echo "=== Check bitmap contents ==="
 diff --git a/tests/qemu-iotests/291.out b/tests/qemu-iotests/291.out
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/291.out
 +++ b/tests/qemu-iotests/291.out
@@ -XXX,XX +XXX,XX @@ wrote 1048576/1048576 bytes at offset 1048576
 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
  wrote 1048576/1048576 bytes at offset 2097152
 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 -Check resulting qcow2 header extensions:
 -Header extension:
 -magic                     0xe2792aca (Backing format)
 -length                    5
 -data                      'qcow2'
 -
 -Header extension:
 -magic                     0x6803f857 (Feature table)
 -length                    336
 -data                      <binary>
 -
 -Header extension:
 -magic                     0x23852875 (Bitmaps)
 -length                    24
 -nb_bitmaps                2
 -reserved32                0
 -bitmap_directory_size     0x40
 -bitmap_directory_offset   0x510000
 -
  === Bitmap preservation not possible to non-qcow2 ===
@@ -XXX,XX +XXX,XX @@ Format specific information:
              granularity: 65536
      refcount bits: 16
      corrupt: false
 -Check resulting qcow2 header extensions:
 -Header extension:
 -magic                     0x6803f857 (Feature table)
 -length                    336
 -data                      <binary>
 -
 -Header extension:
 -magic                     0x23852875 (Bitmaps)
 -length                    24
 -nb_bitmaps                3
 -reserved32                0
 -bitmap_directory_size     0x60
 -bitmap_directory_offset   0x520000
 -
  === Check bitmap contents ===
 --
 .26.2
-Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
-Message-id: 20210705130458.97642-2-akihiko.odaki@gmail.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- include/hw/block/block.h   |  3 +++
- hw/block/block.c           | 42 ++++++++++++++++++++++++++++++++++----
- tests/qemu-iotests/172.out | 38 ++++++++++++++++++++++++++++++++++
-files changed, 79 insertions(+), 4 deletions(-)
-diff --git a/include/hw/block/block.h b/include/hw/block/block.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/hw/block/block.h
-+++ b/include/hw/block/block.h
-@@ -XXX,XX +XXX,XX @@
- typedef struct BlockConf {
-     BlockBackend *blk;
-+    OnOffAuto backend_defaults;
-     uint32_t physical_block_size;
-     uint32_t logical_block_size;
-     uint32_t min_io_size;
-@@ -XXX,XX +XXX,XX @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)
- }
- #define DEFINE_BLOCK_PROPERTIES_BASE(_state, _conf)                     \
-+    DEFINE_PROP_ON_OFF_AUTO("backend_defaults", _state,                 \
-+                            _conf.backend_defaults, ON_OFF_AUTO_AUTO),  \
-     DEFINE_PROP_BLOCKSIZE("logical_block_size", _state,                 \
-                           _conf.logical_block_size),                    \
-     DEFINE_PROP_BLOCKSIZE("physical_block_size", _state,                \
-diff --git a/hw/block/block.c b/hw/block/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/block/block.c
-+++ b/hw/block/block.c
-@@ -XXX,XX +XXX,XX @@ bool blkconf_blocksizes(BlockConf *conf, Error **errp)
- {
-     BlockBackend *blk = conf->blk;
-     BlockSizes blocksizes;
--    int backend_ret;
-+    BlockDriverState *bs;
-+    bool use_blocksizes;
-+    bool use_bs;
-+
-+    switch (conf->backend_defaults) {
-+    case ON_OFF_AUTO_AUTO:
-+        use_blocksizes = !blk_probe_blocksizes(blk, &blocksizes);
-+        use_bs = false;
-+        break;
-+
-+    case ON_OFF_AUTO_ON:
-+        use_blocksizes = !blk_probe_blocksizes(blk, &blocksizes);
-+        bs = blk_bs(blk);
-+        use_bs = bs;
-+        break;
-+
-+    case ON_OFF_AUTO_OFF:
-+        use_blocksizes = false;
-+        use_bs = false;
-+        break;
-+
-+    default:
-+        abort();
-+    }
--    backend_ret = blk_probe_blocksizes(blk, &blocksizes);
-     /* fill in detected values if they are not defined via qemu command line */
-     if (!conf->physical_block_size) {
--        if (!backend_ret) {
-+        if (use_blocksizes) {
-            conf->physical_block_size = blocksizes.phys;
-         } else {
-             conf->physical_block_size = BDRV_SECTOR_SIZE;
-         }
-     }
-     if (!conf->logical_block_size) {
--        if (!backend_ret) {
-+        if (use_blocksizes) {
-             conf->logical_block_size = blocksizes.log;
-         } else {
-             conf->logical_block_size = BDRV_SECTOR_SIZE;
-         }
-     }
-+    if (use_bs) {
-+        if (!conf->opt_io_size) {
-+            conf->opt_io_size = bs->bl.opt_transfer;
-+        }
-+        if (conf->discard_granularity == -1) {
-+            if (bs->bl.pdiscard_alignment) {
-+                conf->discard_granularity = bs->bl.pdiscard_alignment;
-+            } else if (bs->bl.request_alignment != 1) {
-+                conf->discard_granularity = bs->bl.request_alignment;
-+            }
-+        }
-+    }
-     if (conf->logical_block_size > conf->physical_block_size) {
-         error_setg(errp,
-diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/172.out
-+++ b/tests/qemu-iotests/172.out
-@@ -XXX,XX +XXX,XX @@ Testing:
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "floppy0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "floppy0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2
-               dev: floppy, id ""
-                 unit = 1 (0x1)
-                 drive = "floppy1"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "floppy0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2
-               dev: floppy, id ""
-                 unit = 1 (0x1)
-                 drive = "floppy1"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "floppy0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fdb
-               dev: floppy, id ""
-                 unit = 1 (0x1)
-                 drive = "floppy1"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fdb
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "floppy0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "floppy0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1
-               dev: floppy, id ""
-                 unit = 1 (0x1)
-                 drive = "floppy1"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "floppy0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t
-               dev: floppy, id ""
-                 unit = 1 (0x1)
-                 drive = "floppy1"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "floppy0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,unit=1
-               dev: floppy, id ""
-                 unit = 1 (0x1)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
-               dev: floppy, id ""
-                 unit = 1 (0x1)
-                 drive = "none1"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
-               dev: floppy, id ""
-                 unit = 1 (0x1)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "floppy0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
-               dev: floppy, id ""
-                 unit = 1 (0x1)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "floppy0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
-               dev: floppy, id ""
-                 unit = 1 (0x1)
-                 drive = "floppy1"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
-               dev: floppy, id ""
-                 unit = 1 (0x1)
-                 drive = "floppy1"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
-               dev: floppy, id ""
-                 unit = 1 (0x1)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "floppy0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
-               dev: floppy, id ""
-                 unit = 1 (0x1)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "floppy0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -global floppy.drive=none0 -device
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -device floppy
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = ""
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -device floppy,drive-type=120
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = ""
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -device floppy,drive-type=144
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = ""
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -device floppy,drive-type=288
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = ""
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,logical
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
-@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physica
-               dev: floppy, id ""
-                 unit = 0 (0x0)
-                 drive = "none0"
-+                backend_defaults = "auto"
-                 logical_block_size = 512 (512 B)
-                 physical_block_size = 512 (512 B)
-                 min_io_size = 0 (0 B)
---
-.31.1

The following changes since commit 711c0418c8c1ce3a24346f058b001c4c5a2f0f81:

Merge remote-tracking branch 'remotes/philmd/tags/mips-20210702' into staging (2021-07-04 14:04:12 +0100)

are available in the Git repository at:

https://gitlab.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 9f460c64e13897117f35ffb61f6f5e0102cabc70:

block/io: Merge discard request alignments (2021-07-06 14:28:55 +0100)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

Akihiko Odaki (3):
  block/file-posix: Optimize for macOS
  block: Add backend_defaults property
  block/io: Merge discard request alignments

Stefan Hajnoczi (2):
  util/async: add a human-readable name to BHs for debugging
  util/async: print leaked BH name when AioContext finalizes

-- 
2.31.1

It can be difficult to debug issues with BHs in production environments.
Although BHs can usually be identified by looking up their ->cb()
function pointer, this requires debug information for the program. It is
also not possible to print human-readable diagnostics about BHs because
they have no identifier.

This patch adds a name to each BH. The name is not unique per instance
but differentiates between cb() functions, which is usually enough. It's
done by changing aio_bh_new() and friends to macros that stringify cb.

The next patch will use the name field when reporting leaked BHs.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210414200247.917496-2-stefanha@redhat.com>
---
 include/block/aio.h            | 31 ++++++++++++++++++++++++++++---
 include/qemu/main-loop.h       |  4 +++-
 tests/unit/ptimer-test-stubs.c |  2 +-
 util/async.c                   |  9 +++++++--
 util/main-loop.c               |  4 ++--
 5 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/include/block/aio.h b/include/block/aio.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -XXX,XX +XXX,XX @@ void aio_context_acquire(AioContext *ctx);
 /* Relinquish ownership of the AioContext. */
 void aio_context_release(AioContext *ctx);
 
+/**
+ * aio_bh_schedule_oneshot_full: Allocate a new bottom half structure that will
+ * run only once and as soon as possible.
+ *
+ * @name: A human-readable identifier for debugging purposes.
+ */
+void aio_bh_schedule_oneshot_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
+                                  const char *name);
+
 /**
  * aio_bh_schedule_oneshot: Allocate a new bottom half structure that will run
  * only once and as soon as possible.
+ *
+ * A convenience wrapper for aio_bh_schedule_oneshot_full() that uses cb as the
+ * name string.
  */
-void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
+#define aio_bh_schedule_oneshot(ctx, cb, opaque) \
+    aio_bh_schedule_oneshot_full((ctx), (cb), (opaque), (stringify(cb)))
 
 /**
- * aio_bh_new: Allocate a new bottom half structure.
+ * aio_bh_new_full: Allocate a new bottom half structure.
  *
  * Bottom halves are lightweight callbacks whose invocation is guaranteed
  * to be wait-free, thread-safe and signal-safe.  The #QEMUBH structure
  * is opaque and must be allocated prior to its use.
+ *
+ * @name: A human-readable identifier for debugging purposes.
  */
-QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
+QEMUBH *aio_bh_new_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
+                        const char *name);
+
+/**
+ * aio_bh_new: Allocate a new bottom half structure
+ *
+ * A convenience wrapper for aio_bh_new_full() that uses the cb as the name
+ * string.
+ */
+#define aio_bh_new(ctx, cb, opaque) \
+    aio_bh_new_full((ctx), (cb), (opaque), (stringify(cb)))
 
 /**
  * aio_notify: Force processing of pending events.
diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/main-loop.h
+++ b/include/qemu/main-loop.h
@@ -XXX,XX +XXX,XX @@ void qemu_cond_timedwait_iothread(QemuCond *cond, int ms);
 
 void qemu_fd_register(int fd);
 
-QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque);
+#define qemu_bh_new(cb, opaque) \
+    qemu_bh_new_full((cb), (opaque), (stringify(cb)))
+QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name);
 void qemu_bh_schedule_idle(QEMUBH *bh);
 
 enum {
diff --git a/tests/unit/ptimer-test-stubs.c b/tests/unit/ptimer-test-stubs.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/unit/ptimer-test-stubs.c
+++ b/tests/unit/ptimer-test-stubs.c
@@ -XXX,XX +XXX,XX @@ int64_t qemu_clock_deadline_ns_all(QEMUClockType type, int attr_mask)
     return deadline;
 }
 
-QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
+QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name)
 {
     QEMUBH *bh = g_new(QEMUBH, 1);
 
diff --git a/util/async.c b/util/async.c
index XXXXXXX..XXXXXXX 100644
--- a/util/async.c
+++ b/util/async.c
@@ -XXX,XX +XXX,XX @@ enum {
 
 struct QEMUBH {
     AioContext *ctx;
+    const char *name;
     QEMUBHFunc *cb;
     void *opaque;
     QSLIST_ENTRY(QEMUBH) next;
@@ -XXX,XX +XXX,XX @@ static QEMUBH *aio_bh_dequeue(BHList *head, unsigned *flags)
     return bh;
 }
 
-void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
+void aio_bh_schedule_oneshot_full(AioContext *ctx, QEMUBHFunc *cb,
+                                  void *opaque, const char *name)
 {
     QEMUBH *bh;
     bh = g_new(QEMUBH, 1);
@@ -XXX,XX +XXX,XX @@ void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
         .ctx = ctx,
         .cb = cb,
         .opaque = opaque,
+        .name = name,
     };
     aio_bh_enqueue(bh, BH_SCHEDULED | BH_ONESHOT);
 }
 
-QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
+QEMUBH *aio_bh_new_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
+                        const char *name)
 {
     QEMUBH *bh;
     bh = g_new(QEMUBH, 1);
@@ -XXX,XX +XXX,XX @@ QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
         .ctx = ctx,
         .cb = cb,
         .opaque = opaque,
+        .name = name,
     };
     return bh;
 }
diff --git a/util/main-loop.c b/util/main-loop.c
index XXXXXXX..XXXXXXX 100644
--- a/util/main-loop.c
+++ b/util/main-loop.c
@@ -XXX,XX +XXX,XX @@ void main_loop_wait(int nonblocking)
 
 /* Functions to operate on the main QEMU AioContext.  */
 
-QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
+QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name)
 {
-    return aio_bh_new(qemu_aio_context, cb, opaque);
+    return aio_bh_new_full(qemu_aio_context, cb, opaque, name);
 }
 
 /*
-- 
2.31.1

BHs must be deleted before the AioContext is finalized. If not, it's a
bug and probably indicates that some part of the program still expects
the BH to run in the future. That can lead to memory leaks, inconsistent
state, or just hangs.

Unfortunately the assert(flags & BH_DELETED) call in aio_ctx_finalize()
is difficult to debug because the assertion failure contains no
information about the BH!

Use the QEMUBH name field added in the previous patch to show a useful
error when a leaked BH is detected.

Suggested-by: Eric Ernst <eric.g.ernst@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210414200247.917496-3-stefanha@redhat.com>
---
 util/async.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/util/async.c b/util/async.c
index XXXXXXX..XXXXXXX 100644
--- a/util/async.c
+++ b/util/async.c
@@ -XXX,XX +XXX,XX @@ aio_ctx_finalize(GSource     *source)
     assert(QSIMPLEQ_EMPTY(&ctx->bh_slice_list));
 
     while ((bh = aio_bh_dequeue(&ctx->bh_list, &flags))) {
-        /* qemu_bh_delete() must have been called on BHs in this AioContext */
-        assert(flags & BH_DELETED);
+        /*
+         * qemu_bh_delete() must have been called on BHs in this AioContext. In
+         * many cases memory leaks, hangs, or inconsistent state occur when a
+         * BH is leaked because something still expects it to run.
+         *
+         * If you hit this, fix the lifecycle of the BH so that
+         * qemu_bh_delete() and any associated cleanup is called before the
+         * AioContext is finalized.
+         */
+        if (unlikely(!(flags & BH_DELETED))) {
+            fprintf(stderr, "%s: BH '%s' leaked, aborting...\n",
+                    __func__, bh->name);
+            abort();
+        }
 
         g_free(bh);
     }
-- 
2.31.1

From: Akihiko Odaki <akihiko.odaki@gmail.com>

This commit introduces "punch hole" operation and optimizes transfer
block size for macOS.

Thanks to Konstantin Nazarov for detailed analysis of a flaw in an
old version of this change:
https://gist.github.com/akihikodaki/87df4149e7ca87f18dc56807ec5a1bc5#gistcomment-3654667

Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Message-id: 20210705130458.97642-1-akihiko.odaki@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/file-posix.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 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 @@
 #if defined(HAVE_HOST_BLOCK_DEVICE)
 #include <paths.h>
 #include <sys/param.h>
+#include <sys/mount.h>
 #include <IOKit/IOKitLib.h>
 #include <IOKit/IOBSD.h>
 #include <IOKit/storage/IOMediaBSDClient.h>
@@ -XXX,XX +XXX,XX @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp)
         return;
     }
 
+#if defined(__APPLE__) && (__MACH__)
+    struct statfs buf;
+
+    if (!fstatfs(s->fd, &buf)) {
+        bs->bl.opt_transfer = buf.f_iosize;
+        bs->bl.pdiscard_alignment = buf.f_bsize;
+    }
+#endif
+
     if (bs->sg || S_ISBLK(st.st_mode)) {
         int ret = hdev_get_max_hw_transfer(s->fd, &st);
 
@@ -XXX,XX +XXX,XX @@ out:
     }
 }
 
+#if defined(CONFIG_FALLOCATE) || defined(BLKZEROOUT) || defined(BLKDISCARD)
 static int translate_err(int err)
 {
     if (err == -ENODEV || err == -ENOSYS || err == -EOPNOTSUPP ||
@@ -XXX,XX +XXX,XX @@ static int translate_err(int err)
     }
     return err;
 }
+#endif
 
 #ifdef CONFIG_FALLOCATE
 static int do_fallocate(int fd, int mode, off_t offset, off_t len)
@@ -XXX,XX +XXX,XX @@ static int handle_aiocb_discard(void *opaque)
             }
         } while (errno == EINTR);
 
-        ret = -errno;
+        ret = translate_err(-errno);
 #endif
     } else {
 #ifdef CONFIG_FALLOCATE_PUNCH_HOLE
         ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
                            aiocb->aio_offset, aiocb->aio_nbytes);
+        ret = translate_err(-errno);
+#elif defined(__APPLE__) && (__MACH__)
+        fpunchhole_t fpunchhole;
+        fpunchhole.fp_flags = 0;
+        fpunchhole.reserved = 0;
+        fpunchhole.fp_offset = aiocb->aio_offset;
+        fpunchhole.fp_length = aiocb->aio_nbytes;
+        if (fcntl(s->fd, F_PUNCHHOLE, &fpunchhole) == -1) {
+            ret = errno == ENODEV ? -ENOTSUP : -errno;
+        } else {
+            ret = 0;
+        }
 #endif
     }
 
-    ret = translate_err(ret);
     if (ret == -ENOTSUP) {
         s->has_discard = false;
     }
-- 
2.31.1

From: Akihiko Odaki <akihiko.odaki@gmail.com>

backend_defaults property allow users to control if default block
properties should be decided with backend information.

If it is off, any backend information will be discarded, which is
suitable if you plan to perform live migration to a different disk backend.

If it is on, a block device may utilize backend information more
aggressively.

By default, it is auto, which uses backend information for block
sizes and ignores the others, which is consistent with the older
versions.

Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Message-id: 20210705130458.97642-2-akihiko.odaki@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/hw/block/block.h   |  3 +++
 hw/block/block.c           | 42 ++++++++++++++++++++++++++++++++++----
 tests/qemu-iotests/172.out | 38 ++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/include/hw/block/block.h b/include/hw/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/block/block.h
+++ b/include/hw/block/block.h
@@ -XXX,XX +XXX,XX @@
 
 typedef struct BlockConf {
     BlockBackend *blk;
+    OnOffAuto backend_defaults;
     uint32_t physical_block_size;
     uint32_t logical_block_size;
     uint32_t min_io_size;
@@ -XXX,XX +XXX,XX @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)
 }
 
 #define DEFINE_BLOCK_PROPERTIES_BASE(_state, _conf)                     \
+    DEFINE_PROP_ON_OFF_AUTO("backend_defaults", _state,                 \
+                            _conf.backend_defaults, ON_OFF_AUTO_AUTO),  \
     DEFINE_PROP_BLOCKSIZE("logical_block_size", _state,                 \
                           _conf.logical_block_size),                    \
     DEFINE_PROP_BLOCKSIZE("physical_block_size", _state,                \
diff --git a/hw/block/block.c b/hw/block/block.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/block.c
+++ b/hw/block/block.c
@@ -XXX,XX +XXX,XX @@ bool blkconf_blocksizes(BlockConf *conf, Error **errp)
 {
     BlockBackend *blk = conf->blk;
     BlockSizes blocksizes;
-    int backend_ret;
+    BlockDriverState *bs;
+    bool use_blocksizes;
+    bool use_bs;
+
+    switch (conf->backend_defaults) {
+    case ON_OFF_AUTO_AUTO:
+        use_blocksizes = !blk_probe_blocksizes(blk, &blocksizes);
+        use_bs = false;
+        break;
+
+    case ON_OFF_AUTO_ON:
+        use_blocksizes = !blk_probe_blocksizes(blk, &blocksizes);
+        bs = blk_bs(blk);
+        use_bs = bs;
+        break;
+
+    case ON_OFF_AUTO_OFF:
+        use_blocksizes = false;
+        use_bs = false;
+        break;
+
+    default:
+        abort();
+    }
 
-    backend_ret = blk_probe_blocksizes(blk, &blocksizes);
     /* fill in detected values if they are not defined via qemu command line */
     if (!conf->physical_block_size) {
-        if (!backend_ret) {
+        if (use_blocksizes) {
            conf->physical_block_size = blocksizes.phys;
         } else {
             conf->physical_block_size = BDRV_SECTOR_SIZE;
         }
     }
     if (!conf->logical_block_size) {
-        if (!backend_ret) {
+        if (use_blocksizes) {
             conf->logical_block_size = blocksizes.log;
         } else {
             conf->logical_block_size = BDRV_SECTOR_SIZE;
         }
     }
+    if (use_bs) {
+        if (!conf->opt_io_size) {
+            conf->opt_io_size = bs->bl.opt_transfer;
+        }
+        if (conf->discard_granularity == -1) {
+            if (bs->bl.pdiscard_alignment) {
+                conf->discard_granularity = bs->bl.pdiscard_alignment;
+            } else if (bs->bl.request_alignment != 1) {
+                conf->discard_granularity = bs->bl.request_alignment;
+            }
+        }
+    }
 
     if (conf->logical_block_size > conf->physical_block_size) {
         error_setg(errp,
diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/172.out
+++ b/tests/qemu-iotests/172.out
@@ -XXX,XX +XXX,XX @@ Testing:
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,unit=1
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "none1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -global floppy.drive=none0 -device
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -device floppy
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = ""
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -device floppy,drive-type=120
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = ""
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -device floppy,drive-type=144
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = ""
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -device floppy,drive-type=288
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = ""
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,logical
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physica
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
-- 
2.31.1

The following changes since commit d88d5a3806d78dcfca648c62dae9d88d3e803bd2:

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/renesas-hw-20200622' into staging (2020-06-23 13:55:52 +0100)

are available in the Git repository at:

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

for you to fetch changes up to 24b861c0386a17ea31eb824310c21118fb7be883:

iotests: don't test qcow2.py inside 291 (2020-06-24 10:00:04 +0200)

----------------------------------------------------------------
Block patches:
- Two iotest fixes

----------------------------------------------------------------
This is v2, where I dropped Maxim’s LUKS keyslot amendment series and my
iotest patches, because both caused iotest failures on some test
machines.
----------------------------------------------------------------
Philippe Mathieu-Daudé (1):
  iotests: Fix 051 output after qdev_init_nofail() removal

Vladimir Sementsov-Ogievskiy (1):
  iotests: don't test qcow2.py inside 291

tests/qemu-iotests/051.pc.out |  4 ++--
 tests/qemu-iotests/291        |  4 ----
 tests/qemu-iotests/291.out    | 33 ---------------------------------
 3 files changed, 2 insertions(+), 39 deletions(-)

-- 
2.26.2

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

Commit 96927c744 replaced qdev_init_nofail() call by
isa_realize_and_unref() which has a different error
message. Update the test output accordingly.

Gitlab CI error after merging b77b5b3dc7:
https://gitlab.com/qemu-project/qemu/-/jobs/597414772#L4375

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200616154949.6586-1-philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/051.pc.out | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/051.pc.out
+++ b/tests/qemu-iotests/051.pc.out
@@ -XXX,XX +XXX,XX @@ QEMU X.Y.Z monitor - type 'help' for more information
 
 Testing: -drive if=ide
 QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty
+(qemu) QEMU_PROG: Device needs media, but drive is empty
 
 Testing: -drive if=virtio
 QEMU X.Y.Z monitor - type 'help' for more information
@@ -XXX,XX +XXX,XX @@ QEMU X.Y.Z monitor - type 'help' for more information
 
 Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
 QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only
+(qemu) QEMU_PROG: Block node is read-only
 
 Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
 QEMU X.Y.Z monitor - type 'help' for more information
-- 
2.26.2

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

820c6bee534ec3b added testing of qcow2.py into 291, and it breaks 291
with external data file. Actually, 291 is bad place for qcow2.py
testing, better add a separate test.

For now, drop qcow2.py testing from 291 to fix the regression.

Fixes: 820c6bee534ec3b
Reported-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200618154052.8629-1-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/291     |  4 ----
 tests/qemu-iotests/291.out | 33 ---------------------------------
 2 files changed, 37 deletions(-)

diff --git a/tests/qemu-iotests/291 b/tests/qemu-iotests/291
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/291
+++ b/tests/qemu-iotests/291
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c 'w 1M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG bitmap --disable -f $IMGFMT "$TEST_IMG" b1
 $QEMU_IMG bitmap --enable -f $IMGFMT "$TEST_IMG" b2
 $QEMU_IO -c 'w 2M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
-echo "Check resulting qcow2 header extensions:"
-$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
 
 echo
 echo "=== Bitmap preservation not possible to non-qcow2 ==="
@@ -XXX,XX +XXX,XX @@ $QEMU_IMG bitmap --merge tmp -f $IMGFMT "$TEST_IMG" b0
 $QEMU_IMG bitmap --remove --image-opts \
     driver=$IMGFMT,file.driver=file,file.filename="$TEST_IMG" tmp
 _img_info --format-specific
-echo "Check resulting qcow2 header extensions:"
-$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
 
 echo
 echo "=== Check bitmap contents ==="
diff --git a/tests/qemu-iotests/291.out b/tests/qemu-iotests/291.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/291.out
+++ b/tests/qemu-iotests/291.out
@@ -XXX,XX +XXX,XX @@ wrote 1048576/1048576 bytes at offset 1048576
 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 wrote 1048576/1048576 bytes at offset 2097152
 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-Check resulting qcow2 header extensions:
-Header extension:
-magic                     0xe2792aca (Backing format)
-length                    5
-data                      'qcow2'
-
-Header extension:
-magic                     0x6803f857 (Feature table)
-length                    336
-data                      <binary>
-
-Header extension:
-magic                     0x23852875 (Bitmaps)
-length                    24
-nb_bitmaps                2
-reserved32                0
-bitmap_directory_size     0x40
-bitmap_directory_offset   0x510000
-
 
 === Bitmap preservation not possible to non-qcow2 ===
 
@@ -XXX,XX +XXX,XX @@ Format specific information:
             granularity: 65536
     refcount bits: 16
     corrupt: false
-Check resulting qcow2 header extensions:
-Header extension:
-magic                     0x6803f857 (Feature table)
-length                    336
-data                      <binary>
-
-Header extension:
-magic                     0x23852875 (Bitmaps)
-length                    24
-nb_bitmaps                3
-reserved32                0
-bitmap_directory_size     0x60
-bitmap_directory_offset   0x520000
-
 
 === Check bitmap contents ===
 
-- 
2.26.2