From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atYl0-0006P9-JN for qemu-devel@nongnu.org; Fri, 22 Apr 2016 06:56:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atYkz-0005xe-Mi for qemu-devel@nongnu.org; Fri, 22 Apr 2016 06:56:18 -0400 From: Fam Zheng Date: Fri, 22 Apr 2016 18:56:03 +0800 Message-Id: <1461322564-17440-5-git-send-email-famz@redhat.com> In-Reply-To: <1461322564-17440-1-git-send-email-famz@redhat.com> References: <1461322564-17440-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2 for-2.6 4/5] aio-posix: Skip external nodes in aio_dispatch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Jeff Cody , Kevin Wolf , Max Reitz , "Michael S. Tsirkin" , Paolo Bonzini , qemu-block@nongnu.org aio_poll doesn't poll the external nodes so this should never be true, but aio_ctx_dispatch may get notified by the events from GSource. To make bdrv_drained_begin effective in main loop, we should check the is_external flag here too. This could result in a few busy polls because the fd is left unhandled, but the drained section is only transient and shouldn't be longer than one or two event loop iterations. Signed-off-by: Fam Zheng --- aio-posix.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aio-posix.c b/aio-posix.c index 7fd565f..a7c9304 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -323,6 +323,7 @@ bool aio_dispatch(AioContext *ctx) if (!node->deleted && (revents & (G_IO_IN | G_IO_HUP | G_IO_ERR)) && + aio_node_check(ctx, node->is_external) && node->io_read) { node->io_read(node->opaque); @@ -333,6 +334,7 @@ bool aio_dispatch(AioContext *ctx) } if (!node->deleted && (revents & (G_IO_OUT | G_IO_ERR)) && + aio_node_check(ctx, node->is_external) && node->io_write) { node->io_write(node->opaque); progress = true; -- 2.8.0