[PATCHv2 17/23] KVM: handle emulation failure case first.

[Gleb Natapov]

If emulation failed return immediately.

Signed-off-by: Gleb Natapov <g...@redhat.com>
---
 arch/x86/kvm/x86.c |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 696b34b..445769b 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3862,22 +3862,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 */
                /*
@@ -3893,6 +3877,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;
 
-- 
1.6.5

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html