| Message ID | 20220111184309.28637-10-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/dma: Use dma_addr_t type definition when relevant | expand |
On 11.01.22 19:43, Philippe Mathieu-Daudé wrote: > In the next commit we will use the dma_addr_t type in the QEMUSGList > structure. Since currently dma_addr_t is defined after QEMUSGList, > move the declarations to have dma_addr_t defined first. This is a > pure code-movement patch. Oh, that was the underlying reason for the movement. Anyhow, this certainly makes the next patch easier to review Reviewed-by: David Hildenbrand <david@redhat.com> > > Suggested-by: David Hildenbrand <david@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > include/sysemu/dma.h | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h > index 0db2478a506..c992d9d5d6b 100644 > --- a/include/sysemu/dma.h > +++ b/include/sysemu/dma.h > @@ -15,22 +15,11 @@ > #include "block/block.h" > #include "block/accounting.h" > > -typedef struct ScatterGatherEntry ScatterGatherEntry; > - > typedef enum { > DMA_DIRECTION_TO_DEVICE = 0, > DMA_DIRECTION_FROM_DEVICE = 1, > } DMADirection; > > -struct QEMUSGList { > - ScatterGatherEntry *sg; > - int nsg; > - int nalloc; > - size_t size; > - DeviceState *dev; > - AddressSpace *as; > -}; > - > /* > * When an IOMMU is present, bus addresses become distinct from > * CPU/memory physical addresses and may be a different size. Because > @@ -43,6 +32,17 @@ typedef uint64_t dma_addr_t; > #define DMA_ADDR_BITS 64 > #define DMA_ADDR_FMT "%" PRIx64 > > +typedef struct ScatterGatherEntry ScatterGatherEntry; > + > +struct QEMUSGList { > + ScatterGatherEntry *sg; > + int nsg; > + int nalloc; > + size_t size; > + DeviceState *dev; > + AddressSpace *as; > +}; > + > static inline void dma_barrier(AddressSpace *as, DMADirection dir) > { > /*
On 1/12/22 05:43, Philippe Mathieu-Daudé wrote: > In the next commit we will use the dma_addr_t type in the QEMUSGList > structure. Since currently dma_addr_t is defined after QEMUSGList, > move the declarations to have dma_addr_t defined first. This is a > pure code-movement patch. > > Suggested-by: David Hildenbrand<david@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org> > --- > include/sysemu/dma.h | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index 0db2478a506..c992d9d5d6b 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -15,22 +15,11 @@ #include "block/block.h" #include "block/accounting.h" -typedef struct ScatterGatherEntry ScatterGatherEntry; - typedef enum { DMA_DIRECTION_TO_DEVICE = 0, DMA_DIRECTION_FROM_DEVICE = 1, } DMADirection; -struct QEMUSGList { - ScatterGatherEntry *sg; - int nsg; - int nalloc; - size_t size; - DeviceState *dev; - AddressSpace *as; -}; - /* * When an IOMMU is present, bus addresses become distinct from * CPU/memory physical addresses and may be a different size. Because @@ -43,6 +32,17 @@ typedef uint64_t dma_addr_t; #define DMA_ADDR_BITS 64 #define DMA_ADDR_FMT "%" PRIx64 +typedef struct ScatterGatherEntry ScatterGatherEntry; + +struct QEMUSGList { + ScatterGatherEntry *sg; + int nsg; + int nalloc; + size_t size; + DeviceState *dev; + AddressSpace *as; +}; + static inline void dma_barrier(AddressSpace *as, DMADirection dir) { /*
In the next commit we will use the dma_addr_t type in the QEMUSGList structure. Since currently dma_addr_t is defined after QEMUSGList, move the declarations to have dma_addr_t defined first. This is a pure code-movement patch. Suggested-by: David Hildenbrand <david@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- include/sysemu/dma.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)