[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/5] aio: fix assert when remove poll during destroy
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 5/5] aio: fix assert when remove poll during destroy |
Date: |
Tue, 3 Oct 2017 15:12:27 -0400 |
After iothread is enabled internally inside QEMU with GMainContext, we
may encounter this warning when destroying the iothread:
(qemu-system-x86_64:19925): GLib-CRITICAL **: g_source_remove_poll:
assertion '!SOURCE_DESTROYED (source)' failed
The problem is that g_source_remove_poll() does not allow to remove one
source from array if the source is detached from its owner
context. (peterx: which IMHO does not make much sense)
Fix it on QEMU side by avoid calling g_source_remove_poll() if we know
the object is during destruction, and we won't leak anything after all
since the array will be gone soon cleanly even with that fd.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Message-id: address@hidden
[peterx: write the commit message]
Signed-off-by: Peter Xu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
util/aio-posix.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/util/aio-posix.c b/util/aio-posix.c
index 2d51239ec6..5946ac09f0 100644
--- a/util/aio-posix.c
+++ b/util/aio-posix.c
@@ -223,7 +223,14 @@ void aio_set_fd_handler(AioContext *ctx,
return;
}
- g_source_remove_poll(&ctx->source, &node->pfd);
+ /* If the GSource is in the process of being destroyed then
+ * g_source_remove_poll() causes an assertion failure. Skip
+ * removal in that case, because glib cleans up its state during
+ * destruction anyway.
+ */
+ if (!g_source_is_destroyed(&ctx->source)) {
+ g_source_remove_poll(&ctx->source, &node->pfd);
+ }
/* If the lock is held, just mark the node as deleted */
if (qemu_lockcnt_count(&ctx->list_lock)) {
--
2.13.6
- [Qemu-devel] [PULL 0/5] Block patches, Stefan Hajnoczi, 2017/10/03
- [Qemu-devel] [PULL 1/5] qom: provide root container for internal objs, Stefan Hajnoczi, 2017/10/03
- [Qemu-devel] [PULL 2/5] iothread: provide helpers for internal use, Stefan Hajnoczi, 2017/10/03
- [Qemu-devel] [PULL 3/5] iothread: export iothread_stop(), Stefan Hajnoczi, 2017/10/03
- [Qemu-devel] [PULL 4/5] iothread: delay the context release to finalize, Stefan Hajnoczi, 2017/10/03
- [Qemu-devel] [PULL 5/5] aio: fix assert when remove poll during destroy,
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PULL 0/5] Block patches, Peter Maydell, 2017/10/05