[RFC PATCH 11/13] pcnet: use the DMA memory access interface

Eduard - Gabriel Munteanu
2011-06-01T01:39:14Z

This allows the device to work properly with an emulated IOMMU.

Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
---
hw/pcnet-pci.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c
index 9415a1e..6c2186e 100644
--- a/hw/pcnet-pci.c
+++ b/hw/pcnet-pci.c
@@ -217,13 +217,13 @@ static CPUReadMemoryFunc * const pcnet_mmio_read[] = {
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_memory_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_memory_read(dma_opaque, addr, buf, len);
}

static void pci_pcnet_cleanup(VLANClientState *nc)
@@ -292,6 +292,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;
--
1.7.3.4