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 --- dump.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'dump.c') diff --git a/dump.c b/dump.c index 87ca12cee0..44a1339c8a 100644 --- a/dump.c +++ b/dump.c @@ -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); } -- cgit v1.2.1