mirror of
https://github.com/torvalds/linux.git
synced 2024-12-14 07:02:23 +00:00
KVM: handle emulation failure case first
If emulation failed return immediately. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
parent
8fe681e984
commit
3457e4192e
@ -3924,22 +3924,6 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
|
||||
|
||||
restart:
|
||||
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 */
|
||||
/*
|
||||
@ -3955,6 +3939,21 @@ restart:
|
||||
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)
|
||||
vcpu->arch.emulate_ctxt.restart = false;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user