diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2012-01-11 19:46:24 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-01-21 05:17:01 +0100 |
| commit | 964455f39ed540e5968ec3000a3fb3d8fb20823c (patch) | |
| tree | 85bbc4ccca4afd84ee4ab2d9c245eee0f04d708b /hw/ide | |
| parent | 033276a7d1701c98bb478341c13d2e1c6692b688 (diff) | |
| download | qemu-964455f39ed540e5968ec3000a3fb3d8fb20823c.zip qemu-964455f39ed540e5968ec3000a3fb3d8fb20823c.tar.gz qemu-964455f39ed540e5968ec3000a3fb3d8fb20823c.tar.bz2 | |
Correct types in bmdma_addr_{read,write}
Back when I made patches introducing dma_addr_t and various PCI DMA
wrapper functions, I made a mistake. The bmdma_addr_{read,write} functions
need to take target_phys_addr_t not dma_addr_t, since they are assigned
to MemoryRegionOps callbacks.
This patch corrects my error.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ide/pci.c b/hw/ide/pci.c index cb3de65..246dd57 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -327,7 +327,7 @@ void bmdma_cmd_writeb(BMDMAState *bm, uint32_t val) bm->cmd = val & 0x09; } -static uint64_t bmdma_addr_read(void *opaque, dma_addr_t addr, +static uint64_t bmdma_addr_read(void *opaque, target_phys_addr_t addr, unsigned width) { BMDMAState *bm = opaque; @@ -341,7 +341,7 @@ static uint64_t bmdma_addr_read(void *opaque, dma_addr_t addr, return data; } -static void bmdma_addr_write(void *opaque, dma_addr_t addr, +static void bmdma_addr_write(void *opaque, target_phys_addr_t addr, uint64_t data, unsigned width) { BMDMAState *bm = opaque; |