From 11ed09cf0753c1288a97f00138fc4534135442bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 29 May 2013 21:54:03 +0200 Subject: memory_mapping: Improve qemu_get_guest_memory_mapping() error reporting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 [AF: Reverted changes to CPU loops] Signed-off-by: Andreas Färber --- memory_mapping.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'memory_mapping.c') 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) -- cgit v1.2.1