diff options
author | Andreas Färber <afaerber@suse.de> | 2013-05-28 14:20:15 +0200 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2013-06-11 17:58:03 +0200 |
commit | 6d4d3ae77dbb756d454c2deb2ef844b0cc7bde7b (patch) | |
tree | 4eaf32a00a4b214ba11e99f0fad083fb594bd855 /include/sysemu/memory_mapping.h | |
parent | 444d55907871f88276a654fc7fdc8c7db95f4b59 (diff) |
memory_mapping: Move MemoryMappingList typedef to qemu/typedefs.h
This will avoid issues with hwaddr and ram_addr_t when including
sysemu/memory_mapping.h for CONFIG_USER_ONLY, e.g., from qom/cpu.h.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'include/sysemu/memory_mapping.h')
-rw-r--r-- | include/sysemu/memory_mapping.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mapping.h index 6f01524451..1f71c327b1 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); |