From 9524c0dc480a650b2863c43a42bcb639da7375ca Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Tue, 12 Apr 2011 12:36:21 +0300 Subject: [PATCH] --- yaml --- r: 248083 b: refs/heads/master c: 8d7d810255982bfcc355cdb8972d72843acb0cf8 h: refs/heads/master i: 248081: 78b89aa9521b83193282d58dbba882b399ac8f02 248079: 56f46a6eb656ae9d031eb12658fd5c4ecbd6c0a2 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/kvm_host.h | 1 - trunk/arch/x86/kvm/x86.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3c7a7a84fe82..f6e1ef225fb7 100644 --- 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 index 6cfc1ab2cdd6..afb0e69bd160 100644 --- 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 index a831d5d8ca14..e3ac212f7c87 100644 --- 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