On Tue, Mar 17, 2020 at 12:26:06AM +1000, Nicholas Piggin wrote: > 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 <npig...@gmail.com>
Applied to ppc-for-5.0, thanks.
> ---
> hw/ppc/spapr_events.c | 4 +---
> 1 file changed, 1 insertion(+), 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;
> }
--
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
signature.asc
Description: PGP signature
