[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/15] spapr: Plug memory leak when we can't add a migration block
From: |
Markus Armbruster |
Subject: |
[PULL 02/15] spapr: Plug memory leak when we can't add a migration blocker |
Date: |
Fri, 27 Aug 2021 06:50:31 +0200 |
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>
---
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 23e2e2fff1..690533cbdc 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.
--
2.31.1
- [PULL 00/15] Error reporting patches for 2021-08-26, Markus Armbruster, 2021/08/27
- [PULL 06/15] i386: Never free migration blocker objects instead of sometimes, Markus Armbruster, 2021/08/27
- [PULL 03/15] spapr: Explain purpose of ->fwnmi_migration_blocker more clearly, Markus Armbruster, 2021/08/27
- [PULL 10/15] migration: Handle migration_incoming_setup() errors consistently, Markus Armbruster, 2021/08/27
- [PULL 09/15] migration: Unify failure check for migrate_add_blocker(), Markus Armbruster, 2021/08/27
- [PULL 15/15] vl: Clean up -smp error handling, Markus Armbruster, 2021/08/27
- [PULL 02/15] spapr: Plug memory leak when we can't add a migration blocker,
Markus Armbruster <=
- [PULL 11/15] microvm: Drop dead error handling in microvm_machine_state_init(), Markus Armbruster, 2021/08/27
- [PULL 05/15] vhost-scsi: Plug memory leak on migrate_add_blocker() failure, Markus Armbruster, 2021/08/27
- [PULL 04/15] multi-process: Fix pci_proxy_dev_realize() error handling, Markus Armbruster, 2021/08/27
- [PULL 07/15] vfio: Avoid error_propagate() after migrate_add_blocker(), Markus Armbruster, 2021/08/27
- [PULL 08/15] whpx nvmm: Drop useless migrate_del_blocker(), Markus Armbruster, 2021/08/27
- [PULL 14/15] Remove superfluous ERRP_GUARD(), Markus Armbruster, 2021/08/27
- [PULL 13/15] vhost: Clean up how VhostOpts method vhost_backend_init() fails, Markus Armbruster, 2021/08/27
- [PULL 12/15] vhost: Clean up how VhostOpts method vhost_get_config() fails, Markus Armbruster, 2021/08/27