diff options
author | Gregory Haskins <ghaskins@novell.com> | 2007-05-31 14:08:58 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2007-07-16 05:05:48 -0400 |
commit | ff1dc7942ba8fa4a86619bcb37ed68afae1f69ca (patch) | |
tree | ea503177a4c6776741c09274a186b518ac9fe9c6 /drivers/kvm/vmx.c | |
parent | 2eeb2e94eb6232f0895da696c10e6636093ff72b (diff) |
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/vmx.c')
-rw-r--r-- | drivers/kvm/vmx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index d06c3627f640..b47ddccc7d7a 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) | |||
1992 | int r; | 1992 | int r; |
1993 | 1993 | ||
1994 | preempted: | 1994 | preempted: |
1995 | if (!vcpu->mmio_read_completed) | ||
1996 | do_interrupt_requests(vcpu, kvm_run); | ||
1997 | |||
1998 | if (vcpu->guest_debug.enabled) | 1995 | if (vcpu->guest_debug.enabled) |
1999 | kvm_guest_debug_pre(vcpu); | 1996 | kvm_guest_debug_pre(vcpu); |
2000 | 1997 | ||
2001 | again: | 1998 | again: |
1999 | if (!vcpu->mmio_read_completed) | ||
2000 | do_interrupt_requests(vcpu, kvm_run); | ||
2001 | |||
2002 | vmx_save_host_state(vcpu); | 2002 | vmx_save_host_state(vcpu); |
2003 | kvm_load_guest_fpu(vcpu); | 2003 | kvm_load_guest_fpu(vcpu); |
2004 | 2004 | ||