From: Ryan Harper <ryanh@us.ibm.com>
Date: Tue, 18 Sep 2007 19:05:16 +0000 (-0500)
Subject: KVM: MMU: Ignore reserved bits in cr3 in non-pae mode
X-Git-Tag: v2.6.25-rc1~1138^2~238
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=217648638ccb62dfeea5ac5fe768539cdee61ed0;p=linux-2.6

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

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 82cc7ae0fc..2d55bab416 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);