asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KVM: handle emulation failure case first

Browse source 
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:
Gleb Natapov 2010-04-28 19:15:38 +03:00 committed by Avi Kivity
parent 8fe681e984
commit 3457e4192e
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
arch/x86/kvm/x86.c
View file

@ -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 @@ restart:
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;