path: root/include
diff options
authorChristian Borntraeger <borntraeger@de.ibm.com>2015-01-15 14:21:19 (GMT)
committerPaolo Bonzini <pbonzini@redhat.com>2015-01-19 10:07:57 (GMT)
commitcdef511985374dd042a40bb32c1c346c2662c9dc (patch)
treecfbc83ee36d0f40e44318d369bc25abfb8af2329 /include
parentec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc (diff)
KVM: fix sparse warning in include/trace/events/kvm.h
sparse complains about include/trace/events/kvm.h:163:1: error: directive in argument list include/trace/events/kvm.h:167:1: error: directive in argument list include/trace/events/kvm.h:169:1: error: directive in argument list and sparse is right. Preprocessing directives in an argument of a macro are undefined behaviour as of C99 6.10.3p11. Lets use an indirection to fix this. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
1 files changed, 9 insertions, 7 deletions
diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index 6edf1f2..86b399c 100644
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -146,6 +146,14 @@ TRACE_EVENT(kvm_msi_set_irq,
+#ifdef kvm_irqchips
+#define kvm_ack_irq_string "irqchip %s pin %u"
+#define kvm_ack_irq_parm __print_symbolic(__entry->irqchip, kvm_irqchips), __entry->pin
+#define kvm_ack_irq_string "irqchip %d pin %u"
+#define kvm_ack_irq_parm __entry->irqchip, __entry->pin
TP_PROTO(unsigned int irqchip, unsigned int pin),
TP_ARGS(irqchip, pin),
@@ -160,13 +168,7 @@ TRACE_EVENT(kvm_ack_irq,
__entry->pin = pin;
-#ifdef kvm_irqchips
- TP_printk("irqchip %s pin %u",
- __print_symbolic(__entry->irqchip, kvm_irqchips),
- __entry->pin)
- TP_printk("irqchip %d pin %u", __entry->irqchip, __entry->pin)
+ TP_printk(kvm_ack_irq_string, kvm_ack_irq_parm)
#endif /* defined(CONFIG_HAVE_KVM_IRQFD) */

Privacy Policy