diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-05 09:39:25 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-05 09:39:25 -0600 |
| commit | eb5d5beaebd102599a915f6c4813d445ddc9dc84 (patch) | |
| tree | 12ce2331571a30c67bde0b8f4ddb55996dd0ba65 /hw/ide | |
| parent | f6480ca3f3423be5bee8b673ee6f5cc387659def (diff) | |
| parent | 922453bca6a927bb527068ae8679d587cfa45dbc (diff) | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/macio.c | 5 | ||||
| -rw-r--r-- | hw/ide/pci.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 70b33422d2..c09d2e0a35 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -200,8 +200,9 @@ static void pmac_ide_flush(DBDMA_io *io) { MACIOIDEState *m = io->opaque; - if (m->aiocb) - qemu_aio_flush(); + if (m->aiocb) { + bdrv_drain_all(); + } } /* PowerMac IDE memory IO */ diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 49b823df79..5078c0b565 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -309,7 +309,7 @@ void bmdma_cmd_writeb(BMDMAState *bm, uint32_t val) * aio operation with preadv/pwritev. */ if (bm->bus->dma->aiocb) { - qemu_aio_flush(); + bdrv_drain_all(); assert(bm->bus->dma->aiocb == NULL); assert((bm->status & BM_STATUS_DMAING) == 0); } |