[PATCHv3] correctly trace irq injection on SVM.

[PATCHv3] correctly trace irq injection on SVM.

[Gleb Natapov]

On SVM interrupts are injected by svm_set_irq() not svm_inject_irq().
The later is used only to wait for irq window.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
---

ChangeLog:
 v1->v2:
  - fix stupid cut&paste error.

 v2->v3:
  - Move also kvm_stat accounting of irq_injections to correct place.

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 4af2c12..ebc24b5 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -2919,9 +2919,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;
@@ -2935,6 +2932,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;
 }
--
			Gleb.

Re: [PATCHv3] correctly trace irq injection on SVM.

[Avi Kivity]

On 05/23/2010 02:28 PM, Gleb Natapov wrote:
> On SVM interrupts are injected by svm_set_irq() not svm_inject_irq().
> The later is used only to wait for irq window.
>    

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function