X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ltt-sessiond%2Ftrace.c;h=b6138f8f5837ea61b9e9e2fc31d7a2242e81c97e;hb=fffd054738fa5f42c2c19a2c5bb163dbd529c6a3;hp=e0aeac685e28a312b71fc773fa4ab05ca3eccb89;hpb=e6ddca715d6dedb6ee25fe4392a6e1f9626b2544;p=lttng-tools.git

diff --git a/ltt-sessiond/trace.c b/ltt-sessiond/trace.c
index e0aeac685..b6138f8f5 100644
--- a/ltt-sessiond/trace.c
+++ b/ltt-sessiond/trace.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -139,6 +139,7 @@ struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *cha
 	lkc->fd = 0;
 	lkc->stream_count = 0;
 	lkc->enabled = 1;
+	lkc->ctx = NULL;
 	/* Init linked list */
 	CDS_INIT_LIST_HEAD(&lkc->events_list.head);
 	CDS_INIT_LIST_HEAD(&lkc->stream_list.head);
@@ -175,12 +176,12 @@ struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev)
 	}
 
 	switch (ev->type) {
-	case LTTNG_EVENT_KPROBE:
+	case LTTNG_EVENT_PROBE:
 		attr->instrumentation = LTTNG_KERNEL_KPROBE;
-		attr->u.kprobe.addr = ev->attr.kprobe.addr;
-		attr->u.kprobe.offset = ev->attr.kprobe.offset;
+		attr->u.kprobe.addr = ev->attr.probe.addr;
+		attr->u.kprobe.offset = ev->attr.probe.offset;
 		strncpy(attr->u.kprobe.symbol_name,
-				ev->attr.kprobe.symbol_name, LTTNG_SYM_NAME_LEN);
+				ev->attr.probe.symbol_name, LTTNG_SYM_NAME_LEN);
 		break;
 	case LTTNG_EVENT_FUNCTION:
 		attr->instrumentation = LTTNG_KERNEL_FUNCTION;
@@ -202,6 +203,7 @@ struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev)
 	lke->fd = 0;
 	lke->event = attr;
 	lke->enabled = 1;
+	lke->ctx = NULL;
 
 	return lke;