correctly trace irq injection on SVM.

PATCH Superseded Gleb Natapov 1 participant 1 message May 20, 2010

Subsystems (3)

x86 KVM KVM x86

lore

Share & tools

lore

Gleb Natapov

author

2010-05-20 10:31 UTC #0 lore raw

PATCH v2 1/1 correctly trace irq injection on SVM.

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 <[email protected]>

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

arch/x86/kvm/svm.c +2 -2

index 58c91f5..69b16a7 100644
@@ -2831,8 +2831,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;

@@ -2847,6 +2845,8 @@ static void svm_set_irq(struct kvm_vcpu *vcpu)
 
 	BUG_ON(!(gif_set(svm)));
 
+	trace_kvm_inj_virq(vcpu->arch.interrupt.nr);
+
 	svm->vmcb->control.event_inj = vcpu->arch.interrupt.nr |
 		SVM_EVTINJ_VALID | SVM_EVTINJ_TYPE_INTR;
 }

--
Gleb.