From ba3680fabb98a76fa92c852fdb14e3a98036618b Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Wed, 21 Mar 2007 18:11:36 +0200
Subject: [PATCH] --- yaml --- r: 54080 b: refs/heads/master c:
 6da63cf95f6a19fe0a302232048452c96b178e45 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 582fb721aa57..eae36e466725 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 038881c8bec0e9a796d1782c56e29e7c2456626d
+refs/heads/master: 6da63cf95f6a19fe0a302232048452c96b178e45
diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c
index d3cc1157d23b..191bc45b83e0 100644
--- a/trunk/drivers/kvm/svm.c
+++ b/trunk/drivers/kvm/svm.c
@@ -737,8 +737,10 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
 	}
 #endif
 	vcpu->svm->cr0 = cr0;
-	vcpu->svm->vmcb->save.cr0 = cr0 | CR0_PG_MASK | CR0_WP_MASK;
 	vcpu->cr0 = cr0;
+	cr0 |= CR0_PG_MASK | CR0_WP_MASK;
+	cr0 &= ~(CR0_CD_MASK | CR0_NW_MASK);
+	vcpu->svm->vmcb->save.cr0 = cr0;
 }
 
 static void svm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)