summaryrefslogtreecommitdiffstats
path: root/drivers/kvm
diff options
context:
space:
mode:
authorGregory Haskins <ghaskins@novell.com>2007-05-31 14:08:58 -0400
committerAvi Kivity <avi@qumranet.com>2007-07-16 12:05:48 +0300
commitff1dc7942ba8fa4a86619bcb37ed68afae1f69ca (patch)
treeea503177a4c6776741c09274a186b518ac9fe9c6 /drivers/kvm
parent2eeb2e94eb6232f0895da696c10e6636093ff72b (diff)
downloadop-kernel-dev-ff1dc7942ba8fa4a86619bcb37ed68afae1f69ca.zip
op-kernel-dev-ff1dc7942ba8fa4a86619bcb37ed68afae1f69ca.tar.gz
KVM: VMX: Fix interrupt checking on lightweight exit
With kernel-injected interrupts, we need to check for interrupts on lightweight exits too. Signed-off-by: Gregory Haskins <ghaskins@novell.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm')
-rw-r--r--drivers/kvm/vmx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index d06c362..b47ddcc 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -1992,13 +1992,13 @@ static int vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
int r;
preempted:
- if (!vcpu->mmio_read_completed)
- do_interrupt_requests(vcpu, kvm_run);
-
if (vcpu->guest_debug.enabled)
kvm_guest_debug_pre(vcpu);
again:
+ if (!vcpu->mmio_read_completed)
+ do_interrupt_requests(vcpu, kvm_run);
+
vmx_save_host_state(vcpu);
kvm_load_guest_fpu(vcpu);
OpenPOWER on IntegriCloud