X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2Flttng-probe-kvm-x86.c;h=0317c095c6cca9bc0d2023c7b2bdf1d2b377e3a6;hb=b53047135828b997a4eeb2cae7344cb169aa9c8c;hp=f081cdd5e4fe31afa0c1c9212f44cf61885df9f7;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git

diff --git a/probes/lttng-probe-kvm-x86.c b/probes/lttng-probe-kvm-x86.c
index f081cdd5..0317c095 100644
--- a/probes/lttng-probe-kvm-x86.c
+++ b/probes/lttng-probe-kvm-x86.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
  * probes/lttng-probe-kvm.c
  *
@@ -9,14 +9,12 @@
 
 #include <linux/module.h>
 #include <linux/kvm_host.h>
-#include <lttng-tracer.h>
-#include <lttng-kernel-version.h>
+#include <lttng/lttng-tracer.h>
+
+/* TODO: check for header availability in Makefile */
+#include <../../arch/x86/kvm/kvm_emulate.h>
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0))
 #include <kvm/iodev.h>
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) */
-#include <../../virt/kvm/iodev.h>
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) */
 
 /*
  * Create the tracepoint static inlines from the kernel to validate that our
@@ -24,7 +22,7 @@
  */
 #include <trace/events/kvm.h>
 
-#include <wrapper/tracepoint.h>
+#include <lttng/lttng-tracepoint.h>
 
 /*
  * Create LTTng tracepoint probes.