From 5ccd696806d409d5d0261b2e7e4d9618daf02e24 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 2 Jan 2018 11:07:05 -0500 Subject: [PATCH] Update: kvm instrumentation for 3.16.52 and 3.2.97 Starting from 3.16.52 and 3.2.97, the 3.16 and 3.2 stable kernel branches backport a kvm instrumentation change introduced in 4.15 which affects the prototype of the kvm_mmio event. Signed-off-by: Mathieu Desnoyers --- instrumentation/events/lttng-module/kvm.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h index ec74bddf..ea63e88b 100644 --- a/instrumentation/events/lttng-module/kvm.h +++ b/instrumentation/events/lttng-module/kvm.h @@ -84,7 +84,9 @@ 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 (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \ + || LTTNG_KERNEL_RANGE(3,16,52, 3,17,0) \ + || LTTNG_KERNEL_RANGE(3,2,97, 3,3,0)) LTTNG_TRACEPOINT_EVENT(kvm_mmio, TP_PROTO(int type, int len, u64 gpa, void *val), @@ -98,7 +100,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio, ) ) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) */ +#else LTTNG_TRACEPOINT_EVENT(kvm_mmio, TP_PROTO(int type, int len, u64 gpa, u64 val), @@ -112,7 +114,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio, ) ) -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) */ +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) -- 2.34.1