diff options
| author | Markus Armbruster <armbru@redhat.com> | 2021-09-17 16:31:26 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2021-09-27 08:23:25 +0200 |
| commit | 1e65e16ca3c7a41d15c8b80f922d68fabc0b96b8 (patch) | |
| tree | 980f1914c91a510ce5a499eef91f54ad54a9cf96 | |
| parent | 16821fc85b078b08f4e6f1cc3d57fb4c00568a25 (diff) | |
| download | focaccia-qemu-1e65e16ca3c7a41d15c8b80f922d68fabc0b96b8.tar.gz focaccia-qemu-1e65e16ca3c7a41d15c8b80f922d68fabc0b96b8.zip | |
tests/qapi-schema: Wean off UserDefListUnion
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> Message-Id: <20210917143134.412106-16-armbru@redhat.com>
| -rw-r--r-- | tests/qapi-schema/qapi-schema-test.json | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/qapi-schema-test.out | 2 | ||||
| -rw-r--r-- | tests/unit/test-qmp-cmds.c | 2 |
3 files changed, 3 insertions, 3 deletions
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 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) { } |