X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Farch%2Fx86%2Fkvm%2Ftrace.h;h=3c299c58a1cf36059f68a6f21a14e7fe892558ee;hb=458c2022e992c057bd21d02e4c77bcc7d4d6cd6c;hp=5eec16908d36b0ad3475524291b534bb4f2275cd;hpb=026e6902b22bf8e84b1b89059c23257ee5c916b0;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 5eec1690..3c299c58 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 <linux/tracepoint.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>
@@ -714,13 +716,33 @@ 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)
+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0))
 		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)
+#else
+		tp_assign(rip, vcpu->arch.emulate_ctxt._eip -
+			(vcpu->arch.emulate_ctxt.fetch.ptr -
+				vcpu->arch.emulate_ctxt.fetch.data))
+		tp_assign(csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS))
+		tp_assign(len, vcpu->arch.emulate_ctxt.fetch.ptr -
+			vcpu->arch.emulate_ctxt.fetch.data)
+		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)
 		),
@@ -784,6 +806,7 @@ TRACE_EVENT(kvm_write_tsc_offset,
 )
 #endif
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
 #ifdef CONFIG_X86_64
 
 #define host_clocks					\
@@ -844,6 +867,7 @@ TRACE_EVENT(kvm_track_tsc,
 )
 
 #endif /* CONFIG_X86_64 */
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) */
 
 #endif /* _TRACE_KVM_H */