diff options
Diffstat (limited to 'dump.c')
| -rw-r--r-- | dump.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/dump.c b/dump.c index 0ca14f87ed..2bf8d8d994 100644 --- a/dump.c +++ b/dump.c @@ -6,16 +6,13 @@ * Authors: * Wen Congyang <wency@cn.fujitsu.com> * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. * */ #include "qemu-common.h" -#include <unistd.h> #include "elf.h" -#include <sys/procfs.h> -#include <glib.h> #include "cpu.h" #include "cpu-all.h" #include "targphys.h" @@ -23,13 +20,11 @@ #include "kvm.h" #include "dump.h" #include "sysemu.h" -#include "bswap.h" #include "memory_mapping.h" #include "error.h" #include "qmp-commands.h" #include "gdbstub.h" -#if defined(CONFIG_HAVE_CORE_DUMP) static uint16_t cpu_convert_to_target16(uint16_t val, int endian) { if (endian == ELFDATA2LSB) { @@ -750,6 +745,13 @@ static int dump_init(DumpState *s, int fd, bool paging, bool has_filter, goto cleanup; } + s->note_size = cpu_get_note_size(s->dump_info.d_class, + s->dump_info.d_machine, nr_cpus); + if (ret < 0) { + error_set(errp, QERR_UNSUPPORTED); + goto cleanup; + } + /* get memory mapping */ memory_mapping_list_init(&s->list); if (paging) { @@ -784,8 +786,6 @@ static int dump_init(DumpState *s, int fd, bool paging, bool has_filter, } } - s->note_size = cpu_get_note_size(s->dump_info.d_class, - s->dump_info.d_machine, nr_cpus); if (s->dump_info.d_class == ELFCLASS64) { if (s->have_section) { s->memory_offset = sizeof(Elf64_Ehdr) + @@ -871,13 +871,3 @@ void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin, g_free(s); } - -#else -/* we need this function in hmp.c */ -void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin, - int64_t begin, bool has_length, int64_t length, - Error **errp) -{ - error_set(errp, QERR_UNSUPPORTED); -} -#endif |