diff options
| author | Markus Armbruster <armbru@redhat.com> | 2021-09-17 16:31:22 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2021-09-27 08:23:25 +0200 |
| commit | dffd8ff9e6ab7efff941966ecc5d0b9a65f61e51 (patch) | |
| tree | f4627d82141cdf3165f1128d4b8b417091807f7f | |
| parent | 277b51fc018eea4432870fca1bac7f6468c4314c (diff) | |
| download | qemu-dffd8ff9e6ab7efff941966ecc5d0b9a65f61e51.zip | |
tests/qapi-schema: Prepare for simple union UserDefListUnion removal
Simple unions predate flat unions. Having both complicates the QAPI
schema language and the QAPI generator. We haven't been using simple
unions in new code for a long time, because they are less flexible and
somewhat awkward on the wire.
To prepare for their removal, simple union UserDefListUnion has to go.
It is used to cover arrays. The next few commits will eliminate its
uses, and then it gets deleted. As a first step, provide struct
ArrayStruct for the tests to be rewritten.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210917143134.412106-12-armbru@redhat.com>
| -rw-r--r-- | tests/qapi-schema/qapi-schema-test.json | 16 | ||||
| -rw-r--r-- | tests/qapi-schema/qapi-schema-test.out | 16 |
2 files changed, 32 insertions, 0 deletions
diff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json index 3c43e14e22..b2d795cb19 100644 --- a/tests/qapi-schema/qapi-schema-test.json +++ b/tests/qapi-schema/qapi-schema-test.json @@ -140,6 +140,22 @@ 'sizes': ['size'], 'any': ['any'], 'user': ['Status'] } } # intentional forward ref. to sub-module +{ 'struct': 'ArrayStruct', + 'data': { 'integer': ['int'], + 's8': ['int8'], + 's16': ['int16'], + 's32': ['int32'], + 's64': ['int64'], + 'u8': ['uint8'], + 'u16': ['uint16'], + 'u32': ['uint32'], + 'u64': ['uint64'], + 'number': ['number'], + 'boolean': ['bool'], + 'string': ['str'], + '*sz': ['size'], + '*any': ['any'], + '*user': ['Status'] } } # intentional forward ref. to sub-module # for testing sub-modules { 'include': 'include/sub-module.json' } diff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qapi-schema-test.out index d557fe2d89..7a488c1d06 100644 --- a/tests/qapi-schema/qapi-schema-test.out +++ b/tests/qapi-schema/qapi-schema-test.out @@ -189,6 +189,22 @@ object UserDefListUnion case sizes: q_obj_sizeList-wrapper case any: q_obj_anyList-wrapper case user: q_obj_StatusList-wrapper +object ArrayStruct + member integer: intList optional=False + member s8: int8List optional=False + member s16: int16List optional=False + member s32: int32List optional=False + member s64: int64List optional=False + member u8: uint8List optional=False + member u16: uint16List optional=False + member u32: uint32List optional=False + member u64: uint64List optional=False + member number: numberList optional=False + member boolean: boolList optional=False + member string: strList optional=False + member sz: sizeList optional=True + member any: anyList optional=True + member user: StatusList optional=True include include/sub-module.json command user-def-cmd None -> None gen=True success_response=True boxed=False oob=False preconfig=False |