From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52029 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OI3tu-0007DN-Em for qemu-devel@nongnu.org; Fri, 28 May 2010 14:03:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OI3sZ-0002UQ-01 for qemu-devel@nongnu.org; Fri, 28 May 2010 14:01:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27624) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OI3sY-0002U7-KC for qemu-devel@nongnu.org; Fri, 28 May 2010 14:01:54 -0400 From: Kevin Wolf Date: Fri, 28 May 2010 20:01:27 +0200 Message-Id: <1275069692-5756-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1275069692-5756-1-git-send-email-kwolf@redhat.com> References: <1275069692-5756-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [STABLE PATCH 1/6] ide: Fix ide_dma_cancel List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org When cancelling a request, bdrv_aio_cancel may decide that it waits for completion of a request rather than for cancellation. IDE therefore can't abandon its DMA status before calling bdrv_aio_cancel; otherwise the callback of a completed request would use invalid data. Signed-off-by: Kevin Wolf (cherry picked from commit 38d8dfa193e9a45f0f08b06aab2ba2a94f40a041) --- hw/ide/core.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 64aebc2..f9bb338 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2827,10 +2827,6 @@ static void ide_dma_restart(IDEState *s, int is_read) void ide_dma_cancel(BMDMAState *bm) { if (bm->status & BM_STATUS_DMAING) { - bm->status &= ~BM_STATUS_DMAING; - /* cancel DMA request */ - bm->unit = -1; - bm->dma_cb = NULL; if (bm->aiocb) { #ifdef DEBUG_AIO printf("aio_cancel\n"); @@ -2838,6 +2834,10 @@ void ide_dma_cancel(BMDMAState *bm) bdrv_aio_cancel(bm->aiocb); bm->aiocb = NULL; } + bm->status &= ~BM_STATUS_DMAING; + /* cancel DMA request */ + bm->unit = -1; + bm->dma_cb = NULL; } } -- 1.6.6.1