From b5ee7495b75c84ea95d2ed9410feebcd70835d43 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Tue, 16 Oct 2007 16:23:22 +0200
Subject: [PATCH] --- yaml --- r: 80662 b: refs/heads/master c:
 ab6ef34b906546d85d92dbc3e0fb4e01cce05f62 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/kvm/kvm_main.c | 2 ++
 trunk/drivers/kvm/svm.c      | 1 -
 trunk/drivers/kvm/vmx.c      | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index aa27b1beb701..31c215507b86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e25e3ed56fce591e09477b0ce043d90f97988f37
+refs/heads/master: ab6ef34b906546d85d92dbc3e0fb4e01cce05f62
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index 5fd2864b7811..4c96817929fd 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -2144,6 +2144,8 @@ static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 	if (unlikely(r))
 		goto out;
 
+	kvm_inject_pending_timer_irqs(vcpu);
+
 	preempt_disable();
 
 	kvm_x86_ops->prepare_guest_switch(vcpu);
diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c
index 7b21576b62bc..ef068d2dddd7 100644
--- a/trunk/drivers/kvm/svm.c
+++ b/trunk/drivers/kvm/svm.c
@@ -1355,7 +1355,6 @@ static void svm_intr_assist(struct kvm_vcpu *vcpu)
 	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 &
diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
index 6955580bb69e..9f77ddbeb025 100644
--- a/trunk/drivers/kvm/vmx.c
+++ b/trunk/drivers/kvm/vmx.c
@@ -2191,7 +2191,6 @@ static void vmx_intr_assist(struct kvm_vcpu *vcpu)
 	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);