aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2010-04-28 19:15:38 +0300
committerAvi Kivity <avi@redhat.com>2010-08-01 10:35:34 +0300
commit3457e4192e367fd4e0da5e9f46f9df85fa99cd11 (patch)
tree357625d4f4ffb8619f8d7df79323b9a447d4498d
parent8fe681e984b6505d4d12125c0776399304803ec7 (diff)
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>
-rw-r--r--arch/x86/kvm/x86.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 51402d8a46fa..9e5a833f3392 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -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;

Privacy Policy