Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb404fe0 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: x86 emulator: remove saved_eip 



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

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 7972995b

arch/x86/kvm/emulate.c

+1 −8
Original line number Diff line number Diff line
@@ -2424,7 +2424,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;
@@ -2436,7 +2435,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);
@@ -2928,11 +2926,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
	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) {
@@ -3209,6 +3203,5 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 


cannot_emulate:

	DPRINTF("Cannot emulate %02x\n", c->b);

	c->eip = saved_eip;

	return -1;

}