From 0157031569b9846f78d27255f14fa695d1a7e7d0 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Wed, 21 Mar 2007 18:14:42 +0200
Subject: [PATCH] --- yaml --- r: 54081 b: refs/heads/master c:
 fcd3410870049cb74bb1a3a2458cb3ec21185cd1 h: refs/heads/master i:   54079:
 fac803136b7e7b2e4f582dfc007296568bef8932 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/kvm/kvm_svm.h | 2 --
 trunk/drivers/kvm/svm.c     | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index eae36e466725..0cec328e9417 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6da63cf95f6a19fe0a302232048452c96b178e45
+refs/heads/master: fcd3410870049cb74bb1a3a2458cb3ec21185cd1
diff --git a/trunk/drivers/kvm/kvm_svm.h b/trunk/drivers/kvm/kvm_svm.h
index 624f1ca48657..a1a9eba50d47 100644
--- a/trunk/drivers/kvm/kvm_svm.h
+++ b/trunk/drivers/kvm/kvm_svm.h
@@ -28,8 +28,6 @@ struct vcpu_svm {
 	struct svm_cpu_data *svm_data;
 	uint64_t asid_generation;
 
-	unsigned long cr0;
-	unsigned long cr4;
 	unsigned long db_regs[NUM_DB_REGS];
 
 	u64 next_rip;
diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c
index 191bc45b83e0..ddc0505c3374 100644
--- a/trunk/drivers/kvm/svm.c
+++ b/trunk/drivers/kvm/svm.c
@@ -576,7 +576,6 @@ static int svm_create_vcpu(struct kvm_vcpu *vcpu)
 	vcpu->svm->vmcb = page_address(page);
 	memset(vcpu->svm->vmcb, 0, PAGE_SIZE);
 	vcpu->svm->vmcb_pa = page_to_pfn(page) << PAGE_SHIFT;
-	vcpu->svm->cr0 = 0x00000010;
 	vcpu->svm->asid_generation = 0;
 	memset(vcpu->svm->db_regs, 0, sizeof(vcpu->svm->db_regs));
 	init_vmcb(vcpu->svm->vmcb);
@@ -736,7 +735,6 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
 		}
 	}
 #endif
-	vcpu->svm->cr0 = cr0;
 	vcpu->cr0 = cr0;
 	cr0 |= CR0_PG_MASK | CR0_WP_MASK;
 	cr0 &= ~(CR0_CD_MASK | CR0_NW_MASK);