From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 23 Jul 2007 07:11:02 +0000 (+1000)
Subject: KVM: Return if the pdptrs are invalid when the guest turns on PAE.
X-Git-Tag: v2.6.24-rc1~1365^2~87
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=310bc76c2b6829cd280def4927b7ccf8b8c795df;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index f0fc8d9e71e..093cea36194 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)
 		   && !load_pdptrs(vcpu, vcpu->cr3)) {
 		printk(KERN_DEBUG "set_cr4: #GP, pdptrs reserved bits\n");
 		inject_gp(vcpu);
+		return;
 	}
 
 	if (cr4 & X86_CR4_VMXE) {