summary refs log tree commit diff stats
path: root/util/main-loop.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-07-08 22:17:28 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-07-08 22:17:28 +0100
commit53c0123118a15cd25fe81acfa9617ddcbb9258fe (patch)
tree80746153bae235f6e76783fe9d7339bbca2fbc09 /util/main-loop.c
parent9db3065c62a983286d06c207f4981408cf42184d (diff)
parent9f460c64e13897117f35ffb61f6f5e0102cabc70 (diff)
downloadfocaccia-qemu-53c0123118a15cd25fe81acfa9617ddcbb9258fe.tar.gz
focaccia-qemu-53c0123118a15cd25fe81acfa9617ddcbb9258fe.zip
Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging
Pull request

# gpg: Signature made Thu 08 Jul 2021 14:11:37 BST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha-gitlab/tags/block-pull-request:
  block/io: Merge discard request alignments
  block: Add backend_defaults property
  block/file-posix: Optimize for macOS
  util/async: print leaked BH name when AioContext finalizes
  util/async: add a human-readable name to BHs for debugging

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/main-loop.c')
-rw-r--r--util/main-loop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/main-loop.c b/util/main-loop.c
index 4ae5b23e99..06b18b195c 100644
--- a/util/main-loop.c
+++ b/util/main-loop.c
@@ -544,9 +544,9 @@ 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);
 }
 
 /*