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

Commit 3e909439 authored by Avi Kivity's avatar Avi Kivity Committed by Marcelo Tosatti
Browse files

KVM: Drop bogus x86_decode_insn() error check 



x86_decode_insn() doesn't return X86EMUL_* values, so the check
for X86EMUL_PROPOGATE_FAULT will always fail.  There is a proper
check later on, so there is no need for a replacement for this
code.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 0bb88659

arch/x86/kvm/x86.c

+0 −3
Original line number Diff line number Diff line
@@ -4412,8 +4412,6 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, 
		vcpu->arch.emulate_ctxt.perm_ok = false;



		r = x86_decode_insn(&vcpu->arch.emulate_ctxt, insn, insn_len);

		if (r == X86EMUL_PROPAGATE_FAULT)

			goto done;



		trace_kvm_emulate_insn_start(vcpu);
@@ -4473,7 +4471,6 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, 
		return handle_emulation_failure(vcpu);

	}



done:

	if (vcpu->arch.emulate_ctxt.have_exception) {

		inject_emulated_exception(vcpu);

		r = EMULATE_DONE;