Revert "Fix: ustcomm: serialize variant_nestable type"

lttng-sessiond does not expect the variant_nestable type when generating
UST metadata. This fix only belongs to the master branch, not to a
stable branch.

This reverts commit 0b7bf25dd97168c3410e5601280637c0f64928ef.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I0f000b01b7bf24eadd3cea9480d84065a0a72c26

diff --git a/src/common/ustcomm.c b/src/common/ustcomm.c
index 6afa903d87112a8dd4c2663a9879a9a0649c53ab..2c1836092e0968be1a99192060857c27000cb2ff 100644 (file)
--- a/src/common/ustcomm.c
+++ b/src/common/ustcomm.c
@@ -998,7 +998,7 @@ int serialize_dynamic_type(struct lttng_ust_session *session,
 
        strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN);
        uf->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0';
-       uf->type.atype = lttng_ust_ctl_atype_variant_nestable;
+       uf->type.atype = lttng_ust_ctl_atype_variant;
        uf->type.u.variant_nestable.nr_choices = nr_choices;
        strncpy(uf->type.u.variant_nestable.tag_name,
                tag_field_name,