From: Fam Zheng <f...@redhat.com> 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-sta...@nongnu.org Signed-off-by: Fam Zheng <f...@redhat.com> Message-Id: <20180809132259.18402-2-f...@redhat.com> Signed-off-by: Fam Zheng <f...@redhat.com> (cherry picked from commit 70232b5253a3c4e03ed1ac47ef9246a8ac66c6fa) Signed-off-by: Michael Roth <mdr...@linux.vnet.ibm.com> --- util/aio-posix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } -- 2.17.1