---

yaml --- r: 248083 b: refs/heads/master c: 8d7d810 h: refs/heads/master i: 248081: 78b89aa 248079: 56f46a6 v: v3
git-mirror · May 22, 2011 · 9524c0d · 9524c0d
1 parent 444f571
commit 9524c0d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46561646ce409ad96c22645362c113de04f60bfb
+refs/heads/master: 8d7d810255982bfcc355cdb8972d72843acb0cf8
diff --git a/trunk/arch/x86/include/asm/kvm_host.h b/trunk/arch/x86/include/asm/kvm_host.h
@@ -358,7 +358,6 @@ struct kvm_vcpu_arch {
 	struct fpu guest_fpu;
 	u64 xcr0;
 
-	gva_t mmio_fault_cr2;
 	struct kvm_pio_request pio;
 	void *pio_data;
 

diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
@@ -4561,7 +4561,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
 	bool writeback = true;
 
 	kvm_clear_exception_queue(vcpu);
-	vcpu->arch.mmio_fault_cr2 = cr2;
+
 	/*
 	 * TODO: fix emulate.c to use guest_read/write_register
 	 * instead of direct ->regs accesses, can save hundred cycles