falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hmp: fix "dump-quest-memory" segfault (arm) 

Running QEMU with
    qemu-system-aarch64 -M none -nographic -m 256
and executing
    dump-guest-memory /dev/null 0 8192
results in segfault

Fix by checking if we have CPU, and exit with
error if there is no CPU:

    (qemu) dump-guest-memory /dev/null
    this feature or command is not currently supported

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Message-Id: <20170913142036.2469-3-lvivier@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Laurent Vivier 2017-09-13 16:20:34 +02:00 committed by Dr. David Alan Gilbert
parent b1fde1ef51
commit 6dba634097
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/arm/arch_dump.c
View File

@ -273,11 +273,18 @@ int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
int cpu_get_dump_info(ArchDumpInfo *info, int cpu_get_dump_info(ArchDumpInfo *info,
const GuestPhysBlockList *guest_phys_blocks) const GuestPhysBlockList *guest_phys_blocks)
{ {
ARMCPU *cpu = ARM_CPU(first_cpu); ARMCPU *cpu;
CPUARMState *env = &cpu->env; CPUARMState *env;
GuestPhysBlock *block; GuestPhysBlock *block;
hwaddr lowest_addr = ULLONG_MAX; hwaddr lowest_addr = ULLONG_MAX;
if (first_cpu == NULL) {
return -1;
}
cpu = ARM_CPU(first_cpu);
env = &cpu->env;
/* Take a best guess at the phys_base. If we get it wrong then crash /* Take a best guess at the phys_base. If we get it wrong then crash
* will need '--machdep phys_offset=<phys-offset>' added to its command * will need '--machdep phys_offset=<phys-offset>' added to its command
* line, which isn't any worse than assuming we can use zero, but being * line, which isn't any worse than assuming we can use zero, but being