瀏覽代碼

KVM: x86 emulator: drop x86_emulate_ctxt::vcpu

No longer used.

Signed-off-by: Avi Kivity <avi@redhat.com>
Avi Kivity 14 年之前
父節點
當前提交
13db70eca6
共有 2 個文件被更改,包括 0 次插入3 次删除
  1. 0 2
      arch/x86/include/asm/kvm_emulate.h
  2. 0 1
      arch/x86/kvm/x86.c

+ 0 - 2
arch/x86/include/asm/kvm_emulate.h

@@ -269,8 +269,6 @@ struct x86_emulate_ctxt {
 	struct x86_emulate_ops *ops;
 	struct x86_emulate_ops *ops;
 
 
 	/* Register state before/after emulation. */
 	/* Register state before/after emulation. */
-	struct kvm_vcpu *vcpu;
-
 	unsigned long eflags;
 	unsigned long eflags;
 	unsigned long eip; /* eip before instruction emulation */
 	unsigned long eip; /* eip before instruction emulation */
 	/* Emulated execution mode, represented by an X86EMUL_MODE value. */
 	/* Emulated execution mode, represented by an X86EMUL_MODE value. */

+ 0 - 1
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);
 	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.eflags = kvm_get_rflags(vcpu);
 	vcpu->arch.emulate_ctxt.eip = kvm_rip_read(vcpu);
 	vcpu->arch.emulate_ctxt.eip = kvm_rip_read(vcpu);
 	vcpu->arch.emulate_ctxt.mode =
 	vcpu->arch.emulate_ctxt.mode =