diff options
-rw-r--r-- | include/trace/events/kvm.h | 11 | ||||
-rw-r--r-- | virt/kvm/irq_comm.c | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h index d74b23d803f1..035232dc84e0 100644 --- a/include/trace/events/kvm.h +++ b/include/trace/events/kvm.h | |||
@@ -9,18 +9,23 @@ | |||
9 | 9 | ||
10 | #if defined(__KVM_HAVE_IOAPIC) | 10 | #if defined(__KVM_HAVE_IOAPIC) |
11 | TRACE_EVENT(kvm_set_irq, | 11 | TRACE_EVENT(kvm_set_irq, |
12 | TP_PROTO(unsigned int gsi), | 12 | TP_PROTO(unsigned int gsi, int level, int irq_source_id), |
13 | TP_ARGS(gsi), | 13 | TP_ARGS(gsi, level, irq_source_id), |
14 | 14 | ||
15 | TP_STRUCT__entry( | 15 | TP_STRUCT__entry( |
16 | __field( unsigned int, gsi ) | 16 | __field( unsigned int, gsi ) |
17 | __field( int, level ) | ||
18 | __field( int, irq_source_id ) | ||
17 | ), | 19 | ), |
18 | 20 | ||
19 | TP_fast_assign( | 21 | TP_fast_assign( |
20 | __entry->gsi = gsi; | 22 | __entry->gsi = gsi; |
23 | __entry->level = level; | ||
24 | __entry->irq_source_id = irq_source_id; | ||
21 | ), | 25 | ), |
22 | 26 | ||
23 | TP_printk("gsi %u", __entry->gsi) | 27 | TP_printk("gsi %u level %d source %d", |
28 | __entry->gsi, __entry->level, __entry->irq_source_id) | ||
24 | ); | 29 | ); |
25 | 30 | ||
26 | 31 | ||
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c index 94759ed96b64..56e696104d43 100644 --- 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) | |||
126 | unsigned long *irq_state, sig_level; | 126 | unsigned long *irq_state, sig_level; |
127 | int ret = -1; | 127 | int ret = -1; |
128 | 128 | ||
129 | trace_kvm_set_irq(irq); | 129 | trace_kvm_set_irq(irq, level, irq_source_id); |
130 | 130 | ||
131 | WARN_ON(!mutex_is_locked(&kvm->irq_lock)); | 131 | WARN_ON(!mutex_is_locked(&kvm->irq_lock)); |
132 | 132 | ||