The following changes since commit d8ae530ec00368d4adfb996b5ef6c74cb4460504:
Merge remote-tracking branch 'remotes/philmd/tags/mips-20210825' into staging (2021-08-25 21:09:48 +0100) are available in the Git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2021-08-26 for you to fetch changes up to 8a9f1e1d9cc55f5eb0946cbf8fd1ef9a0e7d3dac: qapi: make 'if' condition strings simple identifiers (2021-08-26 13:53:56 +0200) ---------------------------------------------------------------- QAPI patches patches for 2021-08-26 ---------------------------------------------------------------- Marc-André Lureau (10): docs: update the documentation upfront about schema configuration qapi: wrap Sequence[str] in an object qapi: add QAPISchemaIfCond.is_present() qapi: introduce QAPISchemaIfCond.cgen() qapidoc: introduce QAPISchemaIfCond.docgen() qapi: replace if condition list with dict {'all': [...]} qapi: add 'any' condition qapi: Use 'if': { 'any': ... } where appropriate qapi: add 'not' condition operation qapi: make 'if' condition strings simple identifiers Markus Armbruster (1): qapi: Fix crash on redefinition with a different condition docs/devel/qapi-code-gen.rst | 30 ++++--- docs/sphinx/qapidoc.py | 22 ++--- qapi/block-core.json | 34 ++++---- qapi/block-export.json | 6 +- qapi/char.json | 12 +-- qapi/machine-target.json | 28 +++++-- qapi/migration.json | 10 +-- qapi/misc-target.json | 40 +++++---- qapi/qom.json | 10 +-- qapi/sockets.json | 6 +- qapi/tpm.json | 18 ++--- qapi/ui.json | 66 +++++++-------- qga/qapi-schema.json | 8 +- tests/unit/test-qmp-cmds.c | 1 + scripts/qapi/commands.py | 4 +- scripts/qapi/common.py | 59 +++++++++++--- scripts/qapi/events.py | 5 +- scripts/qapi/expr.py | 67 +++++++++------- scripts/qapi/gen.py | 14 ++-- scripts/qapi/introspect.py | 30 +++---- scripts/qapi/schema.py | 98 +++++++++++++++-------- scripts/qapi/types.py | 33 ++++---- scripts/qapi/visit.py | 23 +++--- tests/qapi-schema/alternate-branch-if-invalid.err | 2 +- tests/qapi-schema/bad-if-all.err | 2 + tests/qapi-schema/bad-if-all.json | 3 + tests/qapi-schema/bad-if-all.out | 0 tests/qapi-schema/bad-if-empty-list.json | 2 +- tests/qapi-schema/bad-if-empty.err | 2 +- tests/qapi-schema/bad-if-key.err | 3 + tests/qapi-schema/bad-if-key.json | 3 + tests/qapi-schema/bad-if-key.out | 0 tests/qapi-schema/bad-if-keys.err | 2 + tests/qapi-schema/bad-if-keys.json | 3 + tests/qapi-schema/bad-if-keys.out | 0 tests/qapi-schema/bad-if-list.err | 2 +- tests/qapi-schema/bad-if-list.json | 2 +- tests/qapi-schema/bad-if.err | 2 +- tests/qapi-schema/bad-if.json | 2 +- tests/qapi-schema/doc-good.json | 16 ++-- tests/qapi-schema/doc-good.out | 14 ++-- tests/qapi-schema/doc-good.txt | 21 ++++- tests/qapi-schema/enum-if-invalid.err | 3 +- tests/qapi-schema/features-if-invalid.err | 2 +- tests/qapi-schema/features-missing-name.json | 2 +- tests/qapi-schema/meson.build | 3 + tests/qapi-schema/qapi-schema-test.json | 59 ++++++++------ tests/qapi-schema/qapi-schema-test.out | 63 ++++++++------- tests/qapi-schema/redefined-event.json | 2 +- tests/qapi-schema/struct-member-if-invalid.err | 2 +- tests/qapi-schema/test-qapi.py | 4 +- tests/qapi-schema/union-branch-if-invalid.err | 2 +- tests/qapi-schema/union-branch-if-invalid.json | 2 +- 53 files changed, 505 insertions(+), 344 deletions(-) create mode 100644 tests/qapi-schema/bad-if-all.err create mode 100644 tests/qapi-schema/bad-if-all.json create mode 100644 tests/qapi-schema/bad-if-all.out create mode 100644 tests/qapi-schema/bad-if-key.err create mode 100644 tests/qapi-schema/bad-if-key.json create mode 100644 tests/qapi-schema/bad-if-key.out create mode 100644 tests/qapi-schema/bad-if-keys.err create mode 100644 tests/qapi-schema/bad-if-keys.json create mode 100644 tests/qapi-schema/bad-if-keys.out -- 2.31.1