[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/16] whpx nvmm: Drop useless migrate_del_blocker()
From: |
Markus Armbruster |
Subject: |
[PATCH 08/16] whpx nvmm: Drop useless migrate_del_blocker() |
Date: |
Tue, 20 Jul 2021 14:54:00 +0200 |
There is nothing to delete after migrate_add_blocker() failed. Trying
anyway is safe, but useless. Don't.
Cc: Sunil Muthuswamy <sunilmut@microsoft.com>
Cc: Kamil Rytarowski <kamil@netbsd.org>
Cc: Reinoud Zandijk <reinoud@netbsd.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
target/i386/nvmm/nvmm-all.c | 1 -
target/i386/whpx/whpx-all.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
index dfa690d65d..7bb0d9e30e 100644
--- a/target/i386/nvmm/nvmm-all.c
+++ b/target/i386/nvmm/nvmm-all.c
@@ -929,7 +929,6 @@ nvmm_init_vcpu(CPUState *cpu)
(void)migrate_add_blocker(nvmm_migration_blocker, &local_error);
if (local_error) {
error_report_err(local_error);
- migrate_del_blocker(nvmm_migration_blocker);
error_free(nvmm_migration_blocker);
return -EINVAL;
}
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index f832f286ac..cc8c0b984b 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -1349,7 +1349,6 @@ int whpx_init_vcpu(CPUState *cpu)
(void)migrate_add_blocker(whpx_migration_blocker, &local_error);
if (local_error) {
error_report_err(local_error);
- migrate_del_blocker(whpx_migration_blocker);
error_free(whpx_migration_blocker);
ret = -EINVAL;
goto error;
--
2.31.1
- Re: [PATCH 02/16] spapr: Plug memory leak when we can't add a migration blocker, (continued)
- [PATCH 06/16] i386: Never free migration blocker objects instead of sometimes, Markus Armbruster, 2021/07/20
- [PATCH 09/16] migration: Unify failure check for migrate_add_blocker(), Markus Armbruster, 2021/07/20
- [PATCH 10/16] migration: Handle migration_incoming_setup() errors consistently, Markus Armbruster, 2021/07/20
- [PATCH 03/16] spapr: Explain purpose of ->fwnmi_migration_blocker more clearly, Markus Armbruster, 2021/07/20
- [PATCH 08/16] whpx nvmm: Drop useless migrate_del_blocker(),
Markus Armbruster <=
- [PATCH 07/16] vfio: Avoid error_propagate() after migrate_add_blocker(), Markus Armbruster, 2021/07/20
- [PATCH 05/16] vhost-scsi: Plug memory leak on migrate_add_blocker() failure, Markus Armbruster, 2021/07/20
- [PATCH 11/16] microvm: Drop dead error handling in microvm_machine_state_init(), Markus Armbruster, 2021/07/20