summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm
diff options
context:
space:
mode:
authorJan Kiszka2013-10-23 15:40:31 +0200
committerPaolo Bonzini2013-10-28 13:14:12 +0100
commitd3134dbf2046076b6e52b05890e812442d5257fb (patch)
tree527cd50d14d6ea5b9dee400ae46dee948aac5807 /arch/x86/kvm
parentPowerpc KVM work is based on a commit after rc4. (diff)
downloadkernel-qcow2-linux-d3134dbf2046076b6e52b05890e812442d5257fb.tar.gz
kernel-qcow2-linux-d3134dbf2046076b6e52b05890e812442d5257fb.tar.xz
kernel-qcow2-linux-d3134dbf2046076b6e52b05890e812442d5257fb.zip
KVM: nVMX: Report 2MB EPT pages as supported
As long as the hardware provides us 2MB EPT pages, we can also expose them to the guest because our shadow EPT code already supports this feature. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r--arch/x86/kvm/vmx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 06fd7629068a..feef3a1e45d3 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2261,7 +2261,8 @@ static __init void nested_vmx_setup_ctls_msrs(void)
/* nested EPT: emulate EPT also to L1 */
nested_vmx_secondary_ctls_high |= SECONDARY_EXEC_ENABLE_EPT;
nested_vmx_ept_caps = VMX_EPT_PAGE_WALK_4_BIT |
- VMX_EPTP_WB_BIT | VMX_EPT_INVEPT_BIT;
+ VMX_EPTP_WB_BIT | VMX_EPT_2MB_PAGE_BIT |
+ VMX_EPT_INVEPT_BIT;
nested_vmx_ept_caps &= vmx_capability.ept;
/*
* Since invept is completely emulated we support both global