Series comparison

-[PULL 0/5] Block patches
+[PULL 0/1] Block patches
-The following changes since commit 711c0418c8c1ce3a24346f058b001c4c5a2f0f81:
+The following changes since commit da1034094d375afe9e3d8ec8980550ea0f06f7e0:
-  Merge remote-tracking branch 'remotes/philmd/tags/mips-20210702' into staging (2021-07-04 14:04:12 +0100)
+  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2023-10-03 07:43:44 -0400)
 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 9afa888ce0f816d0f2cfc95eebe4f49244c518af:
-  block/io: Merge discard request alignments (2021-07-06 14:28:55 +0100)
+  osdep: set _FORTIFY_SOURCE=2 when optimization is enabled (2023-10-04 09:52:06 -0400)
 ----------------------------------------------------------------
 Pull request
 ----------------------------------------------------------------
-Akihiko Odaki (3):
+Daniel P. Berrangé (1):
-  block/file-posix: Optimize for macOS
+  osdep: set _FORTIFY_SOURCE=2 when optimization is enabled
   block: Add backend_defaults property
   block/io: Merge discard request alignments
-Stefan Hajnoczi (2):
+ meson.build                  | 10 ----------
-  util/async: add a human-readable name to BHs for debugging
+ include/qemu/osdep.h         |  4 ++++
-  util/async: print leaked BH name when AioContext finalizes
+ util/coroutine-sigaltstack.c |  4 ++--
+ util/coroutine-ucontext.c    |  4 ++--
- include/block/aio.h            | 31 ++++++++++++++++++++++---
+files changed, 8 insertions(+), 14 deletions(-)
  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
+.41.0

-[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
+[PULL 1/1] osdep: set _FORTIFY_SOURCE=2 when optimization is enabled
-From: Akihiko Odaki <akihiko.odaki@gmail.com>
+From: Daniel P. Berrangé <berrange@redhat.com>
-This commit introduces "punch hole" operation and optimizes transfer
+Currently we set _FORTIFY_SOURCE=2 as a compiler argument when the
-block size for macOS.
+meson 'optimization' setting is non-zero, the compiler is GCC and
 the target is Linux.
-Thanks to Konstantin Nazarov for detailed analysis of a flaw in an
+While the default QEMU optimization level is 2, user could override
-old version of this change:
+this by setting CFLAGS="-O0" or --extra-cflags="-O0" when running
-https://gist.github.com/akihikodaki/87df4149e7ca87f18dc56807ec5a1bc5#gistcomment-3654667
+configure and this won't be reflected in the meson 'optimization'
 setting. As a result we try to enable _FORTIFY_SOURCE=2 and then the
 user gets compile errors as it only works with optimization.
-Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
+Rather than trying to improve detection in meson, it is simpler to
-Message-id: 20210705130458.97642-1-akihiko.odaki@gmail.com
+just check the __OPTIMIZE__ define from osdep.h.
 The comment about being incompatible with clang appears to be
 outdated, as compilation works fine without excluding clang.
 In the coroutine code we must set _FORTIFY_SOURCE=0 to stop the
 logic in osdep.h then enabling it.
 Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
 Message-id: 20231003091549.223020-1-berrange@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/file-posix.c | 27 +++++++++++++++++++++++++--
+ meson.build                  | 10 ----------
-file changed, 25 insertions(+), 2 deletions(-)
+ include/qemu/osdep.h         |  4 ++++
  util/coroutine-sigaltstack.c |  4 ++--
  util/coroutine-ucontext.c    |  4 ++--
 files changed, 8 insertions(+), 14 deletions(-)
-diff --git a/block/file-posix.c b/block/file-posix.c
+diff --git a/meson.build b/meson.build
 index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
+--- a/meson.build
-+++ b/block/file-posix.c
++++ b/meson.build
@@ -XXX,XX +XXX,XX @@ if 'cpp' in all_languages
    qemu_cxxflags = ['-D__STDC_LIMIT_MACROS', '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS'] + qemu_cflags
  endif
 -# clang does not support glibc + FORTIFY_SOURCE (is it still true?)
 -if get_option('optimization') != '0' and targetos == 'linux'
 -  if cc.get_id() == 'gcc'
 -    qemu_cflags += ['-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=2']
 -  endif
 -  if 'cpp' in all_languages and cxx.get_id() == 'gcc'
 -    qemu_cxxflags += ['-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=2']
 -  endif
 -endif
 -
  add_project_arguments(qemu_cflags, native: false, language: 'c')
  add_project_arguments(cc.get_supported_arguments(warn_flags), native: false, language: 'c')
  if 'cpp' in all_languages
 diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/qemu/osdep.h
 +++ b/include/qemu/osdep.h
 @@ -XXX,XX +XXX,XX @@
- #if defined(HAVE_HOST_BLOCK_DEVICE)
+ #ifndef QEMU_OSDEP_H
- #include <paths.h>
+ #define QEMU_OSDEP_H
- #include <sys/param.h>
-+#include <sys/mount.h>
++#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ && defined __linux__
- #include <IOKit/IOKitLib.h>
++# define _FORTIFY_SOURCE 2
  #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)) {
+ #include "config-host.h"
-         int ret = hdev_get_max_hw_transfer(s->fd, &st);
+ #ifdef NEED_CPU_H
+ #include CONFIG_TARGET
-@@ -XXX,XX +XXX,XX @@ out:
+diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c
-     }
+index XXXXXXX..XXXXXXX 100644
- }
+--- a/util/coroutine-sigaltstack.c
++++ b/util/coroutine-sigaltstack.c
-+#if defined(CONFIG_FALLOCATE) || defined(BLKZEROOUT) || defined(BLKDISCARD)
+@@ -XXX,XX +XXX,XX @@
- static int translate_err(int err)
+  */
- {
-     if (err == -ENODEV || err == -ENOSYS || err == -EOPNOTSUPP ||
+ /* XXX Is there a nicer way to disable glibc's stack check for longjmp? */
-@@ -XXX,XX +XXX,XX @@ static int translate_err(int err)
+-#ifdef _FORTIFY_SOURCE
-     }
+ #undef _FORTIFY_SOURCE
-     return err;
+-#endif
- }
++#define _FORTIFY_SOURCE 0
-+#endif
++
+ #include "qemu/osdep.h"
- #ifdef CONFIG_FALLOCATE
+ #include <pthread.h>
- static int do_fallocate(int fd, int mode, off_t offset, off_t len)
+ #include "qemu/coroutine_int.h"
-@@ -XXX,XX +XXX,XX @@ static int handle_aiocb_discard(void *opaque)
+diff --git a/util/coroutine-ucontext.c b/util/coroutine-ucontext.c
-             }
+index XXXXXXX..XXXXXXX 100644
-         } while (errno == EINTR);
+--- a/util/coroutine-ucontext.c
++++ b/util/coroutine-ucontext.c
--        ret = -errno;
+@@ -XXX,XX +XXX,XX @@
-+        ret = translate_err(-errno);
+  */
- #endif
-     } else {
+ /* XXX Is there a nicer way to disable glibc's stack check for longjmp? */
- #ifdef CONFIG_FALLOCATE_PUNCH_HOLE
+-#ifdef _FORTIFY_SOURCE
-         ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
+ #undef _FORTIFY_SOURCE
-                            aiocb->aio_offset, aiocb->aio_nbytes);
+-#endif
-+        ret = translate_err(-errno);
++#define _FORTIFY_SOURCE 0
-+#elif defined(__APPLE__) && (__MACH__)
++
-+        fpunchhole_t fpunchhole;
+ #include "qemu/osdep.h"
-+        fpunchhole.fp_flags = 0;
+ #include <ucontext.h>
-+        fpunchhole.reserved = 0;
+ #include "qemu/coroutine_int.h"
 +        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
+.41.0

-[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

-[PULL 5/5] block/io: Merge discard request alignments
+Deleted patch
-From: Akihiko Odaki <akihiko.odaki@gmail.com>
-Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
-Message-id: 20210705130458.97642-3-akihiko.odaki@gmail.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- block/io.c | 2 ++
-file changed, 2 insertions(+)
-diff --git a/block/io.c b/block/io.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/io.c
-+++ b/block/io.c
-@@ -XXX,XX +XXX,XX @@ void bdrv_parent_drained_begin_single(BdrvChild *c, bool poll)
- static void bdrv_merge_limits(BlockLimits *dst, const BlockLimits *src)
- {
-+    dst->pdiscard_alignment = MAX(dst->pdiscard_alignment,
-+                                  src->pdiscard_alignment);
-     dst->opt_transfer = MAX(dst->opt_transfer, src->opt_transfer);
-     dst->max_transfer = MIN_NON_ZERO(dst->max_transfer, src->max_transfer);
-     dst->max_hw_transfer = MIN_NON_ZERO(dst->max_hw_transfer,
---
-.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: Daniel P. Berrangé <berrange@redhat.com>

Currently we set _FORTIFY_SOURCE=2 as a compiler argument when the
meson 'optimization' setting is non-zero, the compiler is GCC and
the target is Linux.

While the default QEMU optimization level is 2, user could override
this by setting CFLAGS="-O0" or --extra-cflags="-O0" when running
configure and this won't be reflected in the meson 'optimization'
setting. As a result we try to enable _FORTIFY_SOURCE=2 and then the
user gets compile errors as it only works with optimization.

Rather than trying to improve detection in meson, it is simpler to
just check the __OPTIMIZE__ define from osdep.h.

The comment about being incompatible with clang appears to be
outdated, as compilation works fine without excluding clang.

In the coroutine code we must set _FORTIFY_SOURCE=0 to stop the
logic in osdep.h then enabling it.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20231003091549.223020-1-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 meson.build                  | 10 ----------
 include/qemu/osdep.h         |  4 ++++
 util/coroutine-sigaltstack.c |  4 ++--
 util/coroutine-ucontext.c    |  4 ++--
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/meson.build b/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/meson.build
+++ b/meson.build
@@ -XXX,XX +XXX,XX @@ if 'cpp' in all_languages
   qemu_cxxflags = ['-D__STDC_LIMIT_MACROS', '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS'] + qemu_cflags
 endif
 
-# clang does not support glibc + FORTIFY_SOURCE (is it still true?)
-if get_option('optimization') != '0' and targetos == 'linux'
-  if cc.get_id() == 'gcc'
-    qemu_cflags += ['-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=2']
-  endif
-  if 'cpp' in all_languages and cxx.get_id() == 'gcc'
-    qemu_cxxflags += ['-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=2']
-  endif
-endif
-
 add_project_arguments(qemu_cflags, native: false, language: 'c')
 add_project_arguments(cc.get_supported_arguments(warn_flags), native: false, language: 'c')
 if 'cpp' in all_languages
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -XXX,XX +XXX,XX @@
 #ifndef QEMU_OSDEP_H
 #define QEMU_OSDEP_H
 
+#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ && defined __linux__
+# define _FORTIFY_SOURCE 2
+#endif
+
 #include "config-host.h"
 #ifdef NEED_CPU_H
 #include CONFIG_TARGET
diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c
index XXXXXXX..XXXXXXX 100644
--- a/util/coroutine-sigaltstack.c
+++ b/util/coroutine-sigaltstack.c
@@ -XXX,XX +XXX,XX @@
  */
 
 /* XXX Is there a nicer way to disable glibc's stack check for longjmp? */
-#ifdef _FORTIFY_SOURCE
 #undef _FORTIFY_SOURCE
-#endif
+#define _FORTIFY_SOURCE 0
+
 #include "qemu/osdep.h"
 #include <pthread.h>
 #include "qemu/coroutine_int.h"
diff --git a/util/coroutine-ucontext.c b/util/coroutine-ucontext.c
index XXXXXXX..XXXXXXX 100644
--- a/util/coroutine-ucontext.c
+++ b/util/coroutine-ucontext.c
@@ -XXX,XX +XXX,XX @@
  */
 
 /* XXX Is there a nicer way to disable glibc's stack check for longjmp? */
-#ifdef _FORTIFY_SOURCE
 #undef _FORTIFY_SOURCE
-#endif
+#define _FORTIFY_SOURCE 0
+
 #include "qemu/osdep.h"
 #include <ucontext.h>
 #include "qemu/coroutine_int.h"
-- 
2.41.0