@@ -30,7 +30,7 @@ typedef struct MemoryMappingList {
QTAILQ_HEAD(, MemoryMapping) head;
} MemoryMappingList;
-int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env);
+int cpu_get_memory_mapping(MemoryMappingList *list, CPUState *cpu);
bool cpu_paging_enabled(CPUArchState *env);
/*
@@ -138,7 +138,7 @@ int qemu_get_guest_memory_mapping(MemoryMappingList *list)
first_paging_enabled_cpu = find_paging_enabled_cpu(first_cpu);
if (first_paging_enabled_cpu) {
for (env = first_paging_enabled_cpu; env != NULL; env = env->next_cpu) {
- ret = cpu_get_memory_mapping(list, env);
+ ret = cpu_get_memory_mapping(list, ENV_GET_CPU(env));
if (ret < 0) {
return -1;
}
@@ -237,8 +237,11 @@ static void walk_pml4e(MemoryMappingList *list,
}
#endif
-int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env)
+int cpu_get_memory_mapping(MemoryMappingList *list, CPUState *cs)
{
+ X86CPU *cpu = X86_CPU(cs);
+ CPUX86State *env = &cpu->env;
+
if (!cpu_paging_enabled(env)) {
/* paging is disabled */
return 0;
Eliminates an occurrence of CPUArchState from sysemu/memory_mapping.h. Signed-off-by: Andreas Färber <afaerber@suse.de> --- include/sysemu/memory_mapping.h | 2 +- memory_mapping.c | 2 +- target-i386/arch_memory_mapping.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-)