qemu-e2k/tests/qapi-schema/bad-base.json

# we reject a base that is not a struct
{ 'enum': 'Enum', 'data': [ 'a', 'b' ] }
{ 'struct': 'Int', 'data': { 'data': 'int' } }
{ 'struct': 'Str', 'data': { 'data': 'str' } }
{ 'union': 'Union',
  'base': { 'type': 'Enum' },
  'discriminator': 'type',
  'data': { 'a': 'Int', 'b': 'Str' } }
{ 'struct': 'MyType', 'base': 'Union', 'data': { 'c': 'int' } }
qapi: More rigourous checking of types Now that we know every expression is valid with regards to its keys, we can add further tests that those keys refer to valid types. With this patch, all uses of a type (the 'data': of command, type, union, alternate, and event; the 'returns': of command; the 'base': of type and union) must resolve to an appropriate subset of metatypes declared by the current qapi parse; this includes recursing into each member of a data dictionary. Dealing with '**' and nested anonymous structs will be done in later patches. Update the testsuite to match improved output. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> 2015-05-04 17:05:21 +02:00			`# we reject a base that is not a struct`
tests/qapi-schema: Purge simple unions from tests Drop tests that are specifically about simple unions: * SugaredUnion in doc-good: flat unions are covered by @Object. * union-branch-case and union-clash-branches: branch naming for flat unions is enforced for the tag enum instead, which is covered by enum-member-case and enum-clash-member. * union-empty: empty flat unions are covered by flat-union-empty. Rewrite the remainder to use flat unions: args-union, bad-base, flat-union-base-union, union-branch-invalid-dict, union-unknown. Except drop union-optional-branch. because converting this one is not worth the trouble; we don't explicitly check names beginning with '*' in other places, either. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20210917143134.412106-21-armbru@redhat.com> 2021-09-17 16:31:31 +02:00			`{ 'enum': 'Enum', 'data': [ 'a', 'b' ] }`
			`{ 'struct': 'Int', 'data': { 'data': 'int' } }`
			`{ 'struct': 'Str', 'data': { 'data': 'str' } }`
			`{ 'union': 'Union',`
			`'base': { 'type': 'Enum' },`
			`'discriminator': 'type',`
			`'data': { 'a': 'Int', 'b': 'Str' } }`
qapi: Use 'struct' instead of 'type' in schema Referring to "type" as both a meta-type (built-in, enum, union, alternate, or struct) and a specific type (the name that the schema uses for declaring structs) is confusing. Do the bulk of the conversion to "struct" in qapi schema, with a fairly mechanical: for f in `find -name '*.json'; do sed -i "s/'type'/'struct'/"; done followed by manually filtering out the places where we have a 'type' embedded in 'data'. Then tweak a couple of tests whose output changes slightly due to longer lines. I also verified that the generated files for QMP and QGA (such as qmp-commands.h) are the same before and after, as assurance that I didn't leave in any accidental member name changes. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> 2015-05-04 17:05:27 +02:00			`{ 'struct': 'MyType', 'base': 'Union', 'data': { 'c': 'int' } }`