X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=b997a4aeab6b7ac0aac7208fa82bacd6e964ce28;hb=49ceaa707d6fd92526e6afb4beeca7bb77409fe2;hp=faf35cc7fc8f8a42c927325a15a161bd69215148;hpb=15dc512ac8cf2f59c8779f442f116a23975c950c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index faf35cc7f..b997a4aea 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -37,7 +37,7 @@
  * Add context on a kernel channel.
  */
 int kernel_add_channel_context(struct ltt_kernel_channel *chan,
-		struct lttng_kernel_context *ctx)
+		struct ltt_kernel_context *ctx)
 {
 	int ret;
 
@@ -45,7 +45,7 @@ int kernel_add_channel_context(struct ltt_kernel_channel *chan,
 	assert(ctx);
 
 	DBG("Adding context to channel %s", chan->channel->name);
-	ret = kernctl_add_context(chan->fd, ctx);
+	ret = kernctl_add_context(chan->fd, &ctx->ctx);
 	if (ret < 0) {
 		if (errno != EEXIST) {
 			PERROR("add context ioctl");
@@ -56,13 +56,7 @@ int kernel_add_channel_context(struct ltt_kernel_channel *chan,
 		goto error;
 	}
 
-	chan->ctx = zmalloc(sizeof(struct lttng_kernel_context));
-	if (chan->ctx == NULL) {
-		PERROR("zmalloc event context");
-		goto error;
-	}
-
-	memcpy(chan->ctx, ctx, sizeof(struct lttng_kernel_context));
+	cds_list_add_tail(&ctx->list, &chan->ctx_list);
 
 	return 0;
 
@@ -201,6 +195,9 @@ int kernel_create_event(struct lttng_event *ev,
 		case ENOSYS:
 			WARN("Event type not implemented");
 			break;
+		case ENOENT:
+			WARN("Event %s not found!", ev->name);
+			break;
 		default:
 			PERROR("create event ioctl");
 		}