From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qp1Va-0004d7-4O for qemu-devel@nongnu.org; Thu, 04 Aug 2011 13:14:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qp1VY-0001KR-SL for qemu-devel@nongnu.org; Thu, 04 Aug 2011 13:14:58 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:47246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qp1VY-0001KE-IX for qemu-devel@nongnu.org; Thu, 04 Aug 2011 13:14:56 -0400 Received: by wwf26 with SMTP id 26so1933681wwf.10 for ; Thu, 04 Aug 2011 10:14:55 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 4 Aug 2011 19:14:39 +0200 Message-Id: <1312478089-806-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1312478089-806-1-git-send-email-pbonzini@redhat.com> References: <1312478089-806-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 01/10] dma-helpers: allow including from target-independent code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Target-independent code cannot construct sglists, but it can take them from the outside as a black box. Allow this. Signed-off-by: Paolo Bonzini --- dma.h | 12 ++++++++---- qemu-common.h | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dma.h b/dma.h index 3d8324b..f7e0142 100644 --- a/dma.h +++ b/dma.h @@ -15,22 +15,26 @@ #include "hw/hw.h" #include "block.h" -typedef struct { +typedef struct ScatterGatherEntry ScatterGatherEntry; + +#if defined(TARGET_PHYS_ADDR_BITS) +struct ScatterGatherEntry { target_phys_addr_t base; target_phys_addr_t len; -} ScatterGatherEntry; +}; -typedef struct { +struct QEMUSGList { ScatterGatherEntry *sg; int nsg; int nalloc; target_phys_addr_t size; -} QEMUSGList; +}; void qemu_sglist_init(QEMUSGList *qsg, int alloc_hint); void qemu_sglist_add(QEMUSGList *qsg, target_phys_addr_t base, target_phys_addr_t len); void qemu_sglist_destroy(QEMUSGList *qsg); +#endif typedef BlockDriverAIOCB *DMAIOFunc(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *iov, int nb_sectors, diff --git a/qemu-common.h b/qemu-common.h index 1e3c665..69c6595 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -18,6 +18,7 @@ typedef struct DeviceState DeviceState; struct Monitor; typedef struct Monitor Monitor; +typedef struct QEMUSGList QEMUSGList; /* we put basic includes here to avoid repeating them in device drivers */ #include -- 1.7.6