diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-05-29 21:54:03 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-06-11 19:38:13 +0200 |
| commit | 11ed09cf0753c1288a97f00138fc4534135442bb (patch) | |
| tree | 0e48a592cc26a93ded6af16a8ca95cdf57d3a418 | |
| parent | 1b3509ca5bbd8e7d2be92ac42196a3ee2e31cb03 (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>
| -rw-r--r-- | dump.c | 7 | ||||
| -rw-r--r-- | include/sysemu/memory_mapping.h | 8 | ||||
| -rw-r--r-- | memory_mapping.c | 10 |
3 files changed, 11 insertions, 14 deletions
@@ -707,6 +707,7 @@ static int dump_init(DumpState *s, int fd, bool paging, bool has_filter, { CPUArchState *env; int nr_cpus; + Error *err = NULL; int ret; if (runstate_is_running()) { @@ -757,7 +758,11 @@ static int dump_init(DumpState *s, int fd, bool paging, bool has_filter, /* get memory mapping */ memory_mapping_list_init(&s->list); if (paging) { - qemu_get_guest_memory_mapping(&s->list); + qemu_get_guest_memory_mapping(&s->list, &err); + if (err != NULL) { + error_propagate(errp, err); + goto cleanup; + } } else { qemu_get_guest_simple_memory_mapping(&s->list); } diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mapping.h index c47e6ee1fd..6dfb68ddcd 100644 --- a/include/sysemu/memory_mapping.h +++ b/include/sysemu/memory_mapping.h @@ -45,13 +45,7 @@ void memory_mapping_list_free(MemoryMappingList *list); void memory_mapping_list_init(MemoryMappingList *list); -/* - * Return value: - * 0: success - * -1: failed - * -2: unsupported - */ -int qemu_get_guest_memory_mapping(MemoryMappingList *list); +void qemu_get_guest_memory_mapping(MemoryMappingList *list, Error **errp); /* get guest's memory mapping without do paging(virtual address is 0). */ void qemu_get_guest_simple_memory_mapping(MemoryMappingList *list); 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) |