aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2020-09-28 12:42:45 +0200
committerGerd Hoffmann <kraxel@redhat.com>2020-09-30 11:29:56 +0200
commit52f5903a27f3bf862aced027dfce4444eed4e2fe (patch)
tree902167b3baf930761c5ff3933f1f022d3b4da1ca
parentb150cb8f67bf491a49a1cb1c7da151eeacbdbcc9 (diff)
move MemMapEntry
It is defined twice already. Move to a common header file to remove duplication and make it available to everybody. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Message-id: 20200928104256.9241-2-kraxel@redhat.com
-rw-r--r--hw/arm/sbsa-ref.c5
-rw-r--r--include/exec/hwaddr.h5
-rw-r--r--include/hw/arm/virt.h5
3 files changed, 5 insertions, 10 deletions
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 257ada9425..9c3a893bed 100644
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -80,11 +80,6 @@ enum {
SBSA_EHCI,
};
-typedef struct MemMapEntry {
- hwaddr base;
- hwaddr size;
-} MemMapEntry;
-
struct SBSAMachineState {
MachineState parent;
struct arm_boot_info bootinfo;
diff --git a/include/exec/hwaddr.h b/include/exec/hwaddr.h
index a71c93cc81..8f16d179a8 100644
--- a/include/exec/hwaddr.h
+++ b/include/exec/hwaddr.h
@@ -18,4 +18,9 @@ typedef uint64_t hwaddr;
#define HWADDR_PRIx PRIx64
#define HWADDR_PRIX PRIX64
+typedef struct MemMapEntry {
+ hwaddr base;
+ hwaddr size;
+} MemMapEntry;
+
#endif
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index d018a4f297..655b895d5e 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -111,11 +111,6 @@ typedef enum VirtGICType {
VIRT_GIC_VERSION_NOSEL,
} VirtGICType;
-typedef struct MemMapEntry {
- hwaddr base;
- hwaddr size;
-} MemMapEntry;
-
struct VirtMachineClass {
MachineClass parent;
bool disallow_affinity_adjustment;