aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/vmx.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2008-01-31 08:57:38 -0500
committerAvi Kivity <avi@qumranet.com>2008-04-27 04:53:18 -0400
commit50a37eb4e05efaa7bac6a948fd4db1a48c728b99 (patch)
tree34195810be002db84cfafb9ed706d48bb6752d52 /arch/x86/kvm/vmx.c
parentf2b4b7ddf633ffa24ce7c89c9e0d8a06463484e3 (diff)
KVM: align valid EFER bits with the features of the host system
This patch aligns the bits the guest can set in the EFER register with the features in the host processor. Currently it lets EFER.NX disabled if the processor does not support it and enables EFER.LME and EFER.LMA only for KVM on 64 bit hosts. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
-rw-r--r--arch/x86/kvm/vmx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 1157e8a4059b..a509910f6b53 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1117,6 +1117,10 @@ static __init int hardware_setup(void)
1117{ 1117{
1118 if (setup_vmcs_config(&vmcs_config) < 0) 1118 if (setup_vmcs_config(&vmcs_config) < 0)
1119 return -EIO; 1119 return -EIO;
1120
1121 if (boot_cpu_has(X86_FEATURE_NX))
1122 kvm_enable_efer_bits(EFER_NX);
1123
1120 return alloc_kvm_area(); 1124 return alloc_kvm_area();
1121} 1125}
1122 1126