X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Farch%2Fx86%2Fkvm%2Ftrace.h;h=0bccea064392f248a561c5e3b6214e5a0efa4c31;hb=3589318286246274bdf7b659e798c9728bd9dd2b;hp=0d6c4e3319361e4c9823e0d18da36ff148d0fdac;hpb=7724cf27c1e739099c7907ba5b3b8bc86f904595;p=lttng-modules.git

diff --git a/include/instrumentation/events/arch/x86/kvm/trace.h b/include/instrumentation/events/arch/x86/kvm/trace.h
index 0d6c4e33..0bccea06 100644
--- a/include/instrumentation/events/arch/x86/kvm/trace.h
+++ b/include/instrumentation/events/arch/x86/kvm/trace.h
@@ -5,9 +5,7 @@
 #include <lttng/tracepoint-event.h>
 #include <asm/vmx.h>
 #include <asm/svm.h>
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
 #include <asm/clocksource.h>
-#endif
 #include <lttng/kernel-version.h>
 #include <wrapper/kvm-x86.h>
 #include <../arch/x86/kvm/lapic.h>
@@ -546,21 +544,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_emulate_insn, kvm_x86_emulate_insn,
 	TP_ARGS(vcpu, failed),
 
 	TP_FIELDS(
-#if (LTTNG_LINUX_VERSION_CODE < LTTNG_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)
-		ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode))
-#elif (LTTNG_LINUX_VERSION_CODE < LTTNG_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)
-		ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode))
-#elif (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(5,7,0))
+#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(5,7,0))
 		ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt._eip -
 				(vcpu->arch.emulate_ctxt.fetch.ptr -
 					vcpu->arch.emulate_ctxt.fetch.data))
@@ -608,7 +592,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 	)
 )
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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),
@@ -620,9 +603,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 (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
 #ifdef CONFIG_X86_64
 
 LTTNG_TRACEPOINT_EVENT_MAP(kvm_update_master_clock, kvm_x86_update_master_clock,
@@ -653,7 +634,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_track_tsc, kvm_x86_track_tsc,
 )
 
 #endif /* CONFIG_X86_64 */
-#endif /* LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0) */
 
 #endif /* LTTNG_TRACE_KVM_H */