Standardize lttng-modules header version

refs #79

Signed-off-by: David Goulet <dgoulet@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/src/bin/lttng-sessiond/kern-modules.h b/src/bin/lttng-sessiond/kern-modules.h
index e696ea3b706d498354be7a922c0373cc539923b8..5c4d5dd586520e5f720c658d938c29f6616ca95b 100644 (file)
--- a/src/bin/lttng-sessiond/kern-modules.h
+++ b/src/bin/lttng-sessiond/kern-modules.h
@@ -21,12 +21,11 @@
 /*
  * Compatible lttng-modules version.
  */
-#define KERN_MODULES_PRE_VERSION       1
-#define KERN_MODULES_PRE_PATCHLEVEL    9
+#define KERN_MODULES_PRE_MAJOR     1
+#define KERN_MODULES_PRE_MINOR     9
 
-#define KERN_MODULES_VERSION       2
-#define KERN_MODULES_PATCHLEVEL    0
-#define KERN_MODULES_SUBLEVEL      0
+#define KERN_MODULES_MAJOR         2
+#define KERN_MODULES_MINOR         0
 
 struct kern_modules_param {
        const char *name;

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index dfc0be958addc895bc1bd68384530002a6d501ac..8e960dfed8fe59786a3de2436aae3155db9851d6 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -622,17 +622,17 @@ int kernel_validate_version(int tracer_fd)
        }
 
        /* Validate version */
-       if (version.version != KERN_MODULES_PRE_VERSION
-               && version.version != KERN_MODULES_VERSION) {
+       if (version.major != KERN_MODULES_PRE_MAJOR
+               && version.major != KERN_MODULES_MAJOR) {
                goto error_version;
        }
 
-       DBG2("Kernel tracer version validated (major version %d)", version.version);
+       DBG2("Kernel tracer version validated (major version %d)", version.major);
        return 0;
 
 error_version:
        ERR("Kernel major version %d is not compatible (supporting <= %d)",
-                       version.version, KERN_MODULES_VERSION)
+                       version.major, KERN_MODULES_MAJOR)
        ret = -1;
 
 error:

diff --git a/src/common/lttng-kernel.h b/src/common/lttng-kernel.h
index e1d99ceee0bdd5ae366f196ab94da53d4b8efaee..05303a5e0d2c1c889c92f4adfecf2a552af8acf6 100644 (file)
--- a/src/common/lttng-kernel.h
+++ b/src/common/lttng-kernel.h
@@ -113,9 +113,9 @@ struct lttng_kernel_event {
 };
 
 struct lttng_kernel_tracer_version {
-       uint32_t version;
+       uint32_t major;
+       uint32_t minor;
        uint32_t patchlevel;
-       uint32_t sublevel;
 };
 
 enum lttng_kernel_calibrate_type {