X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=158a12a3633fa54100c81d0f5179b6c2c9d9c68e;hb=0a28e5534ea9d68c19c57f2453e789a7188e16b4;hp=535a5b8e8c4035918f0e2665ac0af8f0e7ad8eda;hpb=e1f3997aa650554880105d787a864653add7c070;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 535a5b8e8..158a12a36 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -824,38 +824,38 @@ error:
 /*
  * Get kernel version and validate it.
  */
-int kernel_validate_version(int tracer_fd)
+int kernel_validate_version(int tracer_fd,
+		struct lttng_kernel_tracer_version *version,
+		struct lttng_kernel_tracer_abi_version *abi_version)
 {
 	int ret;
-	struct lttng_kernel_tracer_version version;
-	struct lttng_kernel_tracer_abi_version abi_version;
 
-	ret = kernctl_tracer_version(tracer_fd, &version);
+	ret = kernctl_tracer_version(tracer_fd, version);
 	if (ret < 0) {
 		ERR("Failed to retrieve the lttng-modules version");
 		goto error;
 	}
 
 	/* Validate version */
-	if (version.major != VERSION_MAJOR) {
+	if (version->major != VERSION_MAJOR) {
 		ERR("Kernel tracer major version (%d) is not compatible with lttng-tools major version (%d)",
-			version.major, VERSION_MAJOR);
+			version->major, VERSION_MAJOR);
 		goto error_version;
 	}
-	ret = kernctl_tracer_abi_version(tracer_fd, &abi_version);
+	ret = kernctl_tracer_abi_version(tracer_fd, abi_version);
 	if (ret < 0) {
 		ERR("Failed to retrieve lttng-modules ABI version");
 		goto error;
 	}
-	if (abi_version.major != LTTNG_MODULES_ABI_MAJOR_VERSION) {
+	if (abi_version->major != LTTNG_MODULES_ABI_MAJOR_VERSION) {
 		ERR("Kernel tracer ABI version (%d.%d) does not match the expected ABI major version (%d.*)",
-			abi_version.major, abi_version.minor,
+			abi_version->major, abi_version->minor,
 			LTTNG_MODULES_ABI_MAJOR_VERSION);
 		goto error;
 	}
 	DBG2("Kernel tracer version validated (%d.%d, ABI %d.%d)",
-			version.major, version.minor,
-			abi_version.major, abi_version.minor);
+			version->major, version->minor,
+			abi_version->major, abi_version->minor);
 	return 0;
 
 error_version:
@@ -1039,7 +1039,7 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
 
 		/* For each channel, ask the consumer to snapshot it. */
 		cds_list_for_each_entry(chan, &ksess->channel_list.head, list) {
-			ret = consumer_snapshot_channel(socket, chan->fd, output, 0,
+			ret = consumer_snapshot_channel(socket, chan->key, output, 0,
 					ksess->uid, ksess->gid,
 					DEFAULT_KERNEL_TRACE_DIR, wait,
 					nb_packets_per_stream);