The following changes since commit b07cd3e748b3f27a17c27afeee578dc4eedb8dd5:
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-3.0-20180703' into staging (2018-07-03 14:59:27 +0100) are available in the Git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2018-07-03 for you to fetch changes up to 514337c142f9522f6ab89c3d2f964f446ebeb1cd: qapi: add conditions to SPICE type/commands/events on the schema (2018-07-03 18:38:54 +0200) ---------------------------------------------------------------- QAPI patches for 2018-07-03 ---------------------------------------------------------------- Marc-André Lureau (13): qapi: add 'if' to top-level expressions qapi: pass 'if' condition into QAPISchemaEntity objects qapi: leave the ifcond attribute undefined until check() qapi: add 'ifcond' to visitor methods qapi: mcgen() shouldn't indent # lines qapi: add #if/#endif helpers qapi-introspect: modify to_qlit() to append ',' on level > 0 qapi-introspect: add preprocessor conditions to generated QLit qapi/commands: add #if conditions to commands qapi/events: add #if conditions to events qapi: add 'If:' section to generated documentation qapi: add conditions to VNC type/commands/events on the schema qapi: add conditions to SPICE type/commands/events on the schema Markus Armbruster (1): qapi-types: add #if conditions to types & visitors docs/devel/qapi-code-gen.txt | 29 ++++ hmp-commands-info.hx | 2 + hmp.c | 9 +- monitor.c | 3 - qapi/char.json | 8 +- qapi/ui.json | 75 ++++++--- qmp.c | 46 +---- scripts/qapi/commands.py | 26 ++- scripts/qapi/common.py | 280 ++++++++++++++++++++++++------- scripts/qapi/doc.py | 32 ++-- scripts/qapi/events.py | 8 +- scripts/qapi/introspect.py | 47 ++++-- scripts/qapi/types.py | 56 ++++--- scripts/qapi/visit.py | 41 +++-- tests/Makefile.include | 4 + tests/qapi-schema/bad-if-empty-list.err | 1 + tests/qapi-schema/bad-if-empty-list.exit | 1 + tests/qapi-schema/bad-if-empty-list.json | 3 + tests/qapi-schema/bad-if-empty-list.out | 0 tests/qapi-schema/bad-if-empty.err | 1 + tests/qapi-schema/bad-if-empty.exit | 1 + tests/qapi-schema/bad-if-empty.json | 3 + tests/qapi-schema/bad-if-empty.out | 0 tests/qapi-schema/bad-if-list.err | 1 + tests/qapi-schema/bad-if-list.exit | 1 + tests/qapi-schema/bad-if-list.json | 3 + tests/qapi-schema/bad-if-list.out | 0 tests/qapi-schema/bad-if.err | 1 + tests/qapi-schema/bad-if.exit | 1 + tests/qapi-schema/bad-if.json | 3 + tests/qapi-schema/bad-if.out | 0 tests/qapi-schema/doc-good.json | 2 +- tests/qapi-schema/doc-good.out | 1 + tests/qapi-schema/doc-good.texi | 2 + tests/qapi-schema/qapi-schema-test.json | 26 +++ tests/qapi-schema/qapi-schema-test.out | 35 ++++ tests/qapi-schema/test-qapi.py | 20 ++- tests/test-qmp-cmds.c | 12 ++ ui/vnc.h | 2 + 39 files changed, 561 insertions(+), 225 deletions(-) mode change 100644 => 100755 scripts/qapi/doc.py create mode 100644 tests/qapi-schema/bad-if-empty-list.err create mode 100644 tests/qapi-schema/bad-if-empty-list.exit create mode 100644 tests/qapi-schema/bad-if-empty-list.json create mode 100644 tests/qapi-schema/bad-if-empty-list.out create mode 100644 tests/qapi-schema/bad-if-empty.err create mode 100644 tests/qapi-schema/bad-if-empty.exit create mode 100644 tests/qapi-schema/bad-if-empty.json create mode 100644 tests/qapi-schema/bad-if-empty.out create mode 100644 tests/qapi-schema/bad-if-list.err create mode 100644 tests/qapi-schema/bad-if-list.exit create mode 100644 tests/qapi-schema/bad-if-list.json create mode 100644 tests/qapi-schema/bad-if-list.out create mode 100644 tests/qapi-schema/bad-if.err create mode 100644 tests/qapi-schema/bad-if.exit create mode 100644 tests/qapi-schema/bad-if.json create mode 100644 tests/qapi-schema/bad-if.out -- 2.17.1