[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-cpu v3 5/9] memory_mapping: Move MemoryMappingLi
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-cpu v3 5/9] memory_mapping: Move MemoryMappingList typedef to qemu/typedefs.h |
Date: |
Thu, 30 May 2013 17:07:57 +0200 |
This will avoid issues with hwaddr and ram_addr_t when including
sysemu/memory_mapping.h for CONFIG_USER_ONLY.
Signed-off-by: Andreas Färber <address@hidden>
---
include/qemu/typedefs.h | 2 ++
include/sysemu/memory_mapping.h | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 93aae81..1218a61 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -22,6 +22,8 @@ typedef struct AddressSpace AddressSpace;
typedef struct MemoryRegion MemoryRegion;
typedef struct MemoryRegionSection MemoryRegionSection;
+typedef struct MemoryMappingList MemoryMappingList;
+
typedef struct NICInfo NICInfo;
typedef struct HCIInfo HCIInfo;
typedef struct AudioState AudioState;
diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mapping.h
index 6f01524..1f71c32 100644
--- a/include/sysemu/memory_mapping.h
+++ b/include/sysemu/memory_mapping.h
@@ -15,6 +15,7 @@
#define MEMORY_MAPPING_H
#include "qemu/queue.h"
+#include "qemu/typedefs.h"
/* The physical and virtual address in the memory mapping are contiguous. */
typedef struct MemoryMapping {
@@ -24,11 +25,11 @@ typedef struct MemoryMapping {
QTAILQ_ENTRY(MemoryMapping) next;
} MemoryMapping;
-typedef struct MemoryMappingList {
+struct MemoryMappingList {
unsigned int num;
MemoryMapping *last_mapping;
QTAILQ_HEAD(, MemoryMapping) head;
-} MemoryMappingList;
+};
int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env);
--
1.8.1.4
- [Qemu-devel] [PATCH qom-cpu v3 0/9] dump: Build cleanups redone, Andreas Färber, 2013/05/30
- [Qemu-devel] [PATCH qom-cpu v3 1/9] dump: Move stubs into libqemustub.a, Andreas Färber, 2013/05/30
- [Qemu-devel] [PATCH qom-cpu v3 2/9] target-i386: Fix mask of pte index in memory mapping, Andreas Färber, 2013/05/30
- [Qemu-devel] [PATCH qom-cpu v3 5/9] memory_mapping: Move MemoryMappingList typedef to qemu/typedefs.h,
Andreas Färber <=
- [Qemu-devel] [PATCH qom-cpu v3 3/9] target-i386: walk_pml4e(): fix abort on bad PML4E/PDPTE/PDE/PTE addresses, Andreas Färber, 2013/05/30
- [Qemu-devel] [PATCH qom-cpu v3 7/9] memory_mapping: Drop qemu_get_memory_mapping() stub, Andreas Färber, 2013/05/30
- [Qemu-devel] [PATCH qom-cpu v3 8/9] dump: Unconditionally compile, Andreas Färber, 2013/05/30
- [Qemu-devel] [PATCH qom-cpu v3 6/9] cpu: Turn cpu_get_memory_mapping() into a CPUState hook, Andreas Färber, 2013/05/30
- [Qemu-devel] [PATCH qom-cpu v3 4/9] cpu: Turn cpu_paging_enabled() into a CPUState hook, Andreas Färber, 2013/05/30
- [Qemu-devel] [PATCH qom-cpu v3 9/9] memory_mapping: Change qemu_get_guest_memory_mapping() semantics, Andreas Färber, 2013/05/30
- Re: [Qemu-devel] [PATCH qom-cpu v3 0/9] dump: Build cleanups redone, Luiz Capitulino, 2013/05/31