From 623d019720d708350ed55bce2b79b04e49604b23 Mon Sep 17 00:00:00 2001 From: Tony Jones Date: Fri, 21 Feb 2014 12:17:28 -0800 Subject: [PATCH] Fix: correctly version kvm events to build against v3.0 kernel Cleanly build against v3.0 kernel. I didn't add versioning for mainline commit 0d460ffc as it's build compatible. Signed-off-by: Tony Jones Signed-off-by: Mathieu Desnoyers --- .../events/lttng-module/arch/x86/kvm/trace.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h index 8e71a7f5..db7bfe19 100644 --- a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h +++ b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h @@ -4,7 +4,9 @@ #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> @@ -714,13 +716,23 @@ TRACE_EVENT(kvm_emulate_insn, ), TP_fast_assign( +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) + tp_assign(rip, vcpu->arch.emulate_ctxt.decode.fetch.start) + tp_assign(csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS)) + tp_assign(len, vcpu->arch.emulate_ctxt.decode.eip + - vcpu->arch.emulate_ctxt.decode.fetch.start) + tp_memcpy(insn, + vcpu->arch.emulate_ctxt.decode.fetch.data, + 15) +#else tp_assign(rip, vcpu->arch.emulate_ctxt.fetch.start) - tp_assign(csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS)) + tp_assign(csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS)) tp_assign(len, vcpu->arch.emulate_ctxt._eip - vcpu->arch.emulate_ctxt.fetch.start) tp_memcpy(insn, vcpu->arch.emulate_ctxt.fetch.data, 15) +#endif tp_assign(flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode)) tp_assign(failed, failed) ), @@ -761,6 +773,7 @@ TRACE_EVENT( __entry->gpa_match ? "GPA" : "GVA") ) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) #ifdef CONFIG_X86_64 #define host_clocks \ @@ -821,6 +834,7 @@ TRACE_EVENT(kvm_track_tsc, ) #endif /* CONFIG_X86_64 */ +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) */ #endif /* _TRACE_KVM_H */ -- 2.34.1