From 9a920701b3d2d78612bc454c407cf7b0d01f51c6 Mon Sep 17 00:00:00 2001

From: Paolo Bonzini <pbonzini@redhat.com>

Date: Mon, 22 Jul 2019 18:22:05 +0100

Subject: [PATCH 24/39] target/i386: kvm: add VMX migration blocker

RH-Author: Paolo Bonzini <pbonzini@redhat.com>

Message-id: <20190722182220.19374-4-pbonzini@redhat.com>

Patchwork-id: 89621

O-Subject: [RHEL-8.1.0 PATCH qemu-kvm v3 03/18] target/i386: kvm: add VMX migration blocker

Bugzilla: 1689269

RH-Acked-by: Peter Xu <zhexu@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Nested VMX does not support live migration yet.  Add a blocker

until that is worked out.

Nested SVM only does not support it, but unfortunately it is

enabled by default for -cpu host so we cannot really disable it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit d98f26073bebddcd3da0ba1b86c3a34e840c0fb8)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 target/i386/kvm.c | 12 ++++++++++++

 1 file changed, 12 insertions(+)

diff --git a/target/i386/kvm.c b/target/i386/kvm.c

index 8a4d31d..d414187 100644

--- a/target/i386/kvm.c

+++ b/target/i386/kvm.c

@@ -772,6 +772,7 @@ static int hyperv_handle_properties(CPUState *cs)

 }

 static Error *invtsc_mig_blocker;

+static Error *vmx_mig_blocker;

 #define KVM_MAX_CPUID_ENTRIES  100

@@ -1115,6 +1116,17 @@ int kvm_arch_init_vcpu(CPUState *cs)

                                   !!(c->ecx & CPUID_EXT_SMX);

     }

+    if ((env->features[FEAT_1_ECX] & CPUID_EXT_VMX) && !vmx_mig_blocker) {

+        error_setg(&vmx_mig_blocker,

+                   "Nested VMX virtualization does not support live migration yet");

+        r = migrate_add_blocker(vmx_mig_blocker, &local_err);

+        if (local_err) {

+            error_report_err(local_err);

+            error_free(vmx_mig_blocker);

+            return r;

+        }

+    }

+

     if (env->mcg_cap & MCG_LMCE_P) {

         has_msr_mcg_ext_ctl = has_msr_feature_control = true;

     }

-- 

1.8.3.1