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: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 712af904706f3004aad2c645c115b45c6b114699..dd8016d2efa9baa38f72bf9f6f639638055dabd3 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -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 @@ restart:
                return handle_emulation_failure(vcpu);
        }
 
-done:
        if (vcpu->arch.emulate_ctxt.have_exception) {
                inject_emulated_exception(vcpu);
                r = EMULATE_DONE;