ide: Fix ide_dma_cancel
PATCH 1/1 ide: Fix ide_dma_cancel
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 <[email protected]>
--- hw/ide/core.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
hw/ide/core.c +4 -4
@@ -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 ; } }
Signature · 1 line
1.6.6.1
Quoted 6 lines · Kevin Wolf
When cancelling a request,
bdrv_aio_cancelmay decide that it waits for completion of a request rather than for cancellation. IDE therefore can't abandon its DMA status before callingbdrv_aio_cancel; otherwise the callback of a completed request would use invalid data.Signed-off-by Kevin Wolf <[email protected]>
As mentioned before, looks good.
Reviewed-by Christoph Hellwig <[email protected]>