[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 11/25] tests/qapi-schema: Prepare for simple union UserDefListU
From: |
Markus Armbruster |
Subject: |
[PULL v2 11/25] tests/qapi-schema: Prepare for simple union UserDefListUnion removal |
Date: |
Mon, 27 Sep 2021 15:06:33 +0200 |
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>
---
tests/qapi-schema/qapi-schema-test.json | 16 ++++++++++++++++
tests/qapi-schema/qapi-schema-test.out | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
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
--
2.31.1
- [PULL v2 00/25] QAPI patches patches for 2021-09-25, Markus Armbruster, 2021/09/27
- [PULL v2 04/25] qapi: Convert simple union InputEvent to flat one, Markus Armbruster, 2021/09/27
- [PULL v2 09/25] qapi: Convert simple union ImageInfoSpecific to flat one, Markus Armbruster, 2021/09/27
- [PULL v2 11/25] tests/qapi-schema: Prepare for simple union UserDefListUnion removal,
Markus Armbruster <=
- [PULL v2 16/25] tests/qapi-schema: Simple union UserDefListUnion is now unused, drop, Markus Armbruster, 2021/09/27
- [PULL v2 19/25] tests/qapi-schema: Drop simple union __org.qemu_x-Union1, Markus Armbruster, 2021/09/27
- [PULL v2 05/25] qapi: Convert simple union TpmTypeOptions to flat one, Markus Armbruster, 2021/09/27
- [PULL v2 14/25] test-clone-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/27
- [PULL v2 17/25] tests/qapi-schema: Rewrite simple union TestIfUnion to be flat, Markus Armbruster, 2021/09/27
- [PULL v2 08/25] qapi: Convert simple union SocketAddressLegacy to flat one, Markus Armbruster, 2021/09/27
- [PULL v2 07/25] qapi: Convert simple union ChardevBackend to flat one, Markus Armbruster, 2021/09/27
- [PULL v2 03/25] qapi: Convert simple union KeyValue to flat one, Markus Armbruster, 2021/09/27
- [PULL v2 02/25] qapi: Stop enforcing "type name should not end in 'Kind', Markus Armbruster, 2021/09/27
- [PULL v2 10/25] qapi: Convert simple union TransactionAction to flat one, Markus Armbruster, 2021/09/27