From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42410) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Umvff-0008Iw-Gu for qemu-devel@nongnu.org; Wed, 12 Jun 2013 20:45:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Umvfc-0005Xf-Kd for qemu-devel@nongnu.org; Wed, 12 Jun 2013 20:45:47 -0400 Received: from cantor2.suse.de ([195.135.220.15]:32938 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Umvfc-0005XG-1U for qemu-devel@nongnu.org; Wed, 12 Jun 2013 20:45:44 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 78F14A52D8 for ; Thu, 13 Jun 2013 02:45:43 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 13 Jun 2013 02:45:27 +0200 Message-Id: <1371084329-814-16-git-send-email-afaerber@suse.de> In-Reply-To: <1371084329-814-1-git-send-email-afaerber@suse.de> References: <1371084329-814-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 15/17] memory_mapping: Improve qemu_get_guest_memory_mapping() error reporting List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= 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=C3=A4rber --- dump.c | 7 ++++++- include/sysemu/memory_mapping.h | 8 +------- memory_mapping.c | 10 ++++------ 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dump.c b/dump.c index 87ca12c..44a1339 100644 --- a/dump.c +++ b/dump.c @@ -707,6 +707,7 @@ static int dump_init(DumpState *s, int fd, bool pagin= g, bool has_filter, { CPUArchState *env; int nr_cpus; + Error *err =3D NULL; int ret; =20 if (runstate_is_running()) { @@ -757,7 +758,11 @@ static int dump_init(DumpState *s, int fd, bool pagi= ng, 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 !=3D 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_mapp= ing.h index c47e6ee..6dfb68d 100644 --- a/include/sysemu/memory_mapping.h +++ b/include/sysemu/memory_mapping.h @@ -45,13 +45,7 @@ void memory_mapping_list_free(MemoryMappingList *list)= ; =20 void memory_mapping_list_init(MemoryMappingList *list); =20 -/* - * 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= ); =20 /* 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 9bd24ce..5634f81 100644 --- a/memory_mapping.c +++ b/memory_mapping.c @@ -178,7 +178,7 @@ static CPUArchState *find_paging_enabled_cpu(CPUArchS= tate *start_cpu) return NULL; } =20 -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 =3D 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; } =20 /* @@ -206,8 +206,6 @@ int qemu_get_guest_memory_mapping(MemoryMappingList *= list) length =3D block->length; create_new_memory_mapping(list, offset, offset, length); } - - return 0; } =20 void qemu_get_guest_simple_memory_mapping(MemoryMappingList *list) --=20 1.8.1.4