spapr: Plug memory leak when we can't add a migration blocker
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> Message-Id: <20210720125408.387910-3-armbru@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
parent
f9734d5d40
commit
e2ef4fc7ae
@ -872,7 +872,6 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recovered)
|
|||||||
SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());
|
SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());
|
||||||
CPUState *cs = CPU(cpu);
|
CPUState *cs = CPU(cpu);
|
||||||
int ret;
|
int ret;
|
||||||
Error *local_err = NULL;
|
|
||||||
|
|
||||||
if (spapr->fwnmi_machine_check_addr == -1) {
|
if (spapr->fwnmi_machine_check_addr == -1) {
|
||||||
/* Non-FWNMI case, deliver it like an architected CPU interrupt. */
|
/* 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) {
|
if (ret == -EBUSY) {
|
||||||
/*
|
/*
|
||||||
* We don't want to abort so we let the migration to continue.
|
* We don't want to abort so we let the migration to continue.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user