X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fkernel-ctl.c;h=bc92ffca918cb07b524aa8b9a6865308e455761b;hp=16b85bdb5bcb5b6793450b0f2794023541fa2466;hb=d36b858358a8ef4e00de843379d670925f9c23b6;hpb=950131af6bda07be09bc88fe3ecba68ee21e6c26

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index 16b85bdb5..bc92ffca9 100644
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -141,7 +141,6 @@ int kernel_create_event(struct lttng_event *ev, struct ltt_kernel_channel *chann
 	}
 
 	event->fd = ret;
-	event->enabled = 1;
 	/* Prevent fd duplication after execlp() */
 	ret = fcntl(event->fd, F_SETFD, FD_CLOEXEC);
 	if (ret < 0) {
@@ -160,6 +159,31 @@ error:
 	return -1;
 }
 
+/*
+ *  kernel_enable_channel
+ *
+ *  Enable a kernel channel.
+ */
+int kernel_enable_channel(struct ltt_kernel_channel *chan)
+{
+	int ret;
+
+	ret = kernctl_enable(chan->fd);
+	if (ret < 0) {
+		perror("enable chan ioctl");
+		ret = errno;
+		goto error;
+	}
+
+	chan->enabled = 1;
+	DBG("Kernel channel %s enabled (fd: %d)", chan->channel->name, chan->fd);
+
+	return 0;
+
+error:
+	return ret;
+}
+
 /*
  *  kernel_enable_event
  *
@@ -181,7 +205,7 @@ int kernel_enable_event(struct ltt_kernel_event *event)
 	return 0;
 
 error:
-	return -1;
+	return ret;
 }
 
 /*
@@ -205,7 +229,7 @@ int kernel_disable_event(struct ltt_kernel_event *event)
 	return 0;
 
 error:
-	return -1;
+	return ret;
 }
 
 /*