From 7d3f78c440a0fd77d63158437ce5468f3a2b1aab Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 20 Apr 2011 15:56:20 +0300 Subject: [PATCH] --- yaml --- r: 248067 b: refs/heads/master c: 13db70eca62c5bbb2cbbf6b23dadb94065d363d1 h: refs/heads/master i: 248065: ddab944d389fea6984890ca4e6734abdc790057e 248063: f2b16ac2e2c1d8d63794a1ef048f5155e3cbb514 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/kvm_emulate.h | 2 -- trunk/arch/x86/kvm/x86.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5b8ff57e2e47..5f09fc19e299 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5197b808a7f459f9c7436573c7785ff3c1324c08 +refs/heads/master: 13db70eca62c5bbb2cbbf6b23dadb94065d363d1 diff --git a/trunk/arch/x86/include/asm/kvm_emulate.h b/trunk/arch/x86/include/asm/kvm_emulate.h index 51341d6b2f31..127ea3e17171 100644 --- a/trunk/arch/x86/include/asm/kvm_emulate.h +++ b/trunk/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/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c index 65a5b0c545aa..a831d5d8ca14 100644 --- a/trunk/arch/x86/kvm/x86.c +++ b/trunk/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 =