X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.c;h=285c73bce87b6d5681787562469462c4d10eed7d;hb=c991463eb37dbbcf53c390a8db52125621153c69;hp=ff937089b7e89618eb62f81ae8146223f43e2ba7;hpb=9e46f0b8ab12cd29d07ef0f6e46989790cebb511;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index ff937089..285c73bc 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -325,7 +325,7 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan,
 		event->desc = lttng_event_get(event_param->name);
 		if (!event->desc)
 			goto register_error;
-		ret = kabi_2635_tracepoint_probe_register(event_param->name,
+		ret = kabi_2635_tracepoint_probe_register(event->desc->kname,
 				event->desc->probe_callback,
 				event);
 		if (ret)
@@ -401,6 +401,7 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan,
 		break;
 	default:
 		WARN_ON_ONCE(1);
+		goto register_error;
 	}
 	ret = _lttng_event_metadata_statedump(chan->session, chan, event);
 	if (ret)
@@ -719,7 +720,7 @@ int _lttng_event_metadata_statedump(struct lttng_session *session,
 
 	ret = lttng_metadata_printf(session,
 		"event {\n"
-		"	name = %s;\n"
+		"	name = \"%s\";\n"
 		"	id = %u;\n"
 		"	stream_id = %u;\n",
 		event->desc->name,