[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/6] qmp: fix aio_poll() assertion failure on Windows
From: |
Kevin Wolf |
Subject: |
[PULL 1/6] qmp: fix aio_poll() assertion failure on Windows |
Date: |
Tue, 3 Nov 2020 16:26:53 +0100 |
From: Volker RĂ¼melin <vr_qemu@t-online.de>
Commit 9ce44e2ce2 "qmp: Move dispatcher to a coroutine" modified
aio_poll() in util/aio-posix.c to avoid an assertion failure. This
change is missing in util/aio-win32.c.
Apply the changes to util/aio-posix.c to util/aio-win32.c too.
This fixes an assertion failure on Windows whenever QEMU exits.
$ ./qemu-system-x86_64.exe -machine pc,accel=tcg -display gtk
**
ERROR:../qemu/util/aio-win32.c:337:aio_poll: assertion failed:
(in_aio_context_home_thread(ctx))
Bail out! ERROR:../qemu/util/aio-win32.c:337:aio_poll: assertion
failed: (in_aio_context_home_thread(ctx))
Fixes: 9ce44e2ce2 ("qmp: Move dispatcher to a coroutine")
Signed-off-by: Volker RĂ¼melin <vr_qemu@t-online.de>
Message-Id: <20201021064033.8600-1-vr_qemu@t-online.de>
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
util/aio-win32.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/util/aio-win32.c b/util/aio-win32.c
index e7b1d649e9..168717b51b 100644
--- a/util/aio-win32.c
+++ b/util/aio-win32.c
@@ -18,6 +18,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "block/block.h"
+#include "qemu/main-loop.h"
#include "qemu/queue.h"
#include "qemu/sockets.h"
#include "qapi/error.h"
@@ -333,8 +334,13 @@ bool aio_poll(AioContext *ctx, bool blocking)
* There cannot be two concurrent aio_poll calls for the same AioContext
(or
* an aio_poll concurrent with a GSource prepare/check/dispatch callback).
* We rely on this below to avoid slow locked accesses to ctx->notify_me.
+ *
+ * aio_poll() may only be called in the AioContext's thread. iohandler_ctx
+ * is special in that it runs in the main thread, but that thread's context
+ * is qemu_aio_context.
*/
- assert(in_aio_context_home_thread(ctx));
+ assert(in_aio_context_home_thread(ctx == iohandler_get_aio_context() ?
+ qemu_get_aio_context() : ctx));
progress = false;
/* aio_notify can avoid the expensive event_notifier_set if
--
2.28.0
- [PULL 0/6] Block layer patches, Kevin Wolf, 2020/11/03
- [PULL 1/6] qmp: fix aio_poll() assertion failure on Windows,
Kevin Wolf <=
- [PULL 2/6] qemu-img convert: Free @sn_opts in all error cases, Kevin Wolf, 2020/11/03
- [PULL 4/6] iotests: Disable unsubscriptable-object in pylint, Kevin Wolf, 2020/11/03
- [PULL 3/6] iotests.py: Fix type check errors in wait_migration(), Kevin Wolf, 2020/11/03
- [PULL 5/6] iotests: Use Python 3 style super(), Kevin Wolf, 2020/11/03
- [PULL 6/6] block/vvfat: Fix bad printf format specifiers, Kevin Wolf, 2020/11/03
- Re: [PULL 0/6] Block layer patches, Peter Maydell, 2020/11/03