From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 16 May 2016 04:21:20 +0000 (-0400)
Subject: Clarify kernel version check error messages
X-Git-Tag: v2.7.3~2
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=7f91c7e51cd4f4693bec6c6324aca67149a47bd1;p=lttng-tools.git

Clarify kernel version check error messages

Refs #949

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 381b83e63..2c5b36541 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -830,7 +830,7 @@ int kernel_validate_version(int tracer_fd)
 
 	ret = kernctl_tracer_version(tracer_fd, &version);
 	if (ret < 0) {
-		ERR("Failed at getting the lttng-modules version");
+		ERR("Failed to retrieve the lttng-modules version");
 		goto error;
 	}
 
@@ -842,11 +842,11 @@ int kernel_validate_version(int tracer_fd)
 	}
 	ret = kernctl_tracer_abi_version(tracer_fd, &abi_version);
 	if (ret < 0) {
-		ERR("Failed at getting lttng-modules ABI version");
+		ERR("Failed to retrieve lttng-modules ABI version");
 		goto error;
 	}
 	if (abi_version.major != LTTNG_MODULES_ABI_MAJOR_VERSION) {
-		ERR("Kernel tracer ABI version (%d.%d) is not compatible with expected ABI major version (%d.*)",
+		ERR("Kernel tracer ABI version (%d.%d) does not match the expected ABI major version (%d.*)",
 			abi_version.major, abi_version.minor,
 			LTTNG_MODULES_ABI_MAJOR_VERSION);
 		goto error;
@@ -860,6 +860,7 @@ error_version:
 	ret = -1;
 
 error:
+	ERR("Kernel tracer version check failed; kernel tracing will not be available");
 	return ret;
 }