The following changes since commit dd5e38b19d7cb07d317e1285941d8245c01da540:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160218-1' into staging (2016-02-18 15:20:35 +0000) are available in the git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2016-02-19 for you to fetch changes up to dbf11922622685934bfb41e7cf2be9bd4a0405c0: qapi: Change visit_start_implicit_struct to visit_start_alternate (2016-02-19 11:08:57 +0100) ---------------------------------------------------------------- QAPI patches for 2016-02-19 ---------------------------------------------------------------- Eric Blake (13): qapi-visit: Honor prefix of discriminator enum qapi: Simplify excess input reporting in input visitors qapi: Forbid empty unions and useless alternates qapi: Forbid 'any' inside an alternate qapi: Add tests of complex objects within alternate qapi: Visit variants in visit_type_FOO_fields() qapi-visit: Less indirection in visit_type_Foo_fields() qapi: Adjust layout of FooList types qapi: Emit structs used as variants in topological order qapi-visit: Use common idiom in gen_visit_fields_decl() qapi: Don't box struct branch of alternate qapi: Don't box branches of flat unions qapi: Change visit_start_implicit_struct to visit_start_alternate Markus Armbruster (2): qapi-visit: Simplify how we visit common union members qapi-visit: Unify struct and union visit cpus.c | 18 +-- docs/qapi-code-gen.txt | 15 +- hmp.c | 12 +- include/qapi/visitor-impl.h | 21 ++- include/qapi/visitor.h | 63 +++++--- qapi/opts-visitor.c | 16 +- qapi/qapi-dealloc-visitor.c | 42 +----- qapi/qapi-visit-core.c | 45 ++---- qapi/qmp-input-visitor.c | 43 +++--- qapi/qmp-output-visitor.c | 3 +- qapi/string-input-visitor.c | 4 +- qapi/string-output-visitor.c | 2 +- scripts/qapi-types.py | 33 +++-- scripts/qapi-visit.py | 253 ++++++++++++-------------------- scripts/qapi.py | 29 +++- tests/Makefile | 1 + tests/qapi-schema/alternate-any.err | 1 + tests/qapi-schema/alternate-any.exit | 1 + tests/qapi-schema/alternate-any.json | 4 + tests/qapi-schema/alternate-any.out | 0 tests/qapi-schema/alternate-empty.err | 1 + tests/qapi-schema/alternate-empty.exit | 2 +- tests/qapi-schema/alternate-empty.json | 2 +- tests/qapi-schema/alternate-empty.out | 5 - tests/qapi-schema/flat-union-empty.err | 1 + tests/qapi-schema/flat-union-empty.exit | 2 +- tests/qapi-schema/flat-union-empty.json | 2 +- tests/qapi-schema/flat-union-empty.out | 9 -- tests/qapi-schema/qapi-schema-test.json | 13 +- tests/qapi-schema/qapi-schema-test.out | 11 +- tests/qapi-schema/union-empty.err | 1 + tests/qapi-schema/union-empty.exit | 2 +- tests/qapi-schema/union-empty.json | 2 +- tests/qapi-schema/union-empty.out | 6 - tests/test-qmp-input-visitor.c | 39 ++++- tests/test-qmp-output-visitor.c | 27 +++- 36 files changed, 358 insertions(+), 373 deletions(-) create mode 100644 tests/qapi-schema/alternate-any.err create mode 100644 tests/qapi-schema/alternate-any.exit create mode 100644 tests/qapi-schema/alternate-any.json create mode 100644 tests/qapi-schema/alternate-any.out -- 2.4.3