Message ID | 20210720125408.387910-3-armbru@redhat.com |
---|---|
State | New |
Headers | show |
Series | Various error handling fixes and cleanups | expand |
On Tue, Jul 20, 2021 at 02:53:54PM +0200, Markus Armbruster wrote: > Fixes: 2500fb423adb17995485de0b4d507cf2f09e3a7f > Cc: Aravinda Prasad <arawinda.p@gmail.com> > Cc: Ganesh Goudar <ganeshgr@linux.ibm.com> > Cc: David Gibson <david@gibson.dropbear.id.au> > Signed-off-by: Markus Armbruster <armbru@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > 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 0cfc19be19..a8f2cc6bdc 100644 > --- a/hw/ppc/spapr_events.c > +++ b/hw/ppc/spapr_events.c > @@ -872,7 +872,6 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recovered) > SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine()); > CPUState *cs = CPU(cpu); > int ret; > - Error *local_err = NULL; > > if (spapr->fwnmi_machine_check_addr == -1) { > /* Non-FWNMI case, deliver it like an architected CPU interrupt. */ > @@ -912,7 +911,7 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recovered) > } > } > > - ret = migrate_add_blocker(spapr->fwnmi_migration_blocker, &local_err); > + ret = migrate_add_blocker(spapr->fwnmi_migration_blocker, NULL); > if (ret == -EBUSY) { > /* > * We don't want to abort so we let the migration to continue.
On 7/20/21 2:53 PM, Markus Armbruster wrote: > Fixes: 2500fb423adb17995485de0b4d507cf2f09e3a7f > Cc: Aravinda Prasad <arawinda.p@gmail.com> > Cc: Ganesh Goudar <ganeshgr@linux.ibm.com> > Cc: David Gibson <david@gibson.dropbear.id.au> > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > hw/ppc/spapr_events.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 0cfc19be19..a8f2cc6bdc 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -872,7 +872,6 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recovered) SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine()); CPUState *cs = CPU(cpu); int ret; - Error *local_err = NULL; if (spapr->fwnmi_machine_check_addr == -1) { /* Non-FWNMI case, deliver it like an architected CPU interrupt. */ @@ -912,7 +911,7 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recovered) } } - ret = migrate_add_blocker(spapr->fwnmi_migration_blocker, &local_err); + ret = migrate_add_blocker(spapr->fwnmi_migration_blocker, NULL); if (ret == -EBUSY) { /* * We don't want to abort so we let the migration to continue.
Fixes: 2500fb423adb17995485de0b4d507cf2f09e3a7f Cc: Aravinda Prasad <arawinda.p@gmail.com> Cc: Ganesh Goudar <ganeshgr@linux.ibm.com> Cc: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Markus Armbruster <armbru@redhat.com> --- hw/ppc/spapr_events.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)