diff options
| author | Shane Wang <shane.wang@intel.com> | 2010-11-16 22:40:17 -0500 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-01-12 04:29:31 -0500 |
| commit | f9335afea5d649693aee1ec8af2cc8ccf376f5a9 (patch) | |
| tree | f6826340ff751557c68713374d158c2fb3cf4d74 /arch/x86/kvm/vmx.c | |
| parent | 75b7127c3858261fc080dd52a022424a7e7f6ae5 (diff) | |
KVM: VMX: Inform user about INTEL_TXT dependency
Inform user to either disable TXT in the BIOS or do TXT launch
with tboot before enabling KVM since some BIOSes do not set
FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX bit when TXT is enabled.
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 5 |
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; |