[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/19] hw/dma: Move ScatterGatherEntry / QEMUSGList declarations a
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 16/19] hw/dma: Move ScatterGatherEntry / QEMUSGList declarations around |
Date: |
Tue, 18 Jan 2022 13:02:26 +0100 |
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>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20220111184309.28637-10-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)
{
/*
--
2.34.1
- [PULL 03/19] memory: Have 'info mtree' remove duplicated Address Space information, (continued)
- [PULL 03/19] memory: Have 'info mtree' remove duplicated Address Space information, Philippe Mathieu-Daudé, 2022/01/18
- [PULL 06/19] memory: Update description of memory_region_is_mapped(), Philippe Mathieu-Daudé, 2022/01/18
- [PULL 08/19] stubs: Restrict fw_cfg to system emulation, Philippe Mathieu-Daudé, 2022/01/18
- [PULL 10/19] hw/pci: Restrict pci-bus stub to sysemu, Philippe Mathieu-Daudé, 2022/01/18
- [PULL 19/19] docs/devel: add some clarifying text for aliases, Philippe Mathieu-Daudé, 2022/01/18
- [PULL 17/19] hw/dma: Use dma_addr_t type definition when relevant, Philippe Mathieu-Daudé, 2022/01/18
- [PULL 12/19] hw/dma: Remove CONFIG_USER_ONLY check, Philippe Mathieu-Daudé, 2022/01/18
- [PULL 07/19] memory: Fix incorrect calls of log_global_start/stop, Philippe Mathieu-Daudé, 2022/01/18
- [PULL 09/19] hw/nvram: Restrict fw_cfg QOM interface to sysemu and tools, Philippe Mathieu-Daudé, 2022/01/18
- [PULL 05/19] memory: Make memory_region_is_mapped() succeed when mapped via an alias, Philippe Mathieu-Daudé, 2022/01/18
- [PULL 16/19] hw/dma: Move ScatterGatherEntry / QEMUSGList declarations around,
Philippe Mathieu-Daudé <=
- [PULL 14/19] hw/scsi: Rename SCSIRequest::resid as 'residual', Philippe Mathieu-Daudé, 2022/01/18
- [PULL 11/19] hw/pci: Document pci_dma_map(), Philippe Mathieu-Daudé, 2022/01/18
- [PULL 13/19] hw/rdma/rdma_utils: Rename rdma_pci_dma_map 'len' argument, Philippe Mathieu-Daudé, 2022/01/18
- [PULL 18/19] hw/dma: Let dma_buf_read() / dma_buf_write() propagate MemTxResult, Philippe Mathieu-Daudé, 2022/01/18
- [PULL 15/19] hw/dma: Fix format string issues using dma_addr_t, Philippe Mathieu-Daudé, 2022/01/18
- Re: [PULL 00/19] Memory API patches for 2022-01-18, Peter Maydell, 2022/01/18