[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/7] hmp: fix "dump-quest-memory" segfault (ppc)
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 1/7] hmp: fix "dump-quest-memory" segfault (ppc) |
Date: |
Thu, 14 Sep 2017 16:04:41 +0100 |
From: Laurent Vivier <address@hidden>
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 <address@hidden>
Reviewed-by: Greg Kurz <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Acked-by: David Gibson <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
target/ppc/arch_dump.c | 11 +++++++++--
1 file 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;
--
2.13.5
- [Qemu-devel] [PULL 0/7] hmp queue, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 2/7] hmp: fix "dump-quest-memory" segfault (arm), Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 1/7] hmp: fix "dump-quest-memory" segfault (ppc),
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 3/7] dump: do not dump non-existent guest memory, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 4/7] tests/hmp: test "none" machine with memory, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 5/7] hmp: extend "info numa" with hotplugged memory information, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 7/7] hmp: introduce 'info memory_size_summary' command, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 6/7] qmp: introduce query-memory-size-summary command, Dr. David Alan Gilbert (git), 2017/09/14
- Re: [Qemu-devel] [PULL 0/7] hmp queue, Peter Maydell, 2017/09/14