diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-11-12 13:30:10 +0100 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2012-11-12 20:02:09 +0400 |
| commit | f5022a135e4309a54d433c69b2a056756b2d0d6b (patch) | |
| tree | a3e242e14319e0e81dfa742aa803b9236819b9e3 /async.c | |
| parent | 3c5645fab3c4b65d0cffbe1aaafc787e4be63d0f (diff) | |
| download | focaccia-qemu-f5022a135e4309a54d433c69b2a056756b2d0d6b.tar.gz focaccia-qemu-f5022a135e4309a54d433c69b2a056756b2d0d6b.zip | |
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 <av1474@comtv.ru> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'async.c')
| -rw-r--r-- | async.c | 6 |
1 files changed, 2 insertions, 4 deletions
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 |