|
 |
9ae3a8 |
From 810b9028eba23f399b2dcd22e746f99f2577150f Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 12 Aug 2013 15:59:36 +0200
|
|
|
9ae3a8 |
Subject: memory_mapping: Improve qemu_get_guest_memory_mapping() error reporting
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1376323180-12863-7-git-send-email-lersek@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 53165
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 qemu-kvm PATCH 06/10] memory_mapping: Improve qemu_get_guest_memory_mapping() error reporting
|
|
|
9ae3a8 |
Bugzilla: 981582
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Radim Krcmar <rkrcmar@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Andreas Färber <afaerber@suse.de>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Pass any Error out into dump_init() and have it actually stop on errors.
|
|
|
9ae3a8 |
Whether it is unsupported on a certain CPU can be checked by looking for
|
|
|
9ae3a8 |
a NULL CPUClass::get_memory_mapping field.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
[AF: Reverted changes to CPU loops]
|
|
|
9ae3a8 |
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
|
9ae3a8 |
(cherry picked from commit 11ed09cf0753c1288a97f00138fc4534135442bb)
|
|
|
9ae3a8 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/dump.c b/dump.c
|
|
|
9ae3a8 |
index 87ca12c..44a1339 100644
|
|
|
9ae3a8 |
--- a/dump.c
|
|
|
9ae3a8 |
+++ b/dump.c
|
|
|
9ae3a8 |
@@ -707,6 +707,7 @@ static int dump_init(DumpState *s, int fd, bool paging, bool has_filter,
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
CPUArchState *env;
|
|
|
9ae3a8 |
int nr_cpus;
|
|
|
9ae3a8 |
+ Error *err = NULL;
|
|
|
9ae3a8 |
int ret;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
if (runstate_is_running()) {
|
|
|
9ae3a8 |
@@ -757,7 +758,11 @@ static int dump_init(DumpState *s, int fd, bool paging, bool has_filter,
|
|
|
9ae3a8 |
/* get memory mapping */
|
|
|
9ae3a8 |
memory_mapping_list_init(&s->list);
|
|
|
9ae3a8 |
if (paging) {
|
|
|
9ae3a8 |
- qemu_get_guest_memory_mapping(&s->list);
|
|
|
9ae3a8 |
+ qemu_get_guest_memory_mapping(&s->list, &err;;
|
|
|
9ae3a8 |
+ if (err != NULL) {
|
|
|
9ae3a8 |
+ error_propagate(errp, err);
|
|
|
9ae3a8 |
+ goto cleanup;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
} else {
|
|
|
9ae3a8 |
qemu_get_guest_simple_memory_mapping(&s->list);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mapping.h
|
|
|
9ae3a8 |
index c47e6ee..6dfb68d 100644
|
|
|
9ae3a8 |
--- a/include/sysemu/memory_mapping.h
|
|
|
9ae3a8 |
+++ b/include/sysemu/memory_mapping.h
|
|
|
9ae3a8 |
@@ -45,13 +45,7 @@ void memory_mapping_list_free(MemoryMappingList *list);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
void memory_mapping_list_init(MemoryMappingList *list);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-/*
|
|
|
9ae3a8 |
- * Return value:
|
|
|
9ae3a8 |
- * 0: success
|
|
|
9ae3a8 |
- * -1: failed
|
|
|
9ae3a8 |
- * -2: unsupported
|
|
|
9ae3a8 |
- */
|
|
|
9ae3a8 |
-int qemu_get_guest_memory_mapping(MemoryMappingList *list);
|
|
|
9ae3a8 |
+void qemu_get_guest_memory_mapping(MemoryMappingList *list, Error **errp);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/* get guest's memory mapping without do paging(virtual address is 0). */
|
|
|
9ae3a8 |
void qemu_get_guest_simple_memory_mapping(MemoryMappingList *list);
|
|
|
9ae3a8 |
diff --git a/memory_mapping.c b/memory_mapping.c
|
|
|
9ae3a8 |
index 9bd24ce..5634f81 100644
|
|
|
9ae3a8 |
--- a/memory_mapping.c
|
|
|
9ae3a8 |
+++ b/memory_mapping.c
|
|
|
9ae3a8 |
@@ -178,7 +178,7 @@ static CPUArchState *find_paging_enabled_cpu(CPUArchState *start_cpu)
|
|
|
9ae3a8 |
return NULL;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-int qemu_get_guest_memory_mapping(MemoryMappingList *list)
|
|
|
9ae3a8 |
+void qemu_get_guest_memory_mapping(MemoryMappingList *list, Error **errp)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
CPUArchState *env, *first_paging_enabled_cpu;
|
|
|
9ae3a8 |
RAMBlock *block;
|
|
|
9ae3a8 |
@@ -190,11 +190,11 @@ int qemu_get_guest_memory_mapping(MemoryMappingList *list)
|
|
|
9ae3a8 |
Error *err = NULL;
|
|
|
9ae3a8 |
cpu_get_memory_mapping(ENV_GET_CPU(env), list, &err;;
|
|
|
9ae3a8 |
if (err) {
|
|
|
9ae3a8 |
- error_free(err);
|
|
|
9ae3a8 |
- return -1;
|
|
|
9ae3a8 |
+ error_propagate(errp, err);
|
|
|
9ae3a8 |
+ return;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
- return 0;
|
|
|
9ae3a8 |
+ return;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/*
|
|
|
9ae3a8 |
@@ -206,8 +206,6 @@ int qemu_get_guest_memory_mapping(MemoryMappingList *list)
|
|
|
9ae3a8 |
length = block->length;
|
|
|
9ae3a8 |
create_new_memory_mapping(list, offset, offset, length);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- return 0;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
void qemu_get_guest_simple_memory_mapping(MemoryMappingList *list)
|