]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
KVM: Return if the pdptrs are invalid when the guest turns on PAE.
authorRusty Russell <rusty@rustcorp.com.au>
Mon, 23 Jul 2007 07:11:02 +0000 (17:11 +1000)
committerAvi Kivity <avi@qumranet.com>
Mon, 23 Jul 2007 08:18:36 +0000 (11:18 +0300)
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>
drivers/kvm/kvm_main.c

index 84037d62c2b96c0e56ca58299f0abf1708765cd2..7c9bd72f74d5cc67aaaf751e183245e79386b9e7 100644 (file)
@@ -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) {