From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFDte-0000i9-31 for qemu-devel@nongnu.org; Tue, 03 Apr 2012 20:16:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFDtZ-0002Jx-E5 for qemu-devel@nongnu.org; Tue, 03 Apr 2012 20:16:21 -0400 Received: from ozlabs.org ([203.10.76.45]:48211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFDtZ-0002Jj-27 for qemu-devel@nongnu.org; Tue, 03 Apr 2012 20:16:17 -0400 From: David Gibson Date: Wed, 4 Apr 2012 10:15:57 +1000 Message-Id: <1333498558-20897-2-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1333498558-20897-1-git-send-email-david@gibson.dropbear.id.au> References: <1333498558-20897-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 1/2] Better support for dma_addr_t variables List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com, kraxel@redhat.com Cc: David Gibson , afaerber@web.de, qemu-devel@nongnu.org, mst@redhat.com A while back, we introduced the dma_addr_t type, which is supposed to be used for bus visible memory addresses. At present, this is an alias for target_phys_addr_t, but this will change when we eventually add support for guest visible IOMMUs. There are some instances of target_phys_addr_t in the code now which should really be dma_addr_t, but can't be trivially converted due to missing features which this patch corrects. * We add DMA_ADDR_BITS analagous to TARGET_PHYS_ADDR_BITS. This is important where we need to make a compile-time (#if) based on the size of dma_addr_t. * We add a new helper macro to create device properties which take a dma_addr_t, currently an alias to DEFINE_PROP_TADDR(). Signed-off-by: David Gibson --- dma.h | 1 + hw/qdev-dma.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) create mode 100644 hw/qdev-dma.h diff --git a/dma.h b/dma.h index 05ac325..463095c 100644 --- a/dma.h +++ b/dma.h @@ -32,6 +32,7 @@ struct QEMUSGList { #if defined(TARGET_PHYS_ADDR_BITS) typedef target_phys_addr_t dma_addr_t; +#define DMA_ADDR_BITS TARGET_PHYS_ADDR_BITS #define DMA_ADDR_FMT TARGET_FMT_plx struct ScatterGatherEntry { diff --git a/hw/qdev-dma.h b/hw/qdev-dma.h new file mode 100644 index 0000000..f0ff558 --- /dev/null +++ b/hw/qdev-dma.h @@ -0,0 +1,12 @@ +/* + * Support for dma_addr_t typed properties + * + * Copyright (C) 2012 David Gibson, IBM Corporation. + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#include "qdev-addr.h" + +#define DEFINE_PROP_DMAADDR(_n, _s, _f, _d) \ + DEFINE_PROP_TADDR(_n, _s, _f, _d) -- 1.7.9.1