[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 15/23] tests/qapi-schema: Wean off UserDefListUnion
From: |
Markus Armbruster |
Subject: |
[PATCH v2 15/23] tests/qapi-schema: Wean off UserDefListUnion |
Date: |
Fri, 17 Sep 2021 16:31:26 +0200 |
Command boxed-union uses simple union UserDefListUnion to cover
unions. Use UserDefFlatUnion instead.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
tests/unit/test-qmp-cmds.c | 2 +-
tests/qapi-schema/qapi-schema-test.json | 2 +-
tests/qapi-schema/qapi-schema-test.out | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/unit/test-qmp-cmds.c b/tests/unit/test-qmp-cmds.c
index 83efa39720..83c9ef5b7c 100644
--- a/tests/unit/test-qmp-cmds.c
+++ b/tests/unit/test-qmp-cmds.c
@@ -119,7 +119,7 @@ void qmp_boxed_struct(UserDefZero *arg, Error **errp)
{
}
-void qmp_boxed_union(UserDefListUnion *arg, Error **errp)
+void qmp_boxed_union(UserDefFlatUnion *arg, Error **errp)
{
}
diff --git a/tests/qapi-schema/qapi-schema-test.json
b/tests/qapi-schema/qapi-schema-test.json
index b2d795cb19..a4b4405f94 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -175,7 +175,7 @@
'returns': 'int' }
{ 'command': 'guest-sync', 'data': { 'arg': 'any' }, 'returns': 'any' }
{ 'command': 'boxed-struct', 'boxed': true, 'data': 'UserDefZero' }
-{ 'command': 'boxed-union', 'data': 'UserDefListUnion', 'boxed': true }
+{ 'command': 'boxed-union', 'data': 'UserDefFlatUnion', 'boxed': true }
{ 'command': 'boxed-empty', 'boxed': true, 'data': 'Empty1' }
# Smoke test on out-of-band and allow-preconfig-test
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index 7a488c1d06..f120f10616 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -232,7 +232,7 @@ command guest-sync q_obj_guest-sync-arg -> any
gen=True success_response=True boxed=False oob=False preconfig=False
command boxed-struct UserDefZero -> None
gen=True success_response=True boxed=True oob=False preconfig=False
-command boxed-union UserDefListUnion -> None
+command boxed-union UserDefFlatUnion -> None
gen=True success_response=True boxed=True oob=False preconfig=False
command boxed-empty Empty1 -> None
gen=True success_response=True boxed=True oob=False preconfig=False
--
2.31.1
- [PATCH v2 00/23] qapi: Remove simple unions from the schema language, Markus Armbruster, 2021/09/17
- [PATCH v2 09/23] qapi: Convert simple union ImageInfoSpecific to flat one, Markus Armbruster, 2021/09/17
- [PATCH v2 01/23] qapi: Tidy up unusual line breaks, Markus Armbruster, 2021/09/17
- [PATCH v2 06/23] qapi: Convert simple union MemoryDeviceInfo to flat one, Markus Armbruster, 2021/09/17
- [PATCH v2 16/23] tests/qapi-schema: Simple union UserDefListUnion is now unused, drop, Markus Armbruster, 2021/09/17
- [PATCH v2 15/23] tests/qapi-schema: Wean off UserDefListUnion,
Markus Armbruster <=
- [PATCH v2 05/23] qapi: Convert simple union TpmTypeOptions to flat one, Markus Armbruster, 2021/09/17
- [PATCH v2 03/23] qapi: Convert simple union KeyValue to flat one, Markus Armbruster, 2021/09/17
- [PATCH v2 11/23] tests/qapi-schema: Prepare for simple union UserDefListUnion removal, Markus Armbruster, 2021/09/17
- [PATCH v2 07/23] qapi: Convert simple union ChardevBackend to flat one, Markus Armbruster, 2021/09/17
- [PATCH v2 19/23] tests/qapi-schema: Drop simple union __org.qemu_x-Union1, Markus Armbruster, 2021/09/17
- [PATCH v2 23/23] test-clone-visitor: Correct an accidental rename, Markus Armbruster, 2021/09/17
- [PATCH v2 13/23] test-qobject-output-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/17
- [PATCH v2 20/23] tests/qapi-schema: Purge simple unions from tests, Markus Armbruster, 2021/09/17