The following changes since commit 327ec8d6c2a2223b78d311153a471036e474c5c5:
Merge tag 'pull-tcg-20230423' of https://gitlab.com/rth7680/qemu into staging (2023-04-23 11:20:37 +0100) are available in the Git repository at: https://repo.or.cz/qemu/armbru.git tags/pull-qapi-2023-04-26 for you to fetch changes up to a17dbc4b79a28ffb9511f192474ffefd88214cde: qapi: allow unions to contain further unions (2023-04-26 07:52:45 +0200) ---------------------------------------------------------------- QAPI patches patches for 2023-04-26 ---------------------------------------------------------------- Daniel P. Berrangé (2): qapi: support updating expected test output via make qapi: allow unions to contain further unions Markus Armbruster (15): qapi: Fix error message format regression qapi/schema: Use super() qapi: Clean up after removal of simple unions qapi: Split up check_type() qapi: Improve error message for unexpected array types qapi: Simplify code a bit after previous commits qapi: Fix error message when type name or array is expected qapi: Fix to reject 'data': 'mumble' in struct tests/qapi-schema: Improve union discriminator coverage tests/qapi-schema: Rename a few conditionals tests/qapi-schema: Clean up positive test for conditionals tests/qapi-schema: Cover optional conditional struct member qapi: Fix code generated for optional conditional struct member qapi: Require boxed for conditional command and event arguments qapi: Improve specificity of type/member descriptions docs/devel/qapi-code-gen.rst | 5 +- tests/unit/test-qobject-input-visitor.c | 47 +++++++++ tests/unit/test-qobject-output-visitor.c | 58 +++++++++++ scripts/qapi/commands.py | 1 + scripts/qapi/expr.py | 115 +++++++++++---------- scripts/qapi/gen.py | 1 + scripts/qapi/main.py | 2 +- scripts/qapi/schema.py | 31 ++++-- scripts/qapi/visit.py | 2 + tests/qapi-schema/args-if-implicit.err | 2 + tests/qapi-schema/args-if-implicit.json | 4 + tests/qapi-schema/args-if-implicit.out | 0 tests/qapi-schema/args-if-unboxed.err | 2 + tests/qapi-schema/args-if-unboxed.json | 6 ++ tests/qapi-schema/args-if-unboxed.out | 0 tests/qapi-schema/bad-data.err | 2 +- tests/qapi-schema/event-args-if-unboxed.err | 2 + tests/qapi-schema/event-args-if-unboxed.json | 4 + tests/qapi-schema/event-args-if-unboxed.out | 0 tests/qapi-schema/event-nest-struct.err | 2 +- tests/qapi-schema/meson.build | 5 + tests/qapi-schema/nested-struct-data.err | 2 +- tests/qapi-schema/qapi-schema-test.json | 52 ++++++++-- tests/qapi-schema/qapi-schema-test.out | 61 +++++++---- tests/qapi-schema/returns-dict.err | 2 +- tests/qapi-schema/struct-data-typename.err | 2 + tests/qapi-schema/struct-data-typename.json | 2 + tests/qapi-schema/struct-data-typename.out | 0 tests/qapi-schema/struct-member-invalid.err | 2 +- tests/qapi-schema/test-qapi.py | 1 + tests/qapi-schema/union-array-branch.err | 2 +- tests/qapi-schema/union-invalid-discriminator.err | 2 +- tests/qapi-schema/union-invalid-discriminator.json | 4 +- tests/qapi-schema/union-invalid-union-subfield.err | 2 + .../qapi-schema/union-invalid-union-subfield.json | 30 ++++++ tests/qapi-schema/union-invalid-union-subfield.out | 0 tests/qapi-schema/union-invalid-union-subtype.err | 2 + tests/qapi-schema/union-invalid-union-subtype.json | 29 ++++++ tests/qapi-schema/union-invalid-union-subtype.out | 0 39 files changed, 383 insertions(+), 103 deletions(-) create mode 100644 tests/qapi-schema/args-if-implicit.err create mode 100644 tests/qapi-schema/args-if-implicit.json create mode 100644 tests/qapi-schema/args-if-implicit.out create mode 100644 tests/qapi-schema/args-if-unboxed.err create mode 100644 tests/qapi-schema/args-if-unboxed.json create mode 100644 tests/qapi-schema/args-if-unboxed.out create mode 100644 tests/qapi-schema/event-args-if-unboxed.err create mode 100644 tests/qapi-schema/event-args-if-unboxed.json create mode 100644 tests/qapi-schema/event-args-if-unboxed.out create mode 100644 tests/qapi-schema/struct-data-typename.err create mode 100644 tests/qapi-schema/struct-data-typename.json create mode 100644 tests/qapi-schema/struct-data-typename.out create mode 100644 tests/qapi-schema/union-invalid-union-subfield.err create mode 100644 tests/qapi-schema/union-invalid-union-subfield.json create mode 100644 tests/qapi-schema/union-invalid-union-subfield.out create mode 100644 tests/qapi-schema/union-invalid-union-subtype.err create mode 100644 tests/qapi-schema/union-invalid-union-subtype.json create mode 100644 tests/qapi-schema/union-invalid-union-subtype.out -- 2.39.2
