From: Avi Kivity <avi@qumranet.com>
Date: Sat, 6 Jan 2007 00:36:58 +0000 (-0800)
Subject: [PATCH] KVM: Don't set guest cr3 from vmx_vcpu_setup()
X-Git-Tag: v2.6.20-rc4~19
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4db9c47c052b89d89f43d12879690c1b3283b887;p=linux-2.6

[PATCH] KVM: Don't set guest cr3 from vmx_vcpu_setup()

It overwrites the right cr3 set from mmu setup.  Happens only with the test
harness.

Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 779d8fc07d..e6ea76cdfd 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -1027,8 +1027,6 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu)
 	vmcs_writel(GUEST_RIP, 0xfff0);
 	vmcs_writel(GUEST_RSP, 0);
 
-	vmcs_writel(GUEST_CR3, 0);
-
 	//todo: dr0 = dr1 = dr2 = dr3 = 0; dr6 = 0xffff0ff0
 	vmcs_writel(GUEST_DR7, 0x400);