aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2007-07-23 03:11:02 -0400
committerAvi Kivity <avi@qumranet.com>2007-10-13 04:18:19 -0400
commit310bc76c2b6829cd280def4927b7ccf8b8c795df (patch)
tree966430f5cda166421960e7178f3f71a62b735a70 /drivers
parent394b6e5944865a558fe25f0c5903b34c434038ee (diff)
KVM: Return if the pdptrs are invalid when the guest turns on PAE.
Don't fall through and turn on PAE in this case. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/kvm/kvm_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index f0fc8d9e71e6..093cea36194b 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -558,6 +558,7 @@ void set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
558 && !load_pdptrs(vcpu, vcpu->cr3)) { 558 && !load_pdptrs(vcpu, vcpu->cr3)) {
559 printk(KERN_DEBUG "set_cr4: #GP, pdptrs reserved bits\n"); 559 printk(KERN_DEBUG "set_cr4: #GP, pdptrs reserved bits\n");
560 inject_gp(vcpu); 560 inject_gp(vcpu);
561 return;
561 } 562 }
562 563
563 if (cr4 & X86_CR4_VMXE) { 564 if (cr4 & X86_CR4_VMXE) {