aboutsummaryrefslogtreecommitdiff
path: root/tests/qapi-schema/alternate-empty.json
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2016-02-17 23:48:16 -0700
committerMarkus Armbruster <armbru@redhat.com>2016-02-19 11:08:56 +0100
commit02a57ae32b08e8981b59979b80e682c9a153e94d (patch)
tree418d1597e1ea5ff8e3f119fe453e990746299fe3 /tests/qapi-schema/alternate-empty.json
parentf96493b1ab14e307495119064c32765f436b349c (diff)
qapi: Forbid empty unions and useless alternates
Empty unions serve no purpose, and while we compile with gcc which permits them, strict C99 forbids them. We happen to inject a dummy 'void *data' member into the C unions that represent QAPI unions and alternates, but we want to get rid of that member (it pollutes the namespace for no good reason), which would leave us with an empty union if the user didn't provide any branches. While empty structs make sense in QAPI, empty unions don't add any expressiveness to the QMP language. So prohibit them at parse time. Update the documentation and testsuite to match. Note that the documentation already mentioned that alternates should have "two or more JSON data types"; so this also fixes the code to enforce that. However, we have existing uses of a union type with only one branch, so the 2-or-more strictness is intentionally limited to alternates. Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <1455778109-6278-3-git-send-email-eblake@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests/qapi-schema/alternate-empty.json')
-rw-r--r--tests/qapi-schema/alternate-empty.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qapi-schema/alternate-empty.json b/tests/qapi-schema/alternate-empty.json
index db3820f841..fff15baf16 100644
--- a/tests/qapi-schema/alternate-empty.json
+++ b/tests/qapi-schema/alternate-empty.json
@@ -1,2 +1,2 @@
-# FIXME - alternates should list at least two types to be useful
+# alternates must list at least two types to be useful
{ 'alternate': 'Alt', 'data': { 'i': 'int' } }