qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: agraf@suse.de
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 5/9] Correct types in bmdma_addr_{read,write}
Date: Thu, 12 Jan 2012 16:46:24 +1100	[thread overview]
Message-ID: <1326347188-12119-6-git-send-email-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <1326347188-12119-1-git-send-email-david@gibson.dropbear.id.au>

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>
---
 hw/ide/pci.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index cb3de65..246dd57 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -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;
-- 
1.7.7.3

  parent reply	other threads:[~2012-01-12  5:46 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-12  5:46 [Qemu-devel] [0/9] Bugfixes and pseries enhancements David Gibson
2012-01-12  5:46 ` [Qemu-devel] [PATCH 1/9] load_image_targphys() should enforce the max size David Gibson
2012-01-12  5:46 ` [Qemu-devel] [PATCH 2/9] Fix dirty logging with 32-bit qemu & 64-bit guests David Gibson
2012-01-12  5:46 ` [Qemu-devel] [PATCH 3/9] pci: Make bounds checks on config space accesses actually work David Gibson
2012-01-12 13:19   ` Alexander Graf
2012-01-12 13:33     ` Michael S. Tsirkin
2012-01-12 13:32   ` Michael S. Tsirkin
2012-01-13  0:26     ` [Qemu-devel] [Qemu-ppc] " David Gibson
2012-01-13  1:23       ` Michael S. Tsirkin
2012-01-13  1:44         ` David Gibson
2012-01-16 11:24           ` Alexander Graf
2012-01-12  5:46 ` [Qemu-devel] [PATCH 4/9] Update gitignore file David Gibson
2012-01-12  5:46 ` David Gibson [this message]
2012-01-12  5:46 ` [Qemu-devel] [PATCH 6/9] pseries: Support PCI extended config space in RTAS calls David Gibson
2012-01-12  5:46 ` [Qemu-devel] [PATCH 7/9] pseries: Use correct dispatcher for PCI config space accesses David Gibson
2012-01-12  5:46 ` [Qemu-devel] [PATCH 8/9] pseries: Don't try to munmap() a malloc()ed TCE table David Gibson
2012-01-12  5:46 ` [Qemu-devel] [PATCH 9/9] pseries: SLOF PCI flag day David Gibson
2012-01-13 14:15 ` [Qemu-devel] [0/9] Bugfixes and pseries enhancements Alexander Graf

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=1326347188-12119-6-git-send-email-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=agraf@suse.de \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    /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).