Cleanup: Move headers from probes/ to include/lttng/

[lttng-modules.git] / instrumentation / events / lttng-module / kvm.h

diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h
index 62030fcc87c2da6d8fa8796721601f91366d9d9e..b05482ee0c5afa497a9f186dda6d8552ff654743 100644 (file)
--- 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)
        )
 )
@@ -142,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"}
@@ -187,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,
@@ -253,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)
        )
 )
@@ -266,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)
        )
@@ -276,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>