From 499f63008a1eb2315bb21135f371b6266ef4f0b8 Mon Sep 17 00:00:00 2001
From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Tue, 31 Aug 2010 19:13:13 -0300
Subject: [PATCH] --- yaml --- r: 215807 b: refs/heads/master c:
 678041ad9dc82eedc598f709e8a3d620139d4105 h: refs/heads/master i:   215805:
 7d3654029a8fd62ae60e833253963403a6a8c3b3   215803:
 ca020bfc5ea2f94f945e906ba91fc11acbf38d22   215799:
 b08a099d8c2e0ae5d5587c61c0479dfd249204c1   215791:
 36af777c37d7034292d7713deae061f6932685fc   215775:
 4dadaa28c9f356f79cc0e33c9439f1004dff4050   215743:
 9b782c45e38bf340a821f1154ead7d40aedfd454   215679:
 54b6497ca4387999c09024318506c637b55b5ffa   215551:
 ffc880f98903a80176637da8c999985f15df4cbb v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/svm.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 741b8d05903b..53c809198307 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c41a15dd4632499b9c1a00871e160276999767d9
+refs/heads/master: 678041ad9dc82eedc598f709e8a3d620139d4105
diff --git a/trunk/arch/x86/kvm/svm.c b/trunk/arch/x86/kvm/svm.c
index ff28f6521065..60bc1e53d237 100644
--- a/trunk/arch/x86/kvm/svm.c
+++ b/trunk/arch/x86/kvm/svm.c
@@ -827,8 +827,8 @@ static void init_vmcb(struct vcpu_svm *svm)
 	 * This is the guest-visible cr0 value.
 	 * svm_set_cr0() sets PG and WP and clears NW and CD on save->cr0.
 	 */
-	svm->vcpu.arch.cr0 = X86_CR0_NW | X86_CR0_CD | X86_CR0_ET;
-	(void)kvm_set_cr0(&svm->vcpu, svm->vcpu.arch.cr0);
+	svm->vcpu.arch.cr0 = 0;
+	(void)kvm_set_cr0(&svm->vcpu, X86_CR0_NW | X86_CR0_CD | X86_CR0_ET);
 
 	save->cr4 = X86_CR4_PAE;
 	/* rdx = ?? */