instrumentation: kvm: remove compatibility code

[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 87d605cb817e2f585eb33304ebc29990204db116..cdcc35b27a0463b0d0a2c0b952d5e40f945ac237 100644 (file)
--- a/instrumentation/events/lttng-module/kvm.h
+++ b/instrumentation/events/lttng-module/kvm.h
@@ -1,14 +1,12 @@
+/* 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 <linux/version.h>
+#include <probes/lttng-tracepoint-event.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),
@@ -18,14 +16,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)
-#undef __KVM_HAVE_IRQ_LINE
-#define __KVM_HAVE_IRQ_LINE
-#endif
-#endif
 
 #if defined(__KVM_HAVE_IRQ_LINE)
 LTTNG_TRACEPOINT_EVENT(kvm_set_irq,
@@ -58,7 +48,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,20 +74,19 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq,
        { KVM_TRACE_MMIO_READ, "read" }, \
        { KVM_TRACE_MMIO_WRITE, "write" }
 
+
 LTTNG_TRACEPOINT_EVENT(kvm_mmio,
-       TP_PROTO(int type, int len, u64 gpa, u64 val),
+       TP_PROTO(int type, int len, u64 gpa, void *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)
+               ctf_sequence_hex(unsigned char, val, val, u32, len)
        )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
-
 #define kvm_fpu_load_symbol    \
        {0, "unload"},          \
        {1, "load"}
@@ -111,8 +100,6 @@ LTTNG_TRACEPOINT_EVENT(kvm_fpu,
        )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
-
 LTTNG_TRACEPOINT_EVENT(kvm_age_page,
        TP_PROTO(ulong gfn, int level, struct kvm_memory_slot *slot, int ref),
        TP_ARGS(gfn, level, slot, ref),
@@ -126,24 +113,6 @@ LTTNG_TRACEPOINT_EVENT(kvm_age_page,
        )
 )
 
-#else
-
-LTTNG_TRACEPOINT_EVENT(kvm_age_page,
-       TP_PROTO(ulong hva, struct kvm_memory_slot *slot, int ref),
-       TP_ARGS(hva, slot, ref),
-
-       TP_FIELDS(
-               ctf_integer(u64, hva, hva)
-               ctf_integer(u64, gfn,
-                       slot->base_gfn + ((hva - slot->userspace_addr) >> PAGE_SHIFT))
-               ctf_integer(u8, referenced, ref)
-       )
-)
-#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,
 
@@ -197,41 +166,20 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_async_pf_nopresent_ready, kvm_async_pf_ready
        TP_ARGS(token, gva)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) \
-       || LTTNG_RHEL_KERNEL_RANGE(3,10,0,7,1, 3,11,0,0,0))
-
 LTTNG_TRACEPOINT_EVENT(
        kvm_async_pf_completed,
        TP_PROTO(unsigned long address, u64 gva),
        TP_ARGS(address, gva),
 
        TP_FIELDS(
-               ctf_integer(unsigned long, address, address)
-               ctf_integer(u64, gva, gva)
-       )
-)
-
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)) */
-
-LTTNG_TRACEPOINT_EVENT(
-       kvm_async_pf_completed,
-       TP_PROTO(unsigned long address, struct page *page, u64 gva),
-       TP_ARGS(address, page, gva),
-
-       TP_FIELDS(
-               ctf_integer(unsigned long, address, address)
-               ctf_integer(pfn_t, pfn, page ? page_to_pfn(page) : 0)
+               ctf_integer_hex(unsigned long, address, address)
                ctf_integer(u64, gva, gva)
        )
 )
 
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)) */
-
-#endif
-
 #endif
 
 #endif /* LTTNG_TRACE_KVM_MAIN_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>