From b982e061034e29529032eeddcf686c1d96eadf48 Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Sun, 23 May 2010 14:28:26 +0300
Subject: [PATCH] --- yaml --- r: 202295 b: refs/heads/master c:
 9fb2d2b4ff292a01ae30da003d1dc097917b0988 h: refs/heads/master i:   202293:
 38226f95987058193ef69c2095191486cbafefca   202291:
 77ee4caa1b29a9bfc709d338a5807989ceec402f   202287:
 d4029028c8f3d3bf97c9a2d56e2829fe137bbca2 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/svm.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 216ff7976bf9..076308df1ed8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f78978aa3a8222f7822f15fba5dbaea990ef0887
+refs/heads/master: 9fb2d2b4ff292a01ae30da003d1dc097917b0988
diff --git a/trunk/arch/x86/kvm/svm.c b/trunk/arch/x86/kvm/svm.c
index 134260c36ce2..f5c2b432078a 100644
--- a/trunk/arch/x86/kvm/svm.c
+++ b/trunk/arch/x86/kvm/svm.c
@@ -2917,9 +2917,6 @@ static inline void svm_inject_irq(struct vcpu_svm *svm, int irq)
 {
 	struct vmcb_control_area *control;
 
-	trace_kvm_inj_virq(irq);
-
-	++svm->vcpu.stat.irq_injections;
 	control = &svm->vmcb->control;
 	control->int_vector = irq;
 	control->int_ctl &= ~V_INTR_PRIO_MASK;
@@ -2933,6 +2930,9 @@ static void svm_set_irq(struct kvm_vcpu *vcpu)
 
 	BUG_ON(!(gif_set(svm)));
 
+	trace_kvm_inj_virq(vcpu->arch.interrupt.nr);
+	++vcpu->stat.irq_injections;
+
 	svm->vmcb->control.event_inj = vcpu->arch.interrupt.nr |
 		SVM_EVTINJ_VALID | SVM_EVTINJ_TYPE_INTR;
 }