aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/vmx.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 8087c4d1a136..92612fb162db 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1305,8 +1305,11 @@ static __init int vmx_disabled_by_bios(void)
1305 && tboot_enabled()) 1305 && tboot_enabled())
1306 return 1; 1306 return 1;
1307 if (!(msr & FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX) 1307 if (!(msr & FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX)
1308 && !tboot_enabled()) 1308 && !tboot_enabled()) {
1309 printk(KERN_WARNING "kvm: disable TXT in the BIOS or "
1310 " activate TXT before enabling KVM\n");
1309 return 1; 1311 return 1;
1312 }
1310 } 1313 }
1311 1314
1312 return 0; 1315 return 0;