X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fust-variant%2Fust-variant.c;h=9a449fd4ed1f22b0c999c26598a017f5157cfb1a;hb=218deb69baab;hp=9079c26ffd4ca82e12df12909eb529bf78f56025;hpb=fb31eb73d8a4a6d9784ed5c335b7fa3b9684108c;p=lttng-ust.git

diff --git a/tests/ust-variant/ust-variant.c b/tests/ust-variant/ust-variant.c
index 9079c26f..9a449fd4 100644
--- a/tests/ust-variant/ust-variant.c
+++ b/tests/ust-variant/ust-variant.c
@@ -128,23 +128,18 @@ static void __event_probe__myprobe___myevent(void * __tp_data)
 static const struct lttng_event_field myfields[] = {
 	[0] = {
 		.name = "mytag",
-		.type.atype = atype_enum,
-		.type.u.basic.enumeration.desc = &myenum_desc,
-		.type.u.basic.enumeration.container_type = {
-			.size = sizeof(char) * CHAR_BIT,
-			.alignment = lttng_alignof(char) * CHAR_BIT,
-			.signedness = lttng_is_signed_type(char),
-			.reverse_byte_order = 0,
-			.base = 10,
-			.encoding = lttng_encode_none,
-		},
+		.type.atype = atype_enum_nestable,
+		.type.u.enum_nestable.desc = &myenum_desc,
+		.type.u.enum_nestable.container_type =
+			__LTTNG_COMPOUND_LITERAL(struct lttng_type,
+					__type_integer(char, BYTE_ORDER, 10, none)),
 		.nowrite = 0,
 	},
 	[1] = {
 		.name = "myfield",
 		.type = {
-			.atype = atype_variant,
-			.u.variant = &myvariant,
+			.atype = atype_variant_nestable,
+			.u.variant_nestable = &myvariant,
 		},
 		.nowrite = 0,
 	},