[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/7] tests/qapi-schema: Make test-qapi.py print array
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 1/7] tests/qapi-schema: Make test-qapi.py print arrays |
Date: |
Tue, 5 Mar 2019 17:52:30 +0100 |
The next few commits mess with array types, and having the changes
exposed in output of test-qapi.py will be useful.
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[Rationale added to commit message]
---
tests/qapi-schema/qapi-schema-test.out | 6 ++++++
tests/qapi-schema/test-qapi.py | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index d8aec17115..b59f4ca5a4 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -52,6 +52,9 @@ object UserDefTwo
member dict1: UserDefTwoDict optional=False
object UserDefThree
member string0: str optional=False
+array UserDefOneList UserDefOne
+array UserDefTwoList UserDefTwo
+array TestStructList TestStruct
object ForceArrays
member unused1: UserDefOneList optional=False
member unused2: UserDefTwoList optional=False
@@ -248,6 +251,7 @@ object __org.qemu_x-Union1
member type: __org.qemu_x-Union1Kind optional=False
tag type
case __org.qemu_x-branch: q_obj_str-wrapper
+array __org.qemu_x-Union1List __org.qemu_x-Union1
object __org.qemu_x-Struct2
member array: __org.qemu_x-Union1List optional=False
object __org.qemu_x-Union2
@@ -260,6 +264,8 @@ alternate __org.qemu_x-Alt
case b: __org.qemu_x-Base
event __ORG.QEMU_X-EVENT __org.qemu_x-Struct
boxed=False
+array __org.qemu_x-EnumList __org.qemu_x-Enum
+array __org.qemu_x-StructList __org.qemu_x-Struct
object q_obj___org.qemu_x-command-arg
member a: __org.qemu_x-EnumList optional=False
member b: __org.qemu_x-StructList optional=False
diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py
index d592854601..d21fca01fc 100644
--- a/tests/qapi-schema/test-qapi.py
+++ b/tests/qapi-schema/test-qapi.py
@@ -32,6 +32,12 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor):
self._print_if(m.ifcond, indent=8)
self._print_if(ifcond)
+ def visit_array_type(self, name, info, ifcond, element_type):
+ if not info:
+ return # suppress built-in arrays
+ print('array %s %s' % (name, element_type.name))
+ self._print_if(ifcond)
+
def visit_object_type(self, name, info, ifcond, base, members, variants):
print('object %s' % name)
if base:
--
2.17.2
- [Qemu-devel] [PULL 0/7] QAPI patches for 2019-03-05, Markus Armbruster, 2019/03/05
- [Qemu-devel] [PULL 1/7] tests/qapi-schema: Make test-qapi.py print arrays,
Markus Armbruster <=
- [Qemu-devel] [PULL 6/7] tests/qapi-schema: Cover forward reference to sub-module, Markus Armbruster, 2019/03/05
- [Qemu-devel] [PULL 3/7] qapi: Pass file name to QAPIGen constructor instead of methods, Markus Armbruster, 2019/03/05
- [Qemu-devel] [PULL 2/7] tests/qapi-schema: Cover conditional arrays, Markus Armbruster, 2019/03/05
- [Qemu-devel] [PULL 7/7] qapi: Fix array first used in a different module, Markus Armbruster, 2019/03/05
- [Qemu-devel] [PULL 4/7] qapi: Fix code generation for sub-modules in other directories, Markus Armbruster, 2019/03/05
- [Qemu-devel] [PULL 5/7] tests: Rename UserDefNativeListUnion to UserDefListUnion, Markus Armbruster, 2019/03/05
- Re: [Qemu-devel] [PULL 0/7] QAPI patches for 2019-03-05, Peter Maydell, 2019/03/05