From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1OAPGt-0007QC-58 for qemu-devel@nongnu.org; Fri, 07 May 2010 11:15:23 -0400 Received: from [140.186.70.92] (port=54782 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OAPGq-0007OI-5I for qemu-devel@nongnu.org; Fri, 07 May 2010 11:15:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OAPGo-0006zz-Gu for qemu-devel@nongnu.org; Fri, 07 May 2010 11:15:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17093) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OAPGo-0006zp-4q for qemu-devel@nongnu.org; Fri, 07 May 2010 11:15:18 -0400 From: Kevin Wolf Date: Fri, 7 May 2010 17:14:01 +0200 Message-Id: <1273245247-24827-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1273245247-24827-1-git-send-email-kwolf@redhat.com> References: <1273245247-24827-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 05/11] ide: Fix ide_dma_cancel List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@linux.vnet.ibm.com 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 --- 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 0757528..3cd55e3 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2838,10 +2838,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"); @@ -2849,6 +2845,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