X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Fcommon%2Fmetadata%2Fvisitor-generate-ir.c;h=90074233361cc41c832676e41beca7a26e48b7da;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=a34cbf2619fc69cb6554760273773090515f779e;hpb=7fcdb0a96f75d66f5ff4f32d3ca78d7ca6067e4c;p=babeltrace.git

diff --git a/plugins/ctf/common/metadata/visitor-generate-ir.c b/plugins/ctf/common/metadata/visitor-generate-ir.c
index a34cbf26..90074233 100644
--- a/plugins/ctf/common/metadata/visitor-generate-ir.c
+++ b/plugins/ctf/common/metadata/visitor-generate-ir.c
@@ -36,14 +36,14 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/assert-internal.h>
 #include <glib.h>
 #include <inttypes.h>
 #include <errno.h>
-#include <babeltrace/common-internal.h>
-#include <babeltrace/compat/uuid-internal.h>
-#include <babeltrace/endian-internal.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace2/common-internal.h>
+#include <babeltrace2/compat/uuid-internal.h>
+#include <babeltrace2/endian-internal.h>
+#include <babeltrace2/babeltrace.h>
 
 #include "scanner.h"
 #include "parser.h"
@@ -3204,7 +3204,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node,
 			 * Only read "stream_id" if get_unary_unsigned()
 			 * succeeded.
 			 */
-			if (ret || (!ret && *stream_id < 0)) {
+			if (ret) {
 				_BT_LOGE_NODE(node,
 					"Unexpected unary expression for event class's `stream_id` attribute.");
 				ret = -EINVAL;
@@ -5018,6 +5018,13 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor,
 		goto end;
 	}
 
+	/* Update stream class configuration */
+	ret = ctf_trace_class_update_stream_class_config(ctx->ctf_tc);
+	if (ret) {
+		ret = -EINVAL;
+		goto end;
+	}
+
 	/* Update text arrays and sequences */
 	ret = ctf_trace_class_update_text_array_sequence(ctx->ctf_tc);
 	if (ret) {