openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

-----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAl3qPSgUHHBib256aW5p
 QHJlZGhhdC5jb20ACgkQv/vSX3jHroMaPAf/d9qRoE2EBrvz2gYksEz4WY0BpyyG
 1QX5U3cF3DNXWyqbB2gWMR/O7h4cxYBr8u9tTFVUjhAK69fNqm0lACfhkmhUjeMx
 Nh1Hy3JW9wDadUk/8jEmxGH+vJcJW5wV6PJtyKYTGGkpA4ZvUIY7xSea4MlfrqPr
 mpBk3GR2ItsQh+IEyItfQrNWSqKEiHjxejsb8DsM0qkJSudT462vyL2BjVEvIF3Z
 uQPO5U8flSeR1mgAqIGOP98Db1iWPBOCAwDW62W18CH5t64Q7ZTTB+nPP+MrLoPm
 IMkRr1zKMJFX+z20Sl/E3NoQ1cLVr0bMFN792uNKR0qFEXyhsQM/CFRHRQ==
 =T82y
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2019-12-06 15:05:20 +00:00
parent 1bdc319ab5 2605188240
commit 02f9c885ed
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/i386/kvm.c
View File

@ -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);