[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/7] ppc/spapr: Fix FWNMI machine check failure handling
From: |
David Gibson |
Subject: |
Re: [PATCH 1/7] ppc/spapr: Fix FWNMI machine check failure handling |
Date: |
Wed, 11 Mar 2020 10:08:18 +1100 |
On Tue, Mar 10, 2020 at 09:57:18AM +0100, Cédric Le Goater wrote:
> On 3/10/20 3:43 AM, David Gibson wrote:
> > On Thu, Mar 05, 2020 at 02:59:32PM +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 <address@hidden>
> >
> > Applied to ppc-for-5.0, thanks.
> >
> >> ---
> >> hw/ppc/spapr_events.c | 3 +--
> >> 1 file changed, 1 insertion(+), 2 deletions(-)
> >>
> >> diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
> >> index 8b32b7eea5..e95e463de0 100644
> >> --- a/hw/ppc/spapr_events.c
> >> +++ b/hw/ppc/spapr_events.c
> >> @@ -823,8 +823,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;
> >> }
> >
>
> Compiles fails with :
>
> hw/ppc/spapr_events.c:788:15: error: unused variable ‘cs’
> [-Werror=unused-variable]
> 788 | CPUState *cs = CPU(cpu);
>
>
> David, can you squeeze that in please ?
Actually, I removed these patches from my tree again, due to some
comments that came later in the series.
Please fix that in the next spin, Nick.
>
> Thanks,
>
> C.
>
> >From e6a2417b742e7c7d99872689c6e7c9b1bb3c9e43 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <address@hidden>
> Date: Tue, 10 Mar 2020 09:52:09 +0100
> Subject: [PATCH] ppc/spapr: Fix compile error
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> hw/ppc/spapr_events.c:788:15: error: unused variable ‘cs’
> [-Werror=unused-variable]
> 788 | CPUState *cs = CPU(cpu);
>
> Fixes: d4379666f584 ("ppc/spapr: Fix FWNMI machine check failure handling")
> Signed-off-by: Cédric Le Goater <address@hidden>
> ---
> hw/ppc/spapr_events.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
> index e92627a71961..11303258d4b0 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);
--
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
- [PATCH 0/7] FWNMI fixes / changes, Nicholas Piggin, 2020/03/04
- [PATCH 2/7] ppc/spapr: Change FWNMI names, Nicholas Piggin, 2020/03/05
- [PATCH 3/7] ppc/spapr: Add FWNMI System Reset state, Nicholas Piggin, 2020/03/05
- [PATCH 4/7] ppc/spapr: Fix FWNMI machine check interrupt delivery, Nicholas Piggin, 2020/03/05
- [PATCH 5/7] ppc/spapr: Allow FWNMI on TCG, Nicholas Piggin, 2020/03/05
- [PATCH 6/7] target/ppc: allow ppc_cpu_do_system_reset to take an alternate vector, Nicholas Piggin, 2020/03/05
- [PATCH 7/7] ppc/spapr: Implement FWNMI System Reset delivery, Nicholas Piggin, 2020/03/05