X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fkvm.h;h=b05482ee0c5afa497a9f186dda6d8552ff654743;hb=cf77d12083b5092eca8c6f9899ec0892756845aa;hp=5f14ba137c720c4a2262850ee09d8f12298493ad;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h
index 5f14ba13..b05482ee 100644
--- a/instrumentation/events/lttng-module/kvm.h
+++ b/instrumentation/events/lttng-module/kvm.h
@@ -1,15 +1,13 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #if !defined(LTTNG_TRACE_KVM_MAIN_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_KVM_MAIN_H
 
-#include <probes/lttng-tracepoint-event.h>
+#include <lttng/tracepoint-event.h>
 #include <linux/version.h>
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvm
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
-
 LTTNG_TRACEPOINT_EVENT(kvm_userspace_exit,
 	    TP_PROTO(__u32 reason, int errno),
 	    TP_ARGS(reason, errno),
@@ -19,7 +17,6 @@ LTTNG_TRACEPOINT_EVENT(kvm_userspace_exit,
 		ctf_integer(int, errno, errno)
 	)
 )
-#endif
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0))
 #if defined(__KVM_HAVE_IOAPIC)
@@ -59,7 +56,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_msi_set_irq,
 	    TP_ARGS(address, data),
 
 	TP_FIELDS(
-		ctf_integer(__u64, address, address)
+		ctf_integer_hex(__u64, address, address)
 		ctf_integer(__u64, data, data)
 	)
 )
@@ -85,7 +82,23 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq,
 	{ KVM_TRACE_MMIO_READ, "read" }, \
 	{ KVM_TRACE_MMIO_WRITE, "write" }
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \
+
+#if (LTTNG_SLE_KERNEL_RANGE(4,4,121,92,92,0, 4,4,122,0,0,0) \
+	|| LTTNG_SLE_KERNEL_RANGE(4,4,131,94,0,0, 4,5,0,0,0,0))
+
+LTTNG_TRACEPOINT_EVENT(kvm_mmio,
+	TP_PROTO(int type, int len, u64 gpa, u64 val),
+	TP_ARGS(type, len, gpa, val),
+
+	TP_FIELDS(
+		ctf_integer(u32, type, type)
+		ctf_integer(u32, len, len)
+		ctf_integer(u64, gpa, gpa)
+		ctf_integer(u64, val, val)
+	)
+)
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \
 	|| LTTNG_KERNEL_RANGE(4,14,14, 4,15,0) \
 	|| LTTNG_DEBIAN_KERNEL_RANGE(4,14,13,0,1,0, 4,15,0,0,0,0) \
 	|| LTTNG_KERNEL_RANGE(4,9,77, 4,10,0) \
@@ -126,8 +139,6 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio,
 
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
-
 #define kvm_fpu_load_symbol	\
 	{0, "unload"},		\
 	{1, "load"}
@@ -171,9 +182,6 @@ LTTNG_TRACEPOINT_EVENT(kvm_age_page,
 	)
 )
 #endif
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
 
 #ifdef CONFIG_KVM_ASYNC_PF
 LTTNG_TRACEPOINT_EVENT_CLASS(kvm_async_get_page_class,
@@ -237,7 +245,7 @@ LTTNG_TRACEPOINT_EVENT(
 	TP_ARGS(address, gva),
 
 	TP_FIELDS(
-		ctf_integer(unsigned long, address, address)
+		ctf_integer_hex(unsigned long, address, address)
 		ctf_integer(u64, gva, gva)
 	)
 )
@@ -250,7 +258,7 @@ LTTNG_TRACEPOINT_EVENT(
 	TP_ARGS(address, page, gva),
 
 	TP_FIELDS(
-		ctf_integer(unsigned long, address, address)
+		ctf_integer_hex(unsigned long, address, address)
 		ctf_integer(pfn_t, pfn, page ? page_to_pfn(page) : 0)
 		ctf_integer(u64, gva, gva)
 	)
@@ -260,9 +268,7 @@ LTTNG_TRACEPOINT_EVENT(
 
 #endif
 
-#endif
-
 #endif /* LTTNG_TRACE_KVM_MAIN_H */
 
 /* This part must be outside protection */
-#include <probes/define_trace.h>
+#include <lttng/define_trace.h>