]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
Correct types in bmdma_addr_{read,write}
authorDavid Gibson <david@gibson.dropbear.id.au>
Wed, 11 Jan 2012 19:46:24 +0000 (19:46 +0000)
committerAlexander Graf <agraf@suse.de>
Sat, 21 Jan 2012 04:17:01 +0000 (05:17 +0100)
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>
hw/ide/pci.c

index cb3de6537b1c2f9e3629f994a4d397af8d6dd442..246dd5704b8dc576970e018348098182d1f34a8e 100644 (file)
@@ -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;