motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 04:13:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi: Report invalid '*' prefix like any other invalid name

Browse source 
The special "does not allow optional name" error is well meant, but
confusing in practice.  Drop it.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190927134639.4284-12-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2019-09-27 15:46:24 +02:00
parent 6ba1ba7f0e
commit 64e04f7149
5 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/qapi/common.py
View file

@ -724,11 +724,8 @@ def check_name_str(name, info, source,
global valid_name
membername = name
if name.startswith('*'):
if allow_optional and name.startswith('*'):
membername = name[1:]
if not allow_optional:
raise QAPISemError(info, "%s does not allow optional name '%s'"
% (source, name))
# Enum members can start with a digit, because the generated C
# code always prefixes it with the enum name
if enum_member and membername[0].isdigit():
@ -741,6 +738,7 @@ def check_name_str(name, info, source,
if not permit_upper and name.lower() != name:
raise QAPISemError(
info, "%s uses uppercase in name '%s'" % (source, name))
assert not membername.startswith('*')
def add_name(name, info, meta):