aboutsummaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorLaurent Vivier <lvivier@redhat.com>2017-09-13 16:20:33 +0200
committerDr. David Alan Gilbert <dgilbert@redhat.com>2017-09-14 15:52:10 +0100
commitb1fde1ef5106c92dd12f1f0cfcb8c76e57d7f681 (patch)
treed49d64892eb4939a3ee73e4ee6b8f1b211b8ad5f /target
parent9d81b2d2000f41be55a0624a26873f993fb6e928 (diff)
hmp: fix "dump-quest-memory" segfault (ppc)
Running QEMU with qemu-system-ppc64 -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: Greg Kurz <groug@kaod.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20170913142036.2469-2-lvivier@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'target')
-rw-r--r--target/ppc/arch_dump.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/target/ppc/arch_dump.c b/target/ppc/arch_dump.c
index 8e9397aa58..95b9ab6f29 100644
--- a/target/ppc/arch_dump.c
+++ b/target/ppc/arch_dump.c
@@ -224,8 +224,15 @@ typedef struct NoteFuncDescStruct NoteFuncDesc;
int cpu_get_dump_info(ArchDumpInfo *info,
const struct GuestPhysBlockList *guest_phys_blocks)
{
- PowerPCCPU *cpu = POWERPC_CPU(first_cpu);
- PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
+ PowerPCCPU *cpu;
+ PowerPCCPUClass *pcc;
+
+ if (first_cpu == NULL) {
+ return -1;
+ }
+
+ cpu = POWERPC_CPU(first_cpu);
+ pcc = POWERPC_CPU_GET_CLASS(cpu);
info->d_machine = PPC_ELF_MACHINE;
info->d_class = ELFCLASS;