diff options
| author | Nicholas Piggin | 2020-03-16 15:26:06 +0100 |
|---|---|---|
| committer | David Gibson | 2020-03-17 07:00:21 +0100 |
| commit | bae9dc4f28016e1721058dd71392433baf7d36a9 (patch) | |
| tree | 39d2b8c5231a7dd925575ebc7b04dab4bca603b1 | |
| parent | spapr: Rename DT functions to newer naming convention (diff) | |
| download | qemu-bae9dc4f28016e1721058dd71392433baf7d36a9.tar.gz qemu-bae9dc4f28016e1721058dd71392433baf7d36a9.tar.xz qemu-bae9dc4f28016e1721058dd71392433baf7d36a9.zip | |
ppc/spapr: Fix FWNMI machine check failure handling
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>
| -rw-r--r-- | hw/ppc/spapr_events.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 2afd1844e4..11303258d4 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -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) { SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine()); - CPUState *cs = CPU(cpu); uint64_t rtas_addr; CPUPPCState *env = &cpu->env; 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 */ rtas_addr = spapr_get_rtas_addr(); if (!rtas_addr) { - /* Unable to fetch rtas_addr. Hence reset the guest */ - ppc_cpu_do_system_reset(cs); + qemu_system_guest_panicked(NULL); g_free(ext_elog); return; } |