From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXt9j-0007ls-VF for qemu-devel@nongnu.org; Mon, 12 Nov 2012 07:30:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TXt9g-0005Zs-St for qemu-devel@nongnu.org; Mon, 12 Nov 2012 07:30:23 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:34503) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXt9g-0005Zj-Md for qemu-devel@nongnu.org; Mon, 12 Nov 2012 07:30:20 -0500 Received: by mail-pa0-f45.google.com with SMTP id fb10so4148074pad.4 for ; Mon, 12 Nov 2012 04:30:19 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 12 Nov 2012 13:30:10 +0100 Message-Id: <1352723410-15705-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] aio: fix aio_ctx_prepare with idle bottom halves List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- Untested, I don't have an image that can do SB16. malc, can you test and perhaps apply? async.c | 6 ++---- 1 file modificato, 2 inserzioni(+), 4 rimozioni(-) diff --git a/async.c b/async.c index 04f9dcb..3f0e8f3 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 -- 1.7.12.1