summaryrefslogtreecommitdiffstats
path: root/drivers/kvm/kvm_main.c
diff options
context:
space:
mode:
authorRyan Harper2007-09-18 21:05:16 +0200
committerAvi Kivity2008-01-30 16:52:48 +0100
commit217648638ccb62dfeea5ac5fe768539cdee61ed0 (patch)
treebb2ce51d75b95119f40e2385be7359a263bddd61 /drivers/kvm/kvm_main.c
parentKVM: MMU: Make flooding detection work when guest page faults are bypassed (diff)
downloadkernel-qcow2-linux-217648638ccb62dfeea5ac5fe768539cdee61ed0.tar.gz
kernel-qcow2-linux-217648638ccb62dfeea5ac5fe768539cdee61ed0.tar.xz
kernel-qcow2-linux-217648638ccb62dfeea5ac5fe768539cdee61ed0.zip
KVM: MMU: Ignore reserved bits in cr3 in non-pae mode
This patch removes the fault injected when the guest attempts to set reserved bits in cr3. X86 hardware doesn't generate a fault when setting reserved bits. The result of this patch is that vmware-server, running within a kvm guest, boots and runs memtest from an iso. Signed-off-by: Ryan Harper <ryanh@us.ibm.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/kvm_main.c')
-rw-r--r--drivers/kvm/kvm_main.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 82cc7ae0fc83..2d55bab41634 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -554,14 +554,11 @@ void set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
inject_gp(vcpu);
return;
}
- } else {
- if (cr3 & CR3_NONPAE_RESERVED_BITS) {
- printk(KERN_DEBUG
- "set_cr3: #GP, reserved bits\n");
- inject_gp(vcpu);
- return;
- }
}
+ /*
+ * We don't check reserved bits in nonpae mode, because
+ * this isn't enforced, and VMware depends on this.
+ */
}
mutex_lock(&vcpu->kvm->lock);