falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Färber 2013-05-28 14:20:15 +02:00
parent 444d559078
commit 6d4d3ae77d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/qemu/typedefs.h
View File

@ -22,6 +22,8 @@ typedef struct AddressSpace AddressSpace;
typedef struct MemoryRegion MemoryRegion; typedef struct MemoryRegion MemoryRegion;
typedef struct MemoryRegionSection MemoryRegionSection; typedef struct MemoryRegionSection MemoryRegionSection;
typedef struct MemoryMappingList MemoryMappingList;
typedef struct NICInfo NICInfo; typedef struct NICInfo NICInfo;
typedef struct HCIInfo HCIInfo; typedef struct HCIInfo HCIInfo;
typedef struct AudioState AudioState; typedef struct AudioState AudioState;

5
include/sysemu/memory_mapping.h
View File

@ -15,6 +15,7 @@
#define MEMORY_MAPPING_H #define MEMORY_MAPPING_H
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qemu/typedefs.h"
/* The physical and virtual address in the memory mapping are contiguous. */ /* The physical and virtual address in the memory mapping are contiguous. */
typedef struct MemoryMapping { typedef struct MemoryMapping {
@ -24,11 +25,11 @@ typedef struct MemoryMapping {
QTAILQ_ENTRY(MemoryMapping) next; QTAILQ_ENTRY(MemoryMapping) next;
} MemoryMapping; } MemoryMapping;
typedef struct MemoryMappingList { struct MemoryMappingList {
unsigned int num; unsigned int num;
MemoryMapping *last_mapping; MemoryMapping *last_mapping;
QTAILQ_HEAD(, MemoryMapping) head; QTAILQ_HEAD(, MemoryMapping) head;
} MemoryMappingList; };
int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env); int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env);