summaryrefslogtreecommitdiffstats
path: root/tests/qapi-schema/reserved-command-q.exit
diff options
context:
space:
mode:
authorEric Blake2015-10-26 23:34:44 +0100
committerMarkus Armbruster2015-11-02 08:30:26 +0100
commit9fb081e0b98409556d023c7193eeb68947cd1211 (patch)
treec19eeaa3eed47ee66a97a4c14a421c61e2055ff6 /tests/qapi-schema/reserved-command-q.exit
parentqapi: Reserve '*List' type names for list types (diff)
downloadqemu-9fb081e0b98409556d023c7193eeb68947cd1211.tar.gz
qemu-9fb081e0b98409556d023c7193eeb68947cd1211.tar.xz
qemu-9fb081e0b98409556d023c7193eeb68947cd1211.zip
qapi: Reserve 'q_*' and 'has_*' member names
c_name() produces names starting with 'q_' when protecting a dictionary member name that would fail to directly compile, but in doing so can cause clashes with any member name already beginning with 'q-' or 'q_'. Likewise, we create a C name 'has_' for any optional member that can clash with any member name beginning with 'has-' or 'has_'. Technically, rather than blindly reserving the namespace, we could try to complain about user names only when an actual collision occurs, or even teach c_name() how to munge names to avoid collisions. But it is not trivial, especially when collisions can occur across multiple types (such as via inheritance or flat unions). Besides, no existing .json files are trying to use these names. So it's easier to just outright forbid the potential for collision. We can always relax things in the future if a real need arises for QMP to express member names that have been forbidden here. 'has_' only has to be reserved for struct/union member names, while 'q_' is reserved everywhere (matching the fact that only members can be optional, while we use c_name() for munging both members and entities). Note that we could relax 'q_' restrictions on entities independently from member names; for example, c_name('qmp_' + 'unix') would result in a different function name than our current 'qmp_' + c_name('unix'). Update and add tests to cover the new error messages. Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <1445898903-12082-6-git-send-email-eblake@redhat.com> [Consistently pass protect=False to c_name(); commit message tweaked slightly] Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests/qapi-schema/reserved-command-q.exit')
-rw-r--r--tests/qapi-schema/reserved-command-q.exit2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qapi-schema/reserved-command-q.exit b/tests/qapi-schema/reserved-command-q.exit
index 573541ac97..d00491fd7e 100644
--- a/tests/qapi-schema/reserved-command-q.exit
+++ b/tests/qapi-schema/reserved-command-q.exit
@@ -1 +1 @@
-0
+1