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

qapi: Clean up member name case checking

Browse source 
QAPISchemaMember.check_clash() checks for member names that map to the
same c_name().  Takes care of rejecting duplicate names.

It also checks a naming rule: no uppercase in member names.  That's a
rather odd place to do it.  Enforcing naming rules is
check_name_str()'s job.

qapi-code-gen.txt specifies the name case rule applies to the name as
it appears in the schema.  check_clash() checks c_name(name) instead.
No difference, as c_name() leaves alone case, but unclean.

Move the name case check into check_name_str(), less the c_name().
New argument @permit_upper suppresses it.  Pass permit_upper=True for
definitions (which are not members), and when the member's owner is
whitelisted with pragma name-case-whitelist.

Bonus: name-case-whitelist now applies to a union's inline base, too.
Update qapi/qapi-schema.json pragma to whitelist union CpuInfo instead
of CpuInfo's implicit base type's name q_obj_CpuInfo-base.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190927134639.4284-6-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2019-09-27 15:46:18 +02:00
parent 7be6c51194
commit 638c4af931
7 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/qapi-schema/args-member-case.err
View file

@ -1,2 +1,2 @@
tests/qapi-schema/args-member-case.json: In command 'no-way-this-will-get-whitelisted':
tests/qapi-schema/args-member-case.json:2: 'Arg' (parameter of no-way-this-will-get-whitelisted) should not use uppercase
tests/qapi-schema/args-member-case.json:2: Member of 'data' for command 'no-way-this-will-get-whitelisted' uses uppercase in name 'Arg'

2
tests/qapi-schema/args-member-case.json
View file

@ -1,2 +1,2 @@
# Member names should be 'lower-case' unless the struct/command is whitelisted
# Member names should be 'lower-case' unless the struct is whitelisted
{ 'command': 'no-way-this-will-get-whitelisted', 'data': { 'Arg': 'int' } }

2
tests/qapi-schema/enum-member-case.err
View file

@ -1,2 +1,2 @@
tests/qapi-schema/enum-member-case.json: In enum 'NoWayThisWillGetWhitelisted':
tests/qapi-schema/enum-member-case.json:4: 'Value' (value of NoWayThisWillGetWhitelisted) should not use uppercase
tests/qapi-schema/enum-member-case.json:4: Member of enum 'NoWayThisWillGetWhitelisted' uses uppercase in name 'Value'

4
tests/qapi-schema/union-branch-case.err
View file

@ -1,2 +1,2 @@
tests/qapi-schema/union-branch-case.json: In union 'NoWayThisWillGetWhitelisted':
tests/qapi-schema/union-branch-case.json:2: 'Branch' (branch of NoWayThisWillGetWhitelisted) should not use uppercase
tests/qapi-schema/union-branch-case.json: In union 'Uni':
tests/qapi-schema/union-branch-case.json:2: Member of union 'Uni' uses uppercase in name 'Branch'

4
tests/qapi-schema/union-branch-case.json
View file

@ -1,2 +1,2 @@
# Branch names should be 'lower-case' unless the union is whitelisted
{ 'union': 'NoWayThisWillGetWhitelisted', 'data': { 'Branch': 'int' } }
# Branch names should be 'lower-case'
{ 'union': 'Uni', 'data': { 'Branch': 'int' } }