[COMMIT master] KVM: x86 emulator: remove saved_eip

[Avi Kivity]

From: Gleb Natapov <g...@redhat.com>

c->eip is never written back in case of emulation failure, so no need to
set it to old value.

Signed-off-by: Gleb Natapov <g...@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosa...@redhat.com>

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index b3ff673..5555c20 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2420,7 +2420,6 @@ int
 x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 {
        u64 msr_data;
-       unsigned long saved_eip = 0;
        struct decode_cache *c = &ctxt->decode;
        int rc = X86EMUL_CONTINUE;
 
@@ -2432,7 +2431,6 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct 
x86_emulate_ops *ops)
         */
 
        memcpy(c->regs, ctxt->vcpu->arch.regs, sizeof c->regs);
-       saved_eip = c->eip;
 
        if (ctxt->mode == X86EMUL_MODE_PROT64 && (c->d & No64)) {
                kvm_queue_exception(ctxt->vcpu, UD_VECTOR);
@@ -2924,11 +2922,7 @@ writeback:
        kvm_rip_write(ctxt->vcpu, c->eip);
 
 done:
-       if (rc == X86EMUL_UNHANDLEABLE) {
-               c->eip = saved_eip;
-               return -1;
-       }
-       return 0;
+       return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
 
 twobyte_insn:
        switch (c->b) {
@@ -3205,6 +3199,5 @@ twobyte_insn:
 
 cannot_emulate:
        DPRINTF("Cannot emulate %02x\n", c->b);
-       c->eip = saved_eip;
        return -1;
 }
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html