|
 |
e14a8c |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
e14a8c |
Date: Tue, 16 Apr 2019 20:14:12 -0400
|
|
|
e14a8c |
Subject: [PATCH] Revert "target/i386: kvm: add VMX migration blocker"
|
|
|
e14a8c |
|
|
|
e14a8c |
This reverts commit d98f26073bebddcd3da0ba1b86c3a34e840c0fb8.
|
|
|
e14a8c |
|
|
|
e14a8c |
As is, it rejects libvirt managedsave and virt-manager snapshots
|
|
|
e14a8c |
for default installed VMs on intel hosts. Upstream Paolo says that
|
|
|
e14a8c |
the missing kernel bits are already queued up, and until then it's
|
|
|
e14a8c |
fine to revert this.
|
|
|
e14a8c |
|
|
|
e14a8c |
https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg02326.html
|
|
|
e14a8c |
---
|
|
|
e14a8c |
target/i386/kvm.c | 12 ------------
|
|
|
e14a8c |
1 file changed, 12 deletions(-)
|
|
|
e14a8c |
|
|
|
e14a8c |
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
|
|
|
e14a8c |
index 3b29ce5c0d..6ad450d9f1 100644
|
|
|
e14a8c |
--- a/target/i386/kvm.c
|
|
|
e14a8c |
+++ b/target/i386/kvm.c
|
|
|
e14a8c |
@@ -906,7 +906,6 @@ static int hyperv_init_vcpu(X86CPU *cpu)
|
|
|
e14a8c |
}
|
|
|
e14a8c |
|
|
|
e14a8c |
static Error *invtsc_mig_blocker;
|
|
|
e14a8c |
-static Error *vmx_mig_blocker;
|
|
|
e14a8c |
|
|
|
e14a8c |
#define KVM_MAX_CPUID_ENTRIES 100
|
|
|
e14a8c |
|
|
|
e14a8c |
@@ -1270,17 +1269,6 @@ int kvm_arch_init_vcpu(CPUState *cs)
|
|
|
e14a8c |
!!(c->ecx & CPUID_EXT_SMX);
|
|
|
e14a8c |
}
|
|
|
e14a8c |
|
|
|
e14a8c |
- if ((env->features[FEAT_1_ECX] & CPUID_EXT_VMX) && !vmx_mig_blocker) {
|
|
|
e14a8c |
- error_setg(&vmx_mig_blocker,
|
|
|
e14a8c |
- "Nested VMX virtualization does not support live migration yet");
|
|
|
e14a8c |
- r = migrate_add_blocker(vmx_mig_blocker, &local_err);
|
|
|
e14a8c |
- if (local_err) {
|
|
|
e14a8c |
- error_report_err(local_err);
|
|
|
e14a8c |
- error_free(vmx_mig_blocker);
|
|
|
e14a8c |
- return r;
|
|
|
e14a8c |
- }
|
|
|
e14a8c |
- }
|
|
|
e14a8c |
-
|
|
|
e14a8c |
if (env->mcg_cap & MCG_LMCE_P) {
|
|
|
e14a8c |
has_msr_mcg_ext_ctl = has_msr_feature_control = true;
|
|
|
e14a8c |
}
|