X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Farch%2Fx86%2Fkvm%2Ftrace.h;h=19b1c086eaa468013759986e699a4219267d9604;hb=369708f464bedc0682151df9308cebfa14dbdb2b;hp=f42772df3334f61c55b23bef246ee51d2c9a0439;hpb=b36bb1a8d9cb32b6ce199f05f399b1ca639e240e;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h
index f42772df..19b1c086 100644
--- a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h
+++ b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h
@@ -1,13 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #if !defined(LTTNG_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_KVM_H
 
-#include "../../../../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <asm/vmx.h>
 #include <asm/svm.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
 #include <asm/clocksource.h>
-#endif
-#include <linux/version.h>
 #include <../arch/x86/kvm/lapic.h>
 #include <../arch/x86/kvm/kvm_cache_regs.h>
 
@@ -123,7 +121,7 @@ LTTNG_TRACEPOINT_EVENT_CODE_MAP(kvm_exit, kvm_x86_exit,
 	),
 
 	TP_code_pre(
-		kvm_x86_ops->get_exit_info(vcpu, &tp_locvar->info1,
+		kvm_x86_ops.get_exit_info(vcpu, &tp_locvar->info1,
 				&tp_locvar->info2);
 	),
 
@@ -172,7 +170,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_page_fault, kvm_x86_page_fault,
 	TP_ARGS(fault_address, error_code),
 
 	TP_FIELDS(
-		ctf_integer(unsigned long, fault_address, fault_address)
+		ctf_integer_hex(unsigned long, fault_address, fault_address)
 		ctf_integer(unsigned int, error_code, error_code)
 	)
 )
@@ -362,7 +360,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_invlpga, kvm_x86_invlpga,
 	TP_FIELDS(
 		ctf_integer(__u64, rip, rip)
 		ctf_integer(int, asid, asid)
-		ctf_integer(__u64, address, address)
+		ctf_integer_hex(__u64, address, address)
 	)
 )
 
@@ -423,28 +421,14 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_emulate_insn, kvm_x86_emulate_insn,
 	TP_ARGS(vcpu, failed),
 
 	TP_FIELDS(
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
-		ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt.decode.fetch.start)
-		ctf_integer(__u32, csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS))
-		ctf_integer(__u8, len, vcpu->arch.emulate_ctxt.decode.eip
-				- vcpu->arch.emulate_ctxt.decode.fetch.start)
-		ctf_array(__u8, insn, vcpu->arch.emulate_ctxt.decode.fetch.data, 15)
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0))
-		ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt.fetch.start)
-		ctf_integer(__u32, csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS))
-		ctf_integer(__u8, len, vcpu->arch.emulate_ctxt._eip
-				- vcpu->arch.emulate_ctxt.fetch.start)
-		ctf_array(__u8, insn, vcpu->arch.emulate_ctxt.fetch.data, 15)
-#else
-		ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt._eip -
-				(vcpu->arch.emulate_ctxt.fetch.ptr -
-					vcpu->arch.emulate_ctxt.fetch.data))
-		ctf_integer(__u32, csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS))
-		ctf_integer(__u8, len, vcpu->arch.emulate_ctxt.fetch.ptr -
-				vcpu->arch.emulate_ctxt.fetch.data)
-		ctf_array(__u8, insn, vcpu->arch.emulate_ctxt.fetch.data, 15)
-#endif
-		ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode))
+		ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt->_eip -
+				(vcpu->arch.emulate_ctxt->fetch.ptr -
+					vcpu->arch.emulate_ctxt->fetch.data))
+		ctf_integer(__u32, csbase, kvm_x86_ops.get_segment_base(vcpu, VCPU_SREG_CS))
+		ctf_integer(__u8, len, vcpu->arch.emulate_ctxt->fetch.ptr -
+				vcpu->arch.emulate_ctxt->fetch.data)
+		ctf_array(__u8, insn, vcpu->arch.emulate_ctxt->fetch.data, 15)
+		ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt->mode))
 		ctf_integer(__u8, failed, failed)
 	)
 )
@@ -465,7 +449,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 	)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
 LTTNG_TRACEPOINT_EVENT_MAP(kvm_write_tsc_offset, kvm_x86_write_tsc_offset,
 	TP_PROTO(unsigned int vcpu_id, __u64 previous_tsc_offset,
 		 __u64 next_tsc_offset),
@@ -477,9 +460,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_write_tsc_offset, kvm_x86_write_tsc_offset,
 		ctf_integer(__u64, next_tsc_offset, next_tsc_offset)
 	)
 )
-#endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
 #ifdef CONFIG_X86_64
 
 LTTNG_TRACEPOINT_EVENT_MAP(kvm_update_master_clock, kvm_x86_update_master_clock,
@@ -510,14 +491,13 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_track_tsc, kvm_x86_track_tsc,
 )
 
 #endif /* CONFIG_X86_64 */
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) */
 
 #endif /* LTTNG_TRACE_KVM_H */
 
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86/kvm
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86/kvm
 #undef TRACE_INCLUDE_FILE
 #define TRACE_INCLUDE_FILE trace
 
 /* This part must be outside protection */
-#include "../../../../../../probes/define_trace.h"
+#include <probes/define_trace.h>