projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clarify kernel version check error messages
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
kernel.c
diff --git
a/src/bin/lttng-sessiond/kernel.c
b/src/bin/lttng-sessiond/kernel.c
index 24666f968d61da9b755eb0df52c31eb465de8158..9d26b2bc9607dc2ded0f591395755cab8569c2dc 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel.c
+++ b/
src/bin/lttng-sessiond/kernel.c
@@
-704,7
+704,7
@@
int kernel_validate_version(int tracer_fd)
ret = kernctl_tracer_version(tracer_fd, &version);
if (ret < 0) {
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;
}
goto error;
}
@@
-716,11
+716,11
@@
int kernel_validate_version(int tracer_fd)
}
ret = kernctl_tracer_abi_version(tracer_fd, &abi_version);
if (ret < 0) {
}
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) {
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;
abi_version.major, abi_version.minor,
LTTNG_MODULES_ABI_MAJOR_VERSION);
goto error;
@@
-734,6
+734,7
@@
error_version:
ret = -1;
error:
ret = -1;
error:
+ ERR("Kernel tracer version check failed; kernel tracing will not be available");
return ret;
}
return ret;
}
This page took
0.024788 seconds
and
4
git commands to generate.