diff options
| author | Laurent Vivier <lvivier@redhat.com> | 2017-09-13 16:20:34 +0200 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-09-14 15:52:10 +0100 |
| commit | 6dba634097d54db60017f10c160a052e46bdf60d (patch) | |
| tree | 8ef5ddd8b3319ce0076ccc201632a37523f0060a /target/arm | |
| parent | b1fde1ef5106c92dd12f1f0cfcb8c76e57d7f681 (diff) | |
| download | qemu-6dba634097d54db60017f10c160a052e46bdf60d.zip qemu-6dba634097d54db60017f10c160a052e46bdf60d.tar.gz qemu-6dba634097d54db60017f10c160a052e46bdf60d.tar.bz2 | |
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>
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/arch_dump.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/target/arm/arch_dump.c b/target/arm/arch_dump.c index 1a9861f..9e5b2fb 100644 --- a/target/arm/arch_dump.c +++ b/target/arm/arch_dump.c @@ -273,11 +273,18 @@ int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, int cpu_get_dump_info(ArchDumpInfo *info, const GuestPhysBlockList *guest_phys_blocks) { - ARMCPU *cpu = ARM_CPU(first_cpu); - CPUARMState *env = &cpu->env; + ARMCPU *cpu; + CPUARMState *env; GuestPhysBlock *block; 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 * 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 |