KVM: Trace irq level and source id

Signed-off-by: Avi Kivity <avi@redhat.com>

diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index d74b23d803f1f98ed91d045594db4982f6dc9bb5..035232dc84e034d855c419c18924b4eb42511fa9 100644 (file)
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -9,18 +9,23 @@
 
 #if defined(__KVM_HAVE_IOAPIC)
 TRACE_EVENT(kvm_set_irq,
-       TP_PROTO(unsigned int gsi),
-       TP_ARGS(gsi),
+       TP_PROTO(unsigned int gsi, int level, int irq_source_id),
+       TP_ARGS(gsi, level, irq_source_id),
 
        TP_STRUCT__entry(
                __field(        unsigned int,   gsi             )
+               __field(        int,            level           )
+               __field(        int,            irq_source_id   )
        ),
 
        TP_fast_assign(
                __entry->gsi            = gsi;
+               __entry->level          = level;
+               __entry->irq_source_id  = irq_source_id;
        ),
 
-       TP_printk("gsi %u", __entry->gsi)
+       TP_printk("gsi %u level %d source %d",
+                 __entry->gsi, __entry->level, __entry->irq_source_id)
 );
 
 

diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index 94759ed96b6476b01b58eac3afbfdbd47ed69cf5..56e696104d43026920c707977012b3037422ae8c 100644 (file)
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -126,7 +126,7 @@ int kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level)
        unsigned long *irq_state, sig_level;
        int ret = -1;
 
-       trace_kvm_set_irq(irq);
+       trace_kvm_set_irq(irq, level, irq_source_id);
 
        WARN_ON(!mutex_is_locked(&kvm->irq_lock));