Change integer base to hex for fields representing addresses

[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 85aa8a748fb843a9b796ae839cf45946e6609d99..8ac6bc94f14718a0a112106d04b29cfb74ee3aa1 100644 (file)
--- a/instrumentation/events/lttng-module/kvm.h
+++ b/instrumentation/events/lttng-module/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(LTTNG_TRACE_KVM_MAIN_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_KVM_MAIN_H
 
@@ -7,8 +8,6 @@
 #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),
@@ -18,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)
@@ -58,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)
        )
 )
@@ -84,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) \
@@ -93,6 +107,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq,
        || LTTNG_KERNEL_RANGE(3,16,52, 3,17,0) \
        || LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,144, 3,14,0,0) \
        || LTTNG_KERNEL_RANGE(3,2,97, 3,3,0) \
+       || LTTNG_UBUNTU_KERNEL_RANGE(4,13,16,38, 4,14,0,0) \
        || LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,0,3,0, 4,10,0,0,0,0) \
        || LTTNG_FEDORA_KERNEL_RANGE(4,14,13,300, 4,15,0,0))
 
@@ -124,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"}
@@ -169,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,
@@ -235,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)
        )
 )
@@ -248,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)
        )
@@ -258,8 +268,6 @@ LTTNG_TRACEPOINT_EVENT(
 
 #endif
 
-#endif
-
 #endif /* LTTNG_TRACE_KVM_MAIN_H */
 
 /* This part must be outside protection */