From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THeod-0002z9-D6 for qemu-devel@nongnu.org; Fri, 28 Sep 2012 13:57:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THeoZ-0007Tt-0g for qemu-devel@nongnu.org; Fri, 28 Sep 2012 13:57:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29751) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THeoY-0007St-OZ for qemu-devel@nongnu.org; Fri, 28 Sep 2012 13:57:26 -0400 From: Kevin Wolf Date: Fri, 28 Sep 2012 19:56:48 +0200 Message-Id: <1348855033-17174-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1348855033-17174-1-git-send-email-kwolf@redhat.com> References: <1348855033-17174-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 05/30] aio: Another fix to the walking_handlers logic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini The AIO dispatch loop will call QLIST_REMOVE and g_free even if there are other pending calls to qemu_aio_wait outside the current one. Signed-off-by: Paolo Bonzini Signed-off-by: Bharata B Rao Signed-off-by: Kevin Wolf --- aio.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aio.c b/aio.c index 99b8b72..c738a4e 100644 --- a/aio.c +++ b/aio.c @@ -159,14 +159,14 @@ bool qemu_aio_wait(void) /* if we have any readable fds, dispatch event */ if (ret > 0) { - walking_handlers++; - /* we have to walk very carefully in case * qemu_aio_set_fd_handler is called while we're walking */ node = QLIST_FIRST(&aio_handlers); while (node) { AioHandler *tmp; + walking_handlers++; + if (!node->deleted && FD_ISSET(node->fd, &rdfds) && node->io_read) { @@ -181,13 +181,13 @@ bool qemu_aio_wait(void) tmp = node; node = QLIST_NEXT(node, node); - if (tmp->deleted) { + walking_handlers--; + + if (!walking_handlers && tmp->deleted) { QLIST_REMOVE(tmp, node); g_free(tmp); } } - - walking_handlers--; } return true; -- 1.7.6.5