aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2021-04-21 14:20:29 -0400
committerMarkus Armbruster <armbru@redhat.com>2021-04-30 12:59:54 +0200
commit79e4fd14fb0f9e145413c6813dc541fdb50e3923 (patch)
treeab7a4d4f2742687915b3b98980e23db3716735a1 /scripts
parent328e8ca71abb9be7084ba16baad2a770c4e32d92 (diff)
downloadqemu-79e4fd14fb0f9e145413c6813dc541fdb50e3923.zip
qemu-79e4fd14fb0f9e145413c6813dc541fdb50e3923.tar.gz
qemu-79e4fd14fb0f9e145413c6813dc541fdb50e3923.tar.bz2
qapi/expr: Only explicitly prohibit 'Kind' nor 'List' for type names
Per list review: qapi-code-gen.txt reserves suffixes Kind and List only for type names, but the code rejects them for events and commands, too. It turns out we reject them earlier anyway: In check_name_upper() for event names, and in check_name_lower() for command names. Still, adjust the code for clarity over what precisely we are guarding against. Signed-off-by: John Snow <jsnow@redhat.com> Message-Id: <20210421182032.3521476-15-jsnow@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/qapi/expr.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index 5e4d5f8..c33caf0 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -95,9 +95,9 @@ def check_defn_name_str(name: str, info: QAPISourceInfo, meta: str) -> None:
permit_underscore=name in info.pragma.command_name_exceptions)
else:
check_name_camel(name, info, meta)
- if name.endswith('Kind') or name.endswith('List'):
- raise QAPISemError(
- info, "%s name should not end in '%s'" % (meta, name[-4:]))
+ if name.endswith('Kind') or name.endswith('List'):
+ raise QAPISemError(
+ info, "%s name should not end in '%s'" % (meta, name[-4:]))
def check_keys(value: _JSONObject,