The following changes since commit 9c125d17e9402c232c46610802e5931b3639d77b:
Merge tag 'pull-tcg-20220420' of https://gitlab.com/rth7680/qemu into staging (2022-04-20 16:43:11 -0700) are available in the Git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2022-04-21 for you to fetch changes up to de7371bc7c39ccacb963acb5129b261087967070: qapi: Fix version of cpu0-id field (2022-04-21 10:23:06 +0200) ---------------------------------------------------------------- QAPI patches patches for 2022-04-21 ---------------------------------------------------------------- Andrea Bolognani (3): docs: qapi: Remove outdated reference to simple unions qapi: Fix documentation for query-xen-replication-status qapi: Fix typo Dov Murik (1): qapi: Fix version of cpu0-id field Paolo Bonzini (3): qapi-schema: support alternates with array type qapi-schema: test: add a qapi-schema-test for array alternates qapi-schema: test: add a unit test for parsing array alternates docs/devel/qapi-code-gen.rst | 4 +-- qapi/migration.json | 2 +- qapi/misc-target.json | 2 +- qapi/sockets.json | 2 +- tests/unit/test-qobject-input-visitor.c | 40 +++++++++++++++++++++++++ scripts/qapi/expr.py | 2 +- scripts/qapi/schema.py | 4 +++ tests/qapi-schema/alternate-array.err | 2 -- tests/qapi-schema/alternate-array.json | 2 -- tests/qapi-schema/alternate-array.out | 18 +++++++++++ tests/qapi-schema/alternate-conflict-lists.err | 2 ++ tests/qapi-schema/alternate-conflict-lists.json | 6 ++++ tests/qapi-schema/alternate-conflict-lists.out | 0 tests/qapi-schema/meson.build | 1 + tests/qapi-schema/qapi-schema-test.json | 1 + tests/qapi-schema/qapi-schema-test.out | 4 +++ 16 files changed, 82 insertions(+), 10 deletions(-) create mode 100644 tests/qapi-schema/alternate-conflict-lists.err create mode 100644 tests/qapi-schema/alternate-conflict-lists.json create mode 100644 tests/qapi-schema/alternate-conflict-lists.out -- 2.35.1