diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2016-01-30 23:36:52 +1100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-01-30 23:37:25 +1100 |
| commit | 03c1280bf5dbb0b0f6125d17b8eebe9b9e97c8d8 (patch) | |
| tree | c865ed04e54b71f003b91ef96aaafac7ec68e51c /hw/ppc/mac.h | |
| parent | 6a9620e60cc1b16dba9ee9d9d8cb374e4303c072 (diff) | |
| download | qemu-03c1280bf5dbb0b0f6125d17b8eebe9b9e97c8d8.tar.gz | |
macio: use the existing IDEDMA aiocb to hold the active DMA aiocb
Currently the aiocb is held within MACIOIDEState, however the IDE core code
assumes that the current actvie DMA aiocb is held in aiocb in a few places,
e.g. ide_bus_reset() and ide_reset().
Switch over to using IDEDMA aiocb to store the aiocb for the current active
DMA request so that bus resets and restarts are handled correctly. As a
consequence we can now use ide_set_inactive() rather than handling its
functionality ourselves.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc/mac.h')
| -rw-r--r-- | hw/ppc/mac.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index e375ed2b2b..ecf7792bc9 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -134,7 +134,6 @@ typedef struct MACIOIDEState { MemoryRegion mem; IDEBus bus; - BlockAIOCB *aiocb; IDEDMA dma; void *dbdma; bool dma_active; |