mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use dma_addr_t type for scatter/gather code

Browse Source 
This patch uses the newly created dma_addr_t type throughout the
scatter/gather handling code in dma-helpers.c whenever we need to
represent a dma bus address.  This makes a better distinction as to
what is a bus address and what is a cpu physical address.  Since we
don't support IOMMUs yet, they can't be very different for now, but
that will change in future, and this preliminary helps clarify what's
going on.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
David Gibson 2011-10-31 17:06:46 +11:00 committed by Anthony Liguori
parent d9d1055ef1
commit d32311810f
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dma-helpers.c
View File

@ -18,8 +18,7 @@ void qemu_sglist_init(QEMUSGList *qsg, int alloc_hint)
qsg->size = 0; qsg->size = 0;
} }
void qemu_sglist_add(QEMUSGList *qsg, target_phys_addr_t base, void qemu_sglist_add(QEMUSGList *qsg, dma_addr_t base, dma_addr_t len)
target_phys_addr_t len)
{ {
if (qsg->nsg == qsg->nalloc) { if (qsg->nsg == qsg->nalloc) {
qsg->nalloc = 2 * qsg->nalloc + 1; qsg->nalloc = 2 * qsg->nalloc + 1;
@ -45,7 +44,7 @@ typedef struct {
bool to_dev; bool to_dev;
bool in_cancel; bool in_cancel;
int sg_cur_index; int sg_cur_index;
target_phys_addr_t sg_cur_byte; dma_addr_t sg_cur_byte;
QEMUIOVector iov; QEMUIOVector iov;
QEMUBH *bh; QEMUBH *bh;
DMAIOFunc *io_func; DMAIOFunc *io_func;

9
dma.h
View File

@ -28,20 +28,19 @@ typedef enum {
} DMADirection; } DMADirection;
struct ScatterGatherEntry { struct ScatterGatherEntry {
target_phys_addr_t base; dma_addr_t base;
target_phys_addr_t len; dma_addr_t len;
}; };
struct QEMUSGList { struct QEMUSGList {
ScatterGatherEntry *sg; ScatterGatherEntry *sg;
int nsg; int nsg;
int nalloc; int nalloc;
target_phys_addr_t size; dma_addr_t size;
}; };
void qemu_sglist_init(QEMUSGList *qsg, int alloc_hint); void qemu_sglist_init(QEMUSGList *qsg, int alloc_hint);
void qemu_sglist_add(QEMUSGList *qsg, target_phys_addr_t base, void qemu_sglist_add(QEMUSGList *qsg, dma_addr_t base, dma_addr_t len);
target_phys_addr_t len);
void qemu_sglist_destroy(QEMUSGList *qsg); void qemu_sglist_destroy(QEMUSGList *qsg);
#endif #endif