qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: aliguori@us.ibm.com
Cc: mst@redhat.com, joerg.roedel@amd.com, agraf@suse.de,
	qemu-devel@nongnu.org, avi@redhat.com,
	eduard.munteanu@linux360.ro, rth@twiddle.net
Subject: [Qemu-devel] [PATCH 05/12] es1370: Use PCI DMA stub functions
Date: Fri, 14 Oct 2011 20:20:56 +1100	[thread overview]
Message-ID: <1318584063-1611-6-git-send-email-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <1318584063-1611-1-git-send-email-david@gibson.dropbear.id.au>

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

This updates the es1370 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/es1370.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/es1370.c b/hw/es1370.c
index 2daadde..c5c16b0 100644
--- a/hw/es1370.c
+++ b/hw/es1370.c
@@ -30,6 +30,7 @@
 #include "audiodev.h"
 #include "audio/audio.h"
 #include "pci.h"
+#include "dma.h"
 
 /* Missing stuff:
    SCTRL_P[12](END|ST)INC
@@ -802,7 +803,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
             if (!acquired)
                 break;
 
-            cpu_physical_memory_write (addr, tmpbuf, acquired);
+            pci_dma_write (&s->dev, addr, tmpbuf, acquired);
 
             temp -= acquired;
             addr += acquired;
@@ -816,7 +817,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
             int copied, to_copy;
 
             to_copy = audio_MIN ((size_t) temp, sizeof (tmpbuf));
-            cpu_physical_memory_read (addr, tmpbuf, to_copy);
+            pci_dma_read (&s->dev, addr, tmpbuf, to_copy);
             copied = AUD_write (voice, tmpbuf, to_copy);
             if (!copied)
                 break;
-- 
1.7.6.3

  parent reply	other threads:[~2011-10-14  9:21 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-14  9:20 [Qemu-devel] [0/12] Preliminary work for IOMMU emulation support (v2) David Gibson
2011-10-14  9:20 ` [Qemu-devel] [PATCH 01/12] Add stub functions for PCI device models to do PCI DMA David Gibson
2011-10-14  9:20 ` [Qemu-devel] [PATCH 02/12] rtl8139: Use PCI DMA stub functions David Gibson
2011-10-14  9:20 ` [Qemu-devel] [PATCH 03/12] eepro100: " David Gibson
2011-10-14  9:20 ` [Qemu-devel] [PATCH 04/12] ac97: " David Gibson
2011-10-14  9:20 ` David Gibson [this message]
2011-10-14  9:20 ` [Qemu-devel] [PATCH 06/12] e1000: " David Gibson
2011-10-14  9:20 ` [Qemu-devel] [PATCH 07/12] lsi53c895a: " David Gibson
2011-10-14  9:20 ` [Qemu-devel] [PATCH 08/12] pcnet-pci: " David Gibson
2011-10-14  9:21 ` [Qemu-devel] [PATCH 09/12] intel-hda: " David Gibson
2011-10-14  9:21 ` [Qemu-devel] [PATCH 10/12] PCI IDE: " David Gibson
2011-10-14  9:21 ` [Qemu-devel] [PATCH 11/12] usb-ehci: " David Gibson
2011-10-14  9:21 ` [Qemu-devel] [PATCH 12/12] usb-uhci: " David Gibson
2011-10-14  9:24 ` [Qemu-devel] [0/12] Preliminary work for IOMMU emulation support (v2) David Gibson
2011-10-30 17:20 ` Alexander Graf
2011-10-30 17:52   ` Michael S. Tsirkin
2011-10-31  5:40     ` 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=1318584063-1611-6-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=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).