diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2007-07-23 17:11:02 +1000 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2007-10-13 10:18:19 +0200 |
commit | 310bc76c2b6829cd280def4927b7ccf8b8c795df (patch) | |
tree | 966430f5cda166421960e7178f3f71a62b735a70 /drivers/kvm/kvm_main.c | |
parent | 394b6e5944865a558fe25f0c5903b34c434038ee (diff) | |
download | op-kernel-dev-310bc76c2b6829cd280def4927b7ccf8b8c795df.zip op-kernel-dev-310bc76c2b6829cd280def4927b7ccf8b8c795df.tar.gz |
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/kvm/kvm_main.c')
-rw-r--r-- | drivers/kvm/kvm_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index f0fc8d9..093cea3 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) { |