motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ppc/spapr: Fix FWNMI machine check failure handling

Browse source 
ppc_cpu_do_system_reset delivers a system rreset interrupt to the guest,
which is certainly not what is intended here. Panic the guest like other
failure cases here do.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Message-Id: <20200316142613.121089-2-npiggin@gmail.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Nicholas Piggin 2020-03-17 00:26:06 +10:00 • committed by David Gibson
parent 91335a5e15
commit bae9dc4f28
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/ppc/spapr_events.c
View file

@ -785,7 +785,6 @@ static uint32_t spapr_mce_get_elog_type(PowerPCCPU *cpu, bool recovered,
static void spapr_mce_dispatch_elog(PowerPCCPU *cpu, bool recovered) static void spapr_mce_dispatch_elog(PowerPCCPU *cpu, bool recovered)
{ {
SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine()); SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());
CPUState *cs = CPU(cpu);
uint64_t rtas_addr; uint64_t rtas_addr;
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu); PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
@ -823,8 +822,7 @@ static void spapr_mce_dispatch_elog(PowerPCCPU *cpu, bool recovered)
/* get rtas addr from fdt */ /* get rtas addr from fdt */
rtas_addr = spapr_get_rtas_addr(); rtas_addr = spapr_get_rtas_addr();
if (!rtas_addr) { if (!rtas_addr) {
/* Unable to fetch rtas_addr. Hence reset the guest */ qemu_system_guest_panicked(NULL);
ppc_cpu_do_system_reset(cs);
g_free(ext_elog); g_free(ext_elog);
return; return;
} }