Commit f708a5e7 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

aio: fix assert when remove poll during destroy 



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: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-id: 20170928025958.1420-6-peterx@redhat.com
[peterx: write the commit message]
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 5b3ac23f

util/aio-posix.c

+8 −1
Original line number Diff line number Diff line
@@ -223,7 +223,14 @@ void aio_set_fd_handler(AioContext *ctx, 
            return;

        }



        /* 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)) {