summaryrefslogtreecommitdiff
path: root/drivers/kvm/kvm_main.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-10-16 16:23:22 +0200
committerAvi Kivity <avi@qumranet.com>2008-01-30 17:52:53 +0200
commitab6ef34b906546d85d92dbc3e0fb4e01cce05f62 (patch)
tree7d6d5211b2e6b1cb0f66fe429e5f1d114017b0c2 /drivers/kvm/kvm_main.c
parente25e3ed56fce591e09477b0ce043d90f97988f37 (diff)
downloadlwn-ab6ef34b906546d85d92dbc3e0fb4e01cce05f62.tar.gz
lwn-ab6ef34b906546d85d92dbc3e0fb4e01cce05f62.zip
KVM: Move apic timer interrupt backlog processing to common code
Beside the obvious goodness of making code more common, this prevents a livelock with the next patch which moves interrupt injection out of the critical section. Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/kvm_main.c')
-rw-r--r--drivers/kvm/kvm_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 5fd2864b7811..4c96817929fd 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -2144,6 +2144,8 @@ again:
if (unlikely(r))
goto out;
+ kvm_inject_pending_timer_irqs(vcpu);
+
preempt_disable();
kvm_x86_ops->prepare_guest_switch(vcpu);