qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, kraxel@redhat.com, mst@redhat.com,
	joerg.roedel@amd.com, agraf@suse.de, avi@redhat.com,
	eduard.munteanu@linux360.ro, rth@twiddle.net
Subject: [Qemu-devel] [PATCH 8/9] pcnet-pci: Use PCI DMA stub functions
Date: Mon,  5 Sep 2011 14:35:03 +1000	[thread overview]
Message-ID: <1315197304-22469-9-git-send-email-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <1315197304-22469-1-git-send-email-david@gibson.dropbear.id.au>

From: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>

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>
---
 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 51e1320..40403a9 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;
-- 
1.7.5.4

  parent reply	other threads:[~2011-09-05  4:35 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-05  4:34 [Qemu-devel] [0/9] Preliminary work for IOMMU emulation support; the easy bits (v2) David Gibson
2011-09-05  4:34 ` [Qemu-devel] [PATCH 1/9] Add stub functions for PCI device models to do PCI DMA David Gibson
2011-10-02 10:25   ` Michael S. Tsirkin
2011-10-02 10:29     ` Avi Kivity
2011-10-02 10:52       ` Michael S. Tsirkin
2011-10-02 10:58         ` Avi Kivity
2011-10-02 11:17           ` Michael S. Tsirkin
2011-10-02 11:28             ` Alexander Graf
2011-10-02 11:43               ` Michael S. Tsirkin
2011-10-02 12:01             ` Avi Kivity
2011-10-02 12:14               ` Michael S. Tsirkin
2011-10-02 12:26                 ` Avi Kivity
2011-10-03 13:17                 ` Anthony Liguori
2011-10-12  3:09                   ` David Gibson
2011-10-12  9:12                     ` Michael S. Tsirkin
2011-10-14  2:14                   ` David Gibson
2011-10-16 12:50                     ` Michael S. Tsirkin
2011-10-16 13:15                     ` Avi Kivity
2011-10-18  1:46                       ` David Gibson
2011-10-19  0:31                         ` Rusty Russell
2011-10-19  1:22                         ` Michael S. Tsirkin
2011-10-19  9:10                         ` Avi Kivity
2011-10-20  2:58                           ` David Gibson
2011-10-12  3:07                 ` David Gibson
2011-10-12  7:22                   ` Michael S. Tsirkin
2011-10-12 15:43                     ` David Gibson
2011-10-12 15:45                       ` David Gibson
2011-10-12  3:11         ` David Gibson
2011-10-12  8:44           ` Michael S. Tsirkin
2011-10-12  9:08             ` Gerd Hoffmann
2011-10-03 13:10     ` Anthony Liguori
2011-09-05  4:34 ` [Qemu-devel] [PATCH 2/9] rtl8139: Use PCI DMA stub functions David Gibson
2011-09-05  4:34 ` [Qemu-devel] [PATCH 3/9] eepro100: " David Gibson
2011-10-02 11:45   ` Michael S. Tsirkin
2011-10-14  2:15     ` David Gibson
2011-09-05  4:34 ` [Qemu-devel] [PATCH 4/9] ac97: " David Gibson
2011-09-05  4:35 ` [Qemu-devel] [PATCH 5/9] es1370: " David Gibson
2011-09-05  4:35 ` [Qemu-devel] [PATCH 6/9] e1000: " David Gibson
2011-09-05  4:35 ` [Qemu-devel] [PATCH 7/9] lsi53c895a: " David Gibson
2011-09-05  4:35 ` David Gibson [this message]
2011-09-05  4:35 ` [Qemu-devel] [PATCH 9/9] intel-hda: " David Gibson
2011-09-16  6:58 ` [Qemu-devel] [0/9] Preliminary work for IOMMU emulation support; the easy bits (v2) David Gibson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1315197304-22469-9-git-send-email-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=agraf@suse.de \
    --cc=aliguori@us.ibm.com \
    --cc=avi@redhat.com \
    --cc=eduard.munteanu@linux360.ro \
    --cc=joerg.roedel@amd.com \
    --cc=kraxel@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).