mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-23 19:03:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

qapi-schema: support alternates with array type

Browse Source 
Detect array types as alternate branches, and turn the JSON list into
a QAPISchemaArrayType.  Array types in an alternate are represented with
QTYPE_QLIST in the type field.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220321164243.200569-2-pbonzini@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Paolo Bonzini 2022-03-21 17:42:41 +01:00 committed by Markus Armbruster
parent 9c125d17e9
commit a58069494d
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/qapi/expr.py
View File

@ -554,7 +554,7 @@ def check_alternate(expr: _JSONObject, info: QAPISourceInfo) -> None:
check_name_lower(key, info, source) check_name_lower(key, info, source)
check_keys(value, info, source, ['type'], ['if']) check_keys(value, info, source, ['type'], ['if'])
check_if(value, info, source) check_if(value, info, source)
check_type(value['type'], info, source) check_type(value['type'], info, source, allow_array=True)
def check_command(expr: _JSONObject, info: QAPISourceInfo) -> None: def check_command(expr: _JSONObject, info: QAPISourceInfo) -> None:

4
scripts/qapi/schema.py
View File

@ -243,6 +243,7 @@ class QAPISchemaType(QAPISchemaEntity):
'number': 'QTYPE_QNUM', 'number': 'QTYPE_QNUM',
'int': 'QTYPE_QNUM', 'int': 'QTYPE_QNUM',
'boolean': 'QTYPE_QBOOL', 'boolean': 'QTYPE_QBOOL',
'array': 'QTYPE_QLIST',
'object': 'QTYPE_QDICT' 'object': 'QTYPE_QDICT'
} }
return json2qtype.get(self.json_type()) return json2qtype.get(self.json_type())
@ -1069,6 +1070,9 @@ class QAPISchema:
None)) None))
def _make_variant(self, case, typ, ifcond, info): def _make_variant(self, case, typ, ifcond, info):
if isinstance(typ, list):
assert len(typ) == 1
typ = self._make_array_type(typ[0], info)
return QAPISchemaVariant(case, info, typ, ifcond) return QAPISchemaVariant(case, info, typ, ifcond)
def _def_union_type(self, expr, info, doc): def _def_union_type(self, expr, info, doc):

2
tests/qapi-schema/alternate-array.err
View File

@ -1,2 +0,0 @@
alternate-array.json: In alternate 'Alt':
alternate-array.json:5: 'data' member 'two' cannot be an array

2
tests/qapi-schema/alternate-array.json
View File

@ -1,5 +1,3 @@
# we do not allow array branches in alternates
# TODO: should we support this?
{ 'struct': 'One', { 'struct': 'One',
'data': { 'name': 'str' } } 'data': { 'name': 'str' } }
{ 'alternate': 'Alt', { 'alternate': 'Alt',

18
tests/qapi-schema/alternate-array.out
View File

@ -0,0 +1,18 @@
module ./builtin
object q_empty
enum QType
prefix QTYPE
member none
member qnull
member qnum
member qstring
member qdict
member qlist
member qbool
module alternate-array.json
object One
member name: str optional=False
alternate Alt
tag type
case one: One
case two: intList