From f5022a135e4309a54d433c69b2a056756b2d0d6b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 12 Nov 2012 13:30:10 +0100 Subject: aio: fix aio_ctx_prepare with idle bottom halves Commit ed2aec4867f0d5f5de496bb765347b5d0cfe113d changed the return value of aio_ctx_prepare from false to true when only idle bottom halves are available. This broke PC old-style DMA, which uses them. Fix this by making aio_ctx_prepare return true only when non-idle bottom halves are scheduled to run. Reported-by: malc Signed-off-by: Paolo Bonzini Signed-off-by: malc --- async.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'async.c') diff --git a/async.c b/async.c index 04f9dcbb4d..3f0e8f367c 100644 --- a/async.c +++ b/async.c @@ -122,11 +122,9 @@ aio_ctx_prepare(GSource *source, gint *timeout) { AioContext *ctx = (AioContext *) source; QEMUBH *bh; - bool scheduled = false; for (bh = ctx->first_bh; bh; bh = bh->next) { if (!bh->deleted && bh->scheduled) { - scheduled = true; if (bh->idle) { /* idle bottom halves will be polled at least * every 10ms */ @@ -135,12 +133,12 @@ aio_ctx_prepare(GSource *source, gint *timeout) /* non-idle bottom halves will be executed * immediately */ *timeout = 0; - break; + return true; } } } - return scheduled; + return false; } static gboolean -- cgit v1.2.1