From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

Date: Tue Dec 26 09:47:22 2017 -0500

Subject: Update kvm instrumentation for 4.15

Git-commit: 33630522da97345c2b0c569c04c1d5d33ab7efa6

References: none

Signed-off-by: Tony Jones <tonyj@suse.de>

​

    Update kvm instrumentation for 4.15

    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

​

diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h

index a8b3e9a..c01772c 100644

--- a/instrumentation/events/lttng-module/kvm.h

+++ b/instrumentation/events/lttng-module/kvm.h

@@ -84,6 +84,22 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq,

    { KVM_TRACE_MMIO_READ, "read" }, \

    { KVM_TRACE_MMIO_WRITE, "write" }

+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))

+

+LTTNG_TRACEPOINT_EVENT(kvm_mmio,

+   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_sequence_hex(unsigned char, val, val, u32, len)

+   )

+)

+

+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) */

+

 LTTNG_TRACEPOINT_EVENT(kvm_mmio,

    TP_PROTO(int type, int len, u64 gpa, u64 val),

    TP_ARGS(type, len, gpa, val),

@@ -96,6 +112,8 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio,

    )

 )

+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) */

+

 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))

 #define kvm_fpu_load_symbol    \

​