KVM: convert custom marker based tracing to event traces

This allows use of the powerful ftrace infrastructure.

See Documentation/trace/ for usage information.

[avi, stephen: various build fixes]
[sheng: fix control register breakage]

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 57 insertions, 0 deletions

diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
new file mode 100644
index 00000000000..d74b23d803f
--- /dev/null
+++ b/include/trace/events/kvm.h
@@ -0,0 +1,57 @@
+#if !defined(_TRACE_KVM_MAIN_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_KVM_MAIN_H
+
+#include <linux/tracepoint.h>
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM kvm
+#define TRACE_INCLUDE_FILE kvm
+
+#if defined(__KVM_HAVE_IOAPIC)
+TRACE_EVENT(kvm_set_irq,
+        TP_PROTO(unsigned int gsi),
+        TP_ARGS(gsi),
+
+        TP_STRUCT__entry(
+                __field(        unsigned int,   gsi             )
+        ),
+
+        TP_fast_assign(
+                __entry->gsi            = gsi;
+        ),
+
+        TP_printk("gsi %u", __entry->gsi)
+);
+
+
+#define kvm_irqchips                                            \
+        {KVM_IRQCHIP_PIC_MASTER,        "PIC master"},          \
+        {KVM_IRQCHIP_PIC_SLAVE,         "PIC slave"},           \
+        {KVM_IRQCHIP_IOAPIC,            "IOAPIC"}
+
+TRACE_EVENT(kvm_ack_irq,
+        TP_PROTO(unsigned int irqchip, unsigned int pin),
+        TP_ARGS(irqchip, pin),
+
+        TP_STRUCT__entry(
+                __field(        unsigned int,   irqchip         )
+                __field(        unsigned int,   pin             )
+        ),
+
+        TP_fast_assign(
+                __entry->irqchip        = irqchip;
+                __entry->pin            = pin;
+        ),
+
+        TP_printk("irqchip %s pin %u",
+                  __print_symbolic(__entry->irqchip, kvm_irqchips),
+                 __entry->pin)
+);
+
+
+
+#endif /* defined(__KVM_HAVE_IOAPIC) */
+#endif /* _TRACE_KVM_MAIN_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>