Commit 3457e419 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity

KVM: handle emulation failure case first

If emulation failed return immediately.
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 8fe681e9
...@@ -3924,22 +3924,6 @@ int emulate_instruction(struct kvm_vcpu *vcpu, ...@@ -3924,22 +3924,6 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
restart: restart:
r = x86_emulate_insn(&vcpu->arch.emulate_ctxt, &emulate_ops); r = x86_emulate_insn(&vcpu->arch.emulate_ctxt, &emulate_ops);
shadow_mask = vcpu->arch.emulate_ctxt.interruptibility;
if (r == 0)
kvm_x86_ops->set_interrupt_shadow(vcpu, shadow_mask);
if (vcpu->arch.pio.count) {
if (!vcpu->arch.pio.in)
vcpu->arch.pio.count = 0;
return EMULATE_DO_MMIO;
}
if (vcpu->mmio_needed) {
if (vcpu->mmio_is_write)
vcpu->mmio_needed = 0;
return EMULATE_DO_MMIO;
}
if (r) { /* emulation failed */ if (r) { /* emulation failed */
/* /*
...@@ -3955,6 +3939,21 @@ int emulate_instruction(struct kvm_vcpu *vcpu, ...@@ -3955,6 +3939,21 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
return EMULATE_FAIL; return EMULATE_FAIL;
} }
shadow_mask = vcpu->arch.emulate_ctxt.interruptibility;
kvm_x86_ops->set_interrupt_shadow(vcpu, shadow_mask);
if (vcpu->arch.pio.count) {
if (!vcpu->arch.pio.in)
vcpu->arch.pio.count = 0;
return EMULATE_DO_MMIO;
}
if (vcpu->mmio_needed) {
if (vcpu->mmio_is_write)
vcpu->mmio_needed = 0;
return EMULATE_DO_MMIO;
}
if (vcpu->arch.exception.pending) if (vcpu->arch.exception.pending)
vcpu->arch.emulate_ctxt.restart = false; vcpu->arch.emulate_ctxt.restart = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment