KVM: x86 emulator: drop x86_emulate_ctxt::vcpu

No longer used.

Signed-off-by: Avi Kivity <avi@redhat.com>

diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index 51341d6..127ea3e 100644 (file)
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -269,8 +269,6 @@ struct x86_emulate_ctxt {
        struct x86_emulate_ops *ops;
 
        /* Register state before/after emulation. */
-       struct kvm_vcpu *vcpu;
-
        unsigned long eflags;
        unsigned long eip; /* eip before instruction emulation */
        /* Emulated execution mode, represented by an X86EMUL_MODE value. */

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 65a5b0c..a831d5d 100644 (file)
--- 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)
 
        kvm_x86_ops->get_cs_db_l_bits(vcpu, &cs_db, &cs_l);
 
-       vcpu->arch.emulate_ctxt.vcpu = vcpu;
        vcpu->arch.emulate_ctxt.eflags = kvm_get_rflags(vcpu);
        vcpu->arch.emulate_ctxt.eip = kvm_rip_read(vcpu);
        vcpu->arch.emulate_ctxt.mode =