From: Avi Kivity <avi@redhat.com>
Date: Mon, 7 Dec 2009 10:29:14 +0000 (+0200)
Subject: KVM: VMX: When using ept, allow the guest to own cr4.pge
X-Git-Tag: v2.6.34-rc1~193^2~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce03e4f21a33b97c5d20ce597f64c361bb247904;p=thirdparty%2Fkernel%2Flinux.git

KVM: VMX: When using ept, allow the guest to own cr4.pge

We make no use of cr4.pge if ept is enabled, but the guest does (to flush
global mappings, as with vmap()), so give the guest ownership of this bit.

Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 755811a564b30..a7ebaa5f2b65c 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2424,6 +2424,8 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx)
 
 	vmcs_writel(CR0_GUEST_HOST_MASK, ~0UL);
 	vmx->vcpu.arch.cr4_guest_owned_bits = KVM_CR4_GUEST_OWNED_BITS;
+	if (enable_ept)
+		vmx->vcpu.arch.cr4_guest_owned_bits |= X86_CR4_PGE;
 	vmcs_writel(CR4_GUEST_HOST_MASK, ~vmx->vcpu.arch.cr4_guest_owned_bits);
 
 	tsc_base = vmx->vcpu.kvm->arch.vm_init_tsc;