aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-04-20 08:56:20 -0400
committerAvi Kivity <avi@redhat.com>2011-05-22 08:39:24 -0400
commit13db70eca62c5bbb2cbbf6b23dadb94065d363d1 (patch)
tree61557cd6d5d5fe06210372360530409f724d235f
parent5197b808a7f459f9c7436573c7785ff3c1324c08 (diff)
KVM: x86 emulator: drop x86_emulate_ctxt::vcpu
No longer used. Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--arch/x86/include/asm/kvm_emulate.h2
-rw-r--r--arch/x86/kvm/x86.c1
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index 51341d6b2f31..127ea3e17171 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -269,8 +269,6 @@ struct x86_emulate_ctxt {
269 struct x86_emulate_ops *ops; 269 struct x86_emulate_ops *ops;
270 270
271 /* Register state before/after emulation. */ 271 /* Register state before/after emulation. */
272 struct kvm_vcpu *vcpu;
273
274 unsigned long eflags; 272 unsigned long eflags;
275 unsigned long eip; /* eip before instruction emulation */ 273 unsigned long eip; /* eip before instruction emulation */
276 /* Emulated execution mode, represented by an X86EMUL_MODE value. */ 274 /* Emulated execution mode, represented by an X86EMUL_MODE value. */
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 65a5b0c545aa..a831d5d8ca14 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4463,7 +4463,6 @@ static void init_emulate_ctxt(struct kvm_vcpu *vcpu)
4463 4463
4464 kvm_x86_ops->get_cs_db_l_bits(vcpu, &cs_db, &cs_l); 4464 kvm_x86_ops->get_cs_db_l_bits(vcpu, &cs_db, &cs_l);
4465 4465
4466 vcpu->arch.emulate_ctxt.vcpu = vcpu;
4467 vcpu->arch.emulate_ctxt.eflags = kvm_get_rflags(vcpu); 4466 vcpu->arch.emulate_ctxt.eflags = kvm_get_rflags(vcpu);
4468 vcpu->arch.emulate_ctxt.eip = kvm_rip_read(vcpu); 4467 vcpu->arch.emulate_ctxt.eip = kvm_rip_read(vcpu);
4469 vcpu->arch.emulate_ctxt.mode = 4468 vcpu->arch.emulate_ctxt.mode =