From patchwork Tue Mar 27 02:43:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 148852 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BC67DB6EF4 for ; Tue, 27 Mar 2012 13:43:50 +1100 (EST) Received: from localhost ([::1]:47030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCMNw-000059-EP for incoming@patchwork.ozlabs.org; Mon, 26 Mar 2012 22:43:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCMNo-0008WF-6H for qemu-devel@nongnu.org; Mon, 26 Mar 2012 22:43:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCMNk-0006gU-Re for qemu-devel@nongnu.org; Mon, 26 Mar 2012 22:43:39 -0400 Received: from ozlabs.org ([203.10.76.45]:33594) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCMNk-0006gB-Fs for qemu-devel@nongnu.org; Mon, 26 Mar 2012 22:43:36 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 0D311B6EE7; Tue, 27 Mar 2012 13:43:31 +1100 (EST) From: David Gibson To: aliguori@us.ibm.com Date: Tue, 27 Mar 2012 13:43:21 +1100 Message-Id: <1332816201-5072-1-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.9.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.10.76.45 Cc: David Gibson , qemu-devel@nongnu.org, mst@redhat.com Subject: [Qemu-devel] [PATCH] Better support for dma_addr_t variables X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 | 4 ++++ 2 files changed, 5 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..e407771 --- /dev/null +++ b/hw/qdev-dma.h @@ -0,0 +1,4 @@ +#include "qdev-addr.h" + +#define DEFINE_PROP_DMAADDR(_n, _s, _f, _d) \ + DEFINE_PROP_TADDR(_n, _s, _f, _d)