diff options
| author | Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> | 2011-10-31 17:06:54 +1100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-11-01 16:52:07 -0500 |
| commit | 14fecf26d06de52658a343cf78077a80c60cc121 (patch) | |
| tree | 50dcbbcd19d0c388bb2060f3e4b5405db6d07dc6 | |
| parent | 9ba4524cda1348cbe741535f77815dca6a57da05 (diff) | |
| download | qemu-14fecf26d06de52658a343cf78077a80c60cc121.zip qemu-14fecf26d06de52658a343cf78077a80c60cc121.tar.gz qemu-14fecf26d06de52658a343cf78077a80c60cc121.tar.bz2 | |
pcnet-pci: Use PCI DMA stub functions
This updates the pcnet-pci device emulation to use the explicit PCI DMA
functions, instead of directly calling physical memory access functions.
Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/pcnet-pci.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index fb2a00c..41a6e07 100644 --- a/hw/pcnet-pci.c +++ b/hw/pcnet-pci.c @@ -31,6 +31,7 @@ #include "net.h" #include "loader.h" #include "qemu-timer.h" +#include "dma.h" #include "pcnet.h" @@ -230,13 +231,13 @@ static const MemoryRegionOps pcnet_mmio_ops = { static void pci_physical_memory_write(void *dma_opaque, target_phys_addr_t addr, uint8_t *buf, int len, int do_bswap) { - cpu_physical_memory_write(addr, buf, len); + pci_dma_write(dma_opaque, addr, buf, len); } static void pci_physical_memory_read(void *dma_opaque, target_phys_addr_t addr, uint8_t *buf, int len, int do_bswap) { - cpu_physical_memory_read(addr, buf, len); + pci_dma_read(dma_opaque, addr, buf, len); } static void pci_pcnet_cleanup(VLANClientState *nc) @@ -302,6 +303,7 @@ static int pci_pcnet_init(PCIDevice *pci_dev) s->irq = pci_dev->irq[0]; s->phys_mem_read = pci_physical_memory_read; s->phys_mem_write = pci_physical_memory_write; + s->dma_opaque = pci_dev; if (!pci_dev->qdev.hotplugged) { static int loaded = 0; |