From 672f4bf8ed8c9a876241eb7b70bf459009cd2c81 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 13 Apr 2020 16:52:10 -0400 Subject: [PATCH] instrumentation: x86 kvm: remove compatibility code --- .../events/lttng-module/arch/x86/kvm/trace.h | 37 ------------------- 1 file changed, 37 deletions(-) diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h index 0969d32a..19b1c086 100644 --- a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h +++ b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h @@ -5,10 +5,7 @@ #include #include #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) #include -#endif -#include #include <../arch/x86/kvm/lapic.h> #include <../arch/x86/kvm/kvm_cache_regs.h> @@ -124,13 +121,8 @@ LTTNG_TRACEPOINT_EVENT_CODE_MAP(kvm_exit, kvm_x86_exit, ), TP_code_pre( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) kvm_x86_ops.get_exit_info(vcpu, &tp_locvar->info1, &tp_locvar->info2); -#else - kvm_x86_ops->get_exit_info(vcpu, &tp_locvar->info1, - &tp_locvar->info2); -#endif ), TP_FIELDS( @@ -429,30 +421,6 @@ 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) - ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode)) -#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) - ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode)) -#elif (LINUX_VERSION_CODE < 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)) - 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)) -#else ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt->_eip - (vcpu->arch.emulate_ctxt->fetch.ptr - vcpu->arch.emulate_ctxt->fetch.data)) @@ -461,7 +429,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_emulate_insn, kvm_x86_emulate_insn, 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)) -#endif ctf_integer(__u8, failed, failed) ) ) @@ -482,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), @@ -494,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, @@ -527,7 +491,6 @@ 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 */ -- 2.34.1