diff options
| author | Eric Blake <eblake@redhat.com> | 2015-10-26 16:34:53 -0600 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-11-02 08:30:27 +0100 |
| commit | c363acef772647f66becdbf46dd54e70e67f3cc9 (patch) | |
| tree | 2afa1c4aac80bee1fdd3b70cd2e18ccff9ac4c40 /tests/test-qmp-commands.c | |
| parent | 150d0564a4c626642897c748f7906260a13c14e1 (diff) | |
tests: Convert to new qapi union layout
We have two issues with our qapi union layout:
1) Even though the QMP wire format spells the tag 'type', the
C code spells it 'kind', requiring some hacks in the generator.
2) The C struct uses an anonymous union, which places all tag
values in the same namespace as all non-variant members. This
leads to spurious collisions if a tag value matches a non-variant
member's name.
Make the conversion to the new layout for testsuite code.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-15-git-send-email-eblake@redhat.com>
[Commit message tweaked slightly]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests/test-qmp-commands.c')
| -rw-r--r-- | tests/test-qmp-commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c index ea700d890d..f23d8eaf2a 100644 --- a/tests/test-qmp-commands.c +++ b/tests/test-qmp-commands.c @@ -62,8 +62,8 @@ __org_qemu_x_Union1 *qmp___org_qemu_x_command(__org_qemu_x_EnumList *a, { __org_qemu_x_Union1 *ret = g_new0(__org_qemu_x_Union1, 1); - ret->kind = ORG_QEMU_X_UNION1_KIND___ORG_QEMU_X_BRANCH; - ret->__org_qemu_x_branch = strdup("blah1"); + ret->type = ORG_QEMU_X_UNION1_KIND___ORG_QEMU_X_BRANCH; + ret->u.__org_qemu_x_branch = strdup("blah1"); return ret; } |