aboutsummaryrefslogtreecommitdiff
path: root/util/aio-posix.c
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2018-08-09 21:22:58 +0800
committerFam Zheng <famz@redhat.com>2018-08-15 10:12:35 +0800
commit70232b5253a3c4e03ed1ac47ef9246a8ac66c6fa (patch)
treed2266f8026f4fe129c8938a25f33ac40287dd84c /util/aio-posix.c
parent2f0d8947a664c77624fd3e22ce9449685b0ed808 (diff)
aio-posix: Don't count ctx->notifier as progress when polling
The same logic exists in fd polling. This change is especially important to avoid busy loop once we limit aio_notify_accept() to blocking aio_poll(). Cc: qemu-stable@nongnu.org Signed-off-by: Fam Zheng <famz@redhat.com> Message-Id: <20180809132259.18402-2-famz@redhat.com> Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'util/aio-posix.c')
-rw-r--r--util/aio-posix.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/aio-posix.c b/util/aio-posix.c
index 118bf5784b..b5c7f463aa 100644
--- a/util/aio-posix.c
+++ b/util/aio-posix.c
@@ -494,7 +494,8 @@ static bool run_poll_handlers_once(AioContext *ctx)
QLIST_FOREACH_RCU(node, &ctx->aio_handlers, node) {
if (!node->deleted && node->io_poll &&
aio_node_check(ctx, node->is_external) &&
- node->io_poll(node->opaque)) {
+ node->io_poll(node->opaque) &&
+ node->opaque != &ctx->notifier) {
progress = true;
}