Commit 02f9c885 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* fix for x86 KVM on older kernels (Yang Zhong)

# gpg: Signature made Fri 06 Dec 2019 11:36:08 GMT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  target/i386: disable VMX features if nested=0

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1bdc319a 26051882

target/i386/kvm.c

+8 −0
Original line number Diff line number Diff line
@@ -2572,6 +2572,14 @@ static void kvm_msr_entry_add_vmx(X86CPU *cpu, FeatureWordArray f) 
    uint64_t kvm_vmx_basic =

        kvm_arch_get_supported_msr_feature(kvm_state,

                                           MSR_IA32_VMX_BASIC);



    if (!kvm_vmx_basic) {

        /* If the kernel doesn't support VMX feature (kvm_intel.nested=0),

         * then kvm_vmx_basic will be 0 and KVM_SET_MSR will fail.

         */

        return;

    }



    uint64_t kvm_vmx_misc =

        kvm_arch_get_supported_msr_feature(kvm_state,

                                           MSR_IA32_VMX_MISC);