aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-01-11 17:19:35 +0200
committerAvi Kivity <avi@redhat.com>2009-01-11 17:19:35 +0200
commit261763c30e7c349cac22eba0ca01c66ffb369a70 (patch)
tree1cf11c4fb3adb4bf03810a6247315644a8a01f0e
parent9998fd9cfc3a03ab356dd59e76d074401611bc4d (diff)
KVM: MMU: Only enable cr4_pge role in shadow modekvm-83rc1kvm-83
Two dimensional paging is only confused by it. Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--arch/x86/kvm/x86.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 69fd94c79952..4b172535fc2b 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -364,7 +364,7 @@ void kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
}
kvm_x86_ops->set_cr4(vcpu, cr4);
vcpu->arch.cr4 = cr4;
- vcpu->arch.mmu.base_role.cr4_pge = !!(cr4 & X86_CR4_PGE);
+ vcpu->arch.mmu.base_role.cr4_pge = (cr4 & X86_CR4_PGE) && !tdp_enabled;
kvm_mmu_sync_global(vcpu);
kvm_mmu_reset_context(vcpu);
}