Series comparison

-[PULL 0/5] Block patches
+[PULL 0/2] Block patches
-The following changes since commit 711c0418c8c1ce3a24346f058b001c4c5a2f0f81:
+The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def:
-  Merge remote-tracking branch 'remotes/philmd/tags/mips-20210702' into staging (2021-07-04 14:04:12 +0100)
+  Merge remote-tracking branch 'remotes/quic/tags/pull-hex-20211006' into staging (2021-10-06 12:11:14 -0700)
 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:
+for you to fetch changes up to 1cc7eada97914f090125e588497986f6f7900514:
-  block/io: Merge discard request alignments (2021-07-06 14:28:55 +0100)
+  iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100)
 ----------------------------------------------------------------
 Pull request
 ----------------------------------------------------------------
-Akihiko Odaki (3):
+Stefano Garzarella (2):
-  block/file-posix: Optimize for macOS
+  iothread: rename PollParamInfo to IOThreadParamInfo
-  block: Add backend_defaults property
+  iothread: use IOThreadParamInfo in iothread_[set|get]_param()
   block/io: Merge discard request alignments
-Stefan Hajnoczi (2):
+ iothread.c | 28 +++++++++++++++-------------
-  util/async: add a human-readable name to BHs for debugging
+file changed, 15 insertions(+), 13 deletions(-)
   util/async: print leaked BH name when AioContext finalizes
  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

-[PULL 5/5] block/io: Merge discard request alignments
+[PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo
-From: Akihiko Odaki <akihiko.odaki@gmail.com>
+From: Stefano Garzarella <sgarzare@redhat.com>
-Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
+Commit 1793ad0247 ("iothread: add aio-max-batch parameter") added
-Message-id: 20210705130458.97642-3-akihiko.odaki@gmail.com
+a new parameter (aio-max-batch) to IOThread and used PollParamInfo
 structure to handle it.
 Since it is not a parameter of the polling mechanism, we rename the
 structure to a more generic IOThreadParamInfo.
 Suggested-by: Kevin Wolf <kwolf@redhat.com>
 Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
 Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Message-id: 20210727145936.147032-2-sgarzare@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/io.c | 2 ++
+ iothread.c | 14 +++++++-------
-file changed, 2 insertions(+)
+file changed, 7 insertions(+), 7 deletions(-)
-diff --git a/block/io.c b/block/io.c
+diff --git a/iothread.c b/iothread.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/io.c
+--- a/iothread.c
-+++ b/block/io.c
++++ b/iothread.c
-@@ -XXX,XX +XXX,XX @@ void bdrv_parent_drained_begin_single(BdrvChild *c, bool poll)
+@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
+ typedef struct {
- static void bdrv_merge_limits(BlockLimits *dst, const BlockLimits *src)
+     const char *name;
      ptrdiff_t offset; /* field's byte offset in IOThread struct */
 -} PollParamInfo;
 +} IOThreadParamInfo;
 -static PollParamInfo poll_max_ns_info = {
 +static IOThreadParamInfo poll_max_ns_info = {
      "poll-max-ns", offsetof(IOThread, poll_max_ns),
  };
 -static PollParamInfo poll_grow_info = {
 +static IOThreadParamInfo poll_grow_info = {
      "poll-grow", offsetof(IOThread, poll_grow),
  };
 -static PollParamInfo poll_shrink_info = {
 +static IOThreadParamInfo poll_shrink_info = {
      "poll-shrink", offsetof(IOThread, poll_shrink),
  };
 -static PollParamInfo aio_max_batch_info = {
 +static IOThreadParamInfo aio_max_batch_info = {
      "aio-max-batch", offsetof(IOThread, aio_max_batch),
  };
@@ -XXX,XX +XXX,XX @@ static void iothread_get_param(Object *obj, Visitor *v,
          const char *name, void *opaque, Error **errp)
  {
-+    dst->pdiscard_alignment = MAX(dst->pdiscard_alignment,
+     IOThread *iothread = IOTHREAD(obj);
-+                                  src->pdiscard_alignment);
+-    PollParamInfo *info = opaque;
-     dst->opt_transfer = MAX(dst->opt_transfer, src->opt_transfer);
++    IOThreadParamInfo *info = opaque;
-     dst->max_transfer = MIN_NON_ZERO(dst->max_transfer, src->max_transfer);
+     int64_t *field = (void *)iothread + info->offset;
-     dst->max_hw_transfer = MIN_NON_ZERO(dst->max_hw_transfer,
      visit_type_int64(v, name, field, errp);
@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
          const char *name, void *opaque, Error **errp)
  {
      IOThread *iothread = IOTHREAD(obj);
 -    PollParamInfo *info = opaque;
 +    IOThreadParamInfo *info = opaque;
      int64_t *field = (void *)iothread + info->offset;
      int64_t value;
 --
 .31.1

-[PULL 1/5] util/async: add a human-readable name to BHs for debugging
+[PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param()
-It can be difficult to debug issues with BHs in production environments.
+From: Stefano Garzarella <sgarzare@redhat.com>
 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
+Commit 0445409d74 ("iothread: generalize
-but differentiates between cb() functions, which is usually enough. It's
+iothread_set_param/iothread_get_param") moved common code to set and
-done by changing aio_bh_new() and friends to macros that stringify cb.
+get IOThread parameters in two new functions.
-The next patch will use the name field when reporting leaked BHs.
+These functions are called inside callbacks, so we don't need to use an
 opaque pointer. Let's replace `void *opaque` parameter with
 `IOThreadParamInfo *info`.
+Suggested-by: Kevin Wolf <kwolf@redhat.com>
+Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Message-id: 20210727145936.147032-3-sgarzare@redhat.com
 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 ++++++++++++++++++++++++++++---
+ iothread.c | 18 ++++++++++--------
- include/qemu/main-loop.h       |  4 +++-
+file changed, 10 insertions(+), 8 deletions(-)
  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
+diff --git a/iothread.c b/iothread.c
 index XXXXXXX..XXXXXXX 100644
---- a/include/block/aio.h
+--- a/iothread.c
-+++ b/include/block/aio.h
++++ b/iothread.c
-@@ -XXX,XX +XXX,XX @@ void aio_context_acquire(AioContext *ctx);
+@@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = {
- /* Relinquish ownership of the AioContext. */
+ };
- void aio_context_release(AioContext *ctx);
+ static void iothread_get_param(Object *obj, Visitor *v,
-+/**
+-        const char *name, void *opaque, Error **errp)
-+ * aio_bh_schedule_oneshot_full: Allocate a new bottom half structure that will
++        const char *name, IOThreadParamInfo *info, Error **errp)
-+ * run only once and as soon as possible.
+ {
-+ *
+     IOThread *iothread = IOTHREAD(obj);
-+ * @name: A human-readable identifier for debugging purposes.
+-    IOThreadParamInfo *info = opaque;
-+ */
+     int64_t *field = (void *)iothread + info->offset;
-+void aio_bh_schedule_oneshot_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
-+                                  const char *name);
+     visit_type_int64(v, name, field, errp);
 +
  /**
   * 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)
+ static bool iothread_set_param(Object *obj, Visitor *v,
-+QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name)
+-        const char *name, void *opaque, Error **errp)
 +        const char *name, IOThreadParamInfo *info, Error **errp)
  {
-     QEMUBH *bh = g_new(QEMUBH, 1);
+     IOThread *iothread = IOTHREAD(obj);
+-    IOThreadParamInfo *info = opaque;
-diff --git a/util/async.c b/util/async.c
+     int64_t *field = (void *)iothread + info->offset;
-index XXXXXXX..XXXXXXX 100644
+     int64_t value;
---- a/util/async.c
-+++ b/util/async.c
+@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
-@@ -XXX,XX +XXX,XX @@ enum {
+ static void iothread_get_poll_param(Object *obj, Visitor *v,
+         const char *name, void *opaque, Error **errp)
- struct QEMUBH {
+ {
-     AioContext *ctx;
++    IOThreadParamInfo *info = opaque;
-+    const char *name;
-     QEMUBHFunc *cb;
+-    iothread_get_param(obj, v, name, opaque, errp);
-     void *opaque;
++    iothread_get_param(obj, v, name, info, errp);
      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)
+ static void iothread_set_poll_param(Object *obj, Visitor *v,
-+void aio_bh_schedule_oneshot_full(AioContext *ctx, QEMUBHFunc *cb,
+         const char *name, void *opaque, Error **errp)
 +                                  void *opaque, const char *name)
  {
-     QEMUBH *bh;
+     IOThread *iothread = IOTHREAD(obj);
-     bh = g_new(QEMUBH, 1);
++    IOThreadParamInfo *info = opaque;
-@@ -XXX,XX +XXX,XX @@ void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
-         .ctx = ctx,
+-    if (!iothread_set_param(obj, v, name, opaque, errp)) {
-         .cb = cb,
++    if (!iothread_set_param(obj, v, name, info, errp)) {
-         .opaque = opaque,
+         return;
-+        .name = name,
+     }
-     };
-     aio_bh_enqueue(bh, BH_SCHEDULED | BH_ONESHOT);
+@@ -XXX,XX +XXX,XX @@ static void iothread_set_poll_param(Object *obj, Visitor *v,
  static void iothread_get_aio_param(Object *obj, Visitor *v,
          const char *name, void *opaque, Error **errp)
  {
 +    IOThreadParamInfo *info = opaque;
 -    iothread_get_param(obj, v, name, opaque, errp);
 +    iothread_get_param(obj, v, name, info, errp);
  }
--QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
+ static void iothread_set_aio_param(Object *obj, Visitor *v,
-+QEMUBH *aio_bh_new_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
+         const char *name, void *opaque, Error **errp)
 +                        const char *name)
  {
-     QEMUBH *bh;
+     IOThread *iothread = IOTHREAD(obj);
-     bh = g_new(QEMUBH, 1);
++    IOThreadParamInfo *info = opaque;
-@@ -XXX,XX +XXX,XX @@ QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
-         .ctx = ctx,
+-    if (!iothread_set_param(obj, v, name, opaque, errp)) {
-         .cb = cb,
++    if (!iothread_set_param(obj, v, name, info, errp)) {
-         .opaque = opaque,
+         return;
-+        .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 4/5] block: Add backend_defaults property
+Deleted patch
-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 ++++++++++++++++++++++++++++++++++
-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

From: Stefano Garzarella <sgarzare@redhat.com>

Commit 1793ad0247 ("iothread: add aio-max-batch parameter") added
a new parameter (aio-max-batch) to IOThread and used PollParamInfo
structure to handle it.

Since it is not a parameter of the polling mechanism, we rename the
structure to a more generic IOThreadParamInfo.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210727145936.147032-2-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 iothread.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/iothread.c b/iothread.c
index XXXXXXX..XXXXXXX 100644
--- a/iothread.c
+++ b/iothread.c
@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
 typedef struct {
     const char *name;
     ptrdiff_t offset; /* field's byte offset in IOThread struct */
-} PollParamInfo;
+} IOThreadParamInfo;
 
-static PollParamInfo poll_max_ns_info = {
+static IOThreadParamInfo poll_max_ns_info = {
     "poll-max-ns", offsetof(IOThread, poll_max_ns),
 };
-static PollParamInfo poll_grow_info = {
+static IOThreadParamInfo poll_grow_info = {
     "poll-grow", offsetof(IOThread, poll_grow),
 };
-static PollParamInfo poll_shrink_info = {
+static IOThreadParamInfo poll_shrink_info = {
     "poll-shrink", offsetof(IOThread, poll_shrink),
 };
-static PollParamInfo aio_max_batch_info = {
+static IOThreadParamInfo aio_max_batch_info = {
     "aio-max-batch", offsetof(IOThread, aio_max_batch),
 };
 
@@ -XXX,XX +XXX,XX @@ static void iothread_get_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    PollParamInfo *info = opaque;
+    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
 
     visit_type_int64(v, name, field, errp);
@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    PollParamInfo *info = opaque;
+    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
     int64_t value;
 
-- 
2.31.1

From: Stefano Garzarella <sgarzare@redhat.com>

Commit 0445409d74 ("iothread: generalize
iothread_set_param/iothread_get_param") moved common code to set and
get IOThread parameters in two new functions.

These functions are called inside callbacks, so we don't need to use an
opaque pointer. Let's replace `void *opaque` parameter with
`IOThreadParamInfo *info`.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210727145936.147032-3-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 iothread.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/iothread.c b/iothread.c
index XXXXXXX..XXXXXXX 100644
--- a/iothread.c
+++ b/iothread.c
@@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = {
 };
 
 static void iothread_get_param(Object *obj, Visitor *v,
-        const char *name, void *opaque, Error **errp)
+        const char *name, IOThreadParamInfo *info, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
 
     visit_type_int64(v, name, field, errp);
 }
 
 static bool iothread_set_param(Object *obj, Visitor *v,
-        const char *name, void *opaque, Error **errp)
+        const char *name, IOThreadParamInfo *info, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
     int64_t value;
 
@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
 static void iothread_get_poll_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
+    IOThreadParamInfo *info = opaque;
 
-    iothread_get_param(obj, v, name, opaque, errp);
+    iothread_get_param(obj, v, name, info, errp);
 }
 
 static void iothread_set_poll_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
+    IOThreadParamInfo *info = opaque;
 
-    if (!iothread_set_param(obj, v, name, opaque, errp)) {
+    if (!iothread_set_param(obj, v, name, info, errp)) {
         return;
     }
 
@@ -XXX,XX +XXX,XX @@ static void iothread_set_poll_param(Object *obj, Visitor *v,
 static void iothread_get_aio_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
+    IOThreadParamInfo *info = opaque;
 
-    iothread_get_param(obj, v, name, opaque, errp);
+    iothread_get_param(obj, v, name, info, errp);
 }
 
 static void iothread_set_aio_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
+    IOThreadParamInfo *info = opaque;
 
-    if (!iothread_set_param(obj, v, name, opaque, errp)) {
+    if (!iothread_set_param(obj, v, name, info, errp)) {
         return;
     }
 
-- 
2.31.1