From: John Snow Date: Wed, 21 Apr 2021 18:20:29 +0000 (-0400) Subject: qapi/expr: Only explicitly prohibit 'Kind' nor 'List' for type names X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=79e4fd14fb0f9e145413c6813dc541fdb50e3923;p=qemu.git 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 Message-Id: <20210421182032.3521476-15-jsnow@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py index 5e4d5f80aa..c33caf00d9 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,