aboutsummaryrefslogtreecommitdiff
path: root/memory_mapping.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-05-29 21:54:03 +0200
committerAndreas Färber <afaerber@suse.de>2013-06-11 19:38:13 +0200
commit11ed09cf0753c1288a97f00138fc4534135442bb (patch)
tree0e48a592cc26a93ded6af16a8ca95cdf57d3a418 /memory_mapping.c
parent1b3509ca5bbd8e7d2be92ac42196a3ee2e31cb03 (diff)
memory_mapping: Improve qemu_get_guest_memory_mapping() error reporting
Pass any Error out into dump_init() and have it actually stop on errors. Whether it is unsupported on a certain CPU can be checked by looking for a NULL CPUClass::get_memory_mapping field. Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com> [AF: Reverted changes to CPU loops] Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'memory_mapping.c')
-rw-r--r--memory_mapping.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/memory_mapping.c b/memory_mapping.c
index 9bd24cecd2..5634f813cd 100644
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -178,7 +178,7 @@ static CPUArchState *find_paging_enabled_cpu(CPUArchState *start_cpu)
return NULL;
}
-int qemu_get_guest_memory_mapping(MemoryMappingList *list)
+void qemu_get_guest_memory_mapping(MemoryMappingList *list, Error **errp)
{
CPUArchState *env, *first_paging_enabled_cpu;
RAMBlock *block;
@@ -190,11 +190,11 @@ int qemu_get_guest_memory_mapping(MemoryMappingList *list)
Error *err = NULL;
cpu_get_memory_mapping(ENV_GET_CPU(env), list, &err);
if (err) {
- error_free(err);
- return -1;
+ error_propagate(errp, err);
+ return;
}
}
- return 0;
+ return;
}
/*
@@ -206,8 +206,6 @@ int qemu_get_guest_memory_mapping(MemoryMappingList *list)
length = block->length;
create_new_memory_mapping(list, offset, offset, length);
}
-
- return 0;
}
void qemu_get_guest_simple_memory_mapping(MemoryMappingList *list)