From: Chris J Arges <chris.j.arges@canonical.com>
Date: Fri, 24 Jul 2015 18:18:59 +0000 (-0500)
Subject: Fix: disable kvm probe if lapic.h isn't found
X-Git-Tag: v2.6.3~6
X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=commitdiff_plain;h=72c452b2064321ae8b511508dbc80a7fd586a656

Fix: disable kvm probe if lapic.h isn't found

In a typical distribution if just linux-headers is installed, lapic.h
will not be installed. We should check if that file exists and not build
the module.

Signed-off-by: Chris J Arges <chris.j.arges@canonical.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/probes/Makefile b/probes/Makefile
index 0314a5e2..cc4c3521 100644
--- a/probes/Makefile
+++ b/probes/Makefile
@@ -25,6 +25,8 @@ obj-m += lttng-probe-statedump.o
 ifneq ($(CONFIG_KVM),)
 obj-m += lttng-probe-kvm.o
 ifneq ($(CONFIG_X86),)
+kvm_dep_lapic = $(srctree)/arch/x86/kvm/lapic.h
+ifneq ($(wildcard $(kvm_dep_lapic)),)
 kvm_dep = $(srctree)/virt/kvm/iodev.h $(srctree)/include/kvm/iodev.h
 ifneq ($(wildcard $(kvm_dep)),)
 CFLAGS_lttng-probe-kvm-x86.o += -I$(srctree)/virt/kvm
@@ -40,6 +42,9 @@ obj-m +=  $(shell \
 else
 $(warning File $(kvm_dep) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.)
 endif
+else
+$(warning File $(kvm_dep_lapic) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.)
+endif
 endif
 endif