invtsc_mig_blocker has static storage duration. When a CPU with
certain features is initialized, and invtsc_mig_blocker is still null,
we add a migration blocker and store it in invtsc_mig_blocker.
The object is freed when migrate_add_blocker() fails, leaving
invtsc_mig_blocker dangling. It is not freed on later failures.
Same for hv_passthrough_mig_blocker and hv_no_nonarch_cs_mig_blocker.
All failures are actually fatal, so whether we free or not doesn't
really matter, except as bad examples to be copied / imitated.
Clean this up in a minimal way: never free these blocker objects.
Cc: Paolo Bonzini <pbonz...@redhat.com>
Cc: Marcelo Tosatti <mtosa...@redhat.com>
Cc: Eduardo Habkost <ehabk...@redhat.com>
Signed-off-by: Markus Armbruster <arm...@redhat.com>
---
target/i386/kvm/kvm.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 59ed8327ac..8e1bb905ca 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -1423,7 +1423,6 @@ static int hyperv_init_vcpu(X86CPU *cpu)
ret = migrate_add_blocker(hv_passthrough_mig_blocker, &local_err);
if (local_err) {
error_report_err(local_err);
- error_free(hv_passthrough_mig_blocker);
return ret;
}
}
@@ -1438,7 +1437,6 @@ static int hyperv_init_vcpu(X86CPU *cpu)
ret = migrate_add_blocker(hv_no_nonarch_cs_mig_blocker, &local_err);
if (local_err) {
error_report_err(local_err);
- error_free(hv_no_nonarch_cs_mig_blocker);
return ret;
}
}
@@ -1878,7 +1876,6 @@ int kvm_arch_init_vcpu(CPUState *cs)
r = migrate_add_blocker(invtsc_mig_blocker, &local_err);
if (local_err) {
error_report_err(local_err);
- error_free(invtsc_mig_blocker);
return r;
}
}
--
2.31.1
