lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: Drop bogus x86_decode_insn() error check

Browse Source 
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>
This commit is contained in:
Avi Kivity
2011-02-01 16:32:02 +02:00
committed by Marcelo Tosatti
parent 0bb8865979
commit 3e90943907
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kvm/x86.c
View File

@@ -4412,8 +4412,6 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
vcpu->arch.emulate_ctxt.perm_ok = false; vcpu->arch.emulate_ctxt.perm_ok = false;
r = x86_decode_insn(&vcpu->arch.emulate_ctxt, insn, insn_len); r = x86_decode_insn(&vcpu->arch.emulate_ctxt, insn, insn_len);
if (r == X86EMUL_PROPAGATE_FAULT)
goto done;
trace_kvm_emulate_insn_start(vcpu); trace_kvm_emulate_insn_start(vcpu);
@@ -4473,7 +4471,6 @@ restart:
return handle_emulation_failure(vcpu); return handle_emulation_failure(vcpu);
} }
done:
if (vcpu->arch.emulate_ctxt.have_exception) { if (vcpu->arch.emulate_ctxt.have_exception) {
inject_emulated_exception(vcpu); inject_emulated_exception(vcpu);
r = EMULATE_DONE; r = EMULATE_DONE;