On 13/09/2017 14:44, Dr. David Alan Gilbert wrote:
> * David Gibson ([email protected]) wrote:
>> On Tue, Sep 12, 2017 at 04:01:47PM +0200, Laurent Vivier wrote:
>>> 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 <[email protected]>
>>
>> Applied to ppc-for-2.11. I'm not really sure what to do with the rest
>> of the series though.
>
> I can take the whole set through HMP.
Could you update the comment in last patch as asked by Cornelia?
(PATCH v3 3/3] tests/hmp: test "none" machine with memory)
Thanks,
Laurent
>
> Dave
>
>>> ---
>>> 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;
>>
>> --
>> David Gibson | I'll have my music baroque, and my code
>> david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_
>> _other_
>> | _way_ _around_!
>> http://www.ozlabs.org/~dgibson
>
>
> --
> Dr. David Alan Gilbert / [email protected] / Manchester, UK
>