diff options
| author | Fam Zheng <famz@redhat.com> | 2016-04-22 21:53:55 +0800 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-04-22 16:43:59 +0200 |
| commit | 37989ced44e559dbb1edb8b238ffe221f70214b4 (patch) | |
| tree | 4c74ca6813833b3be3f1cf54be3cabf40ab89931 | |
| parent | 14560d69e7c979d97975c3aa6e7bd1ab3249fe88 (diff) | |
| download | qemu-37989ced44e559dbb1edb8b238ffe221f70214b4.tar.gz | |
aio-posix: Skip external nodes in aio_dispatch
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.
Also do the check in aio_pending so aio_dispatch is not called
superfluously, when there is no events other than external ones.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | aio-posix.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/aio-posix.c b/aio-posix.c index 7fd565fbde..6006122e0b 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -282,10 +282,12 @@ bool aio_pending(AioContext *ctx) int revents; revents = node->pfd.revents & node->pfd.events; - if (revents & (G_IO_IN | G_IO_HUP | G_IO_ERR) && node->io_read) { + if (revents & (G_IO_IN | G_IO_HUP | G_IO_ERR) && node->io_read && + aio_node_check(ctx, node->is_external)) { return true; } - if (revents & (G_IO_OUT | G_IO_ERR) && node->io_write) { + if (revents & (G_IO_OUT | G_IO_ERR) && node->io_write && + aio_node_check(ctx, node->is_external)) { return true; } } @@ -323,6 +325,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 +336,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; |