diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-05-17 13:17:34 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-05-17 13:17:34 -0500 |
| commit | 129414184e79e887a4028f153f3b50b92354a6fc (patch) | |
| tree | ed0c48e3df6d86f6cf750170daa4270d9305e5e8 /hw | |
| parent | f7ce72878c05dacc5f52374b69e61d00556a185b (diff) | |
| parent | 35ed5de6be186d46ff3e33554f32151fba0f401f (diff) | |
| download | qemu-129414184e79e887a4028f153f3b50b92354a6fc.zip qemu-129414184e79e887a4028f153f3b50b92354a6fc.tar.gz qemu-129414184e79e887a4028f153f3b50b92354a6fc.tar.bz2 | |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw')
| -rw-r--r-- | 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 b0165bc..066fecb 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; } } |