commit ab6ef34b906546d85d92dbc3e0fb4e01cce05f62
author Avi Kivity <avi@qumranet.com> Tue Oct 16 16:23:22 2007 +0200
committer Avi Kivity <avi@qumranet.com> Wed Jan 30 17:52:53 2008 +0200
tree 7d6d5211b2e6b1cb0f66fe429e5f1d114017b0c2
parent e25e3ed56fce591e09477b0ce043d90f97988f37

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>

drivers/kvm/kvm_main.c

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 5fd2864..4c96817 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -2144,6 +2144,8 @@
 	if (unlikely(r))
 		goto out;
 
+	kvm_inject_pending_timer_irqs(vcpu);
+
 	preempt_disable();
 
 	kvm_x86_ops->prepare_guest_switch(vcpu);

drivers/kvm/svm.c

diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c
index 7b21576..ef068d2d 100644
--- a/drivers/kvm/svm.c
+++ b/drivers/kvm/svm.c
@@ -1355,7 +1355,6 @@
 	struct vmcb *vmcb = svm->vmcb;
 	int intr_vector = -1;
 
-	kvm_inject_pending_timer_irqs(vcpu);
 	if ((vmcb->control.exit_int_info & SVM_EVTINJ_VALID) &&
 	    ((vmcb->control.exit_int_info & SVM_EVTINJ_TYPE_MASK) == 0)) {
 		intr_vector = vmcb->control.exit_int_info &

drivers/kvm/vmx.c

diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 6955580..9f77ddb 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -2191,7 +2191,6 @@
 	int has_ext_irq, interrupt_window_open;
 	int vector;
 
-	kvm_inject_pending_timer_irqs(vcpu);
 	update_tpr_threshold(vcpu);
 
 	has_ext_irq = kvm_cpu_has_interrupt(vcpu);