The following changes since commit 1b58f5a7f6fbe811cc486cd5786483bad5d51bbf:
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-signed' into staging (2015-06-18 11:36:42 +0100) are available in the git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2015-06-18 for you to fetch changes up to e1d4210c3a50059a3889cedc44a8aa193fa63d7d: qapi-types: Bury code dead since commit 6b5abc7 (2015-06-18 14:19:48 +0200) ---------------------------------------------------------------- QAPI patches ---------------------------------------------------------------- Markus Armbruster (15): MAINTAINERS: Fix up QAPI and QAPI schema file patterns qapi: Drop bogus command from docs qapi: Eliminate superfluous QAPISchema attribute input_dir qapi: Improve a couple of confusing variable names qapi: Fix file name in error messages for included files qapi: Simplify inclusion cycle detection qapi: Fix to reject stray 't', 'f' and 'n' qapi: Move exprs checking from parse_schema() to check_exprs() qapi: Better separate the different kinds of helpers tests/qapi-schema: New flat union array branch test case qapi: Catch and reject flat union branch of array type qapi-types: Don't filter out expressions with 'gen' qapi-types: Drop unused members parameters qapi-types: Split generate_fwd_builtin() off generate_fwd_struct() qapi-types: Bury code dead since commit 6b5abc7 MAINTAINERS | 4 + docs/qapi-code-gen.txt | 2 - scripts/qapi-types.py | 31 +-- scripts/qapi.py | 346 +++++++++++++------------ tests/Makefile | 3 +- tests/qapi-schema/flat-union-array-branch.err | 1 + tests/qapi-schema/flat-union-array-branch.exit | 1 + tests/qapi-schema/flat-union-array-branch.json | 12 + tests/qapi-schema/flat-union-array-branch.out | 0 tests/qapi-schema/include-cycle.err | 4 +- tests/qapi-schema/include-nested-err.err | 2 +- 11 files changed, 212 insertions(+), 194 deletions(-) create mode 100644 tests/qapi-schema/flat-union-array-branch.err create mode 100644 tests/qapi-schema/flat-union-array-branch.exit create mode 100644 tests/qapi-schema/flat-union-array-branch.json create mode 100644 tests/qapi-schema/flat-union-array-branch.out Markus Armbruster (15): MAINTAINERS: Fix up QAPI and QAPI schema file patterns qapi: Drop bogus command from docs qapi: Eliminate superfluous QAPISchema attribute input_dir qapi: Improve a couple of confusing variable names qapi: Fix file name in error messages for included files qapi: Simplify inclusion cycle detection qapi: Fix to reject stray 't', 'f' and 'n' qapi: Move exprs checking from parse_schema() to check_exprs() qapi: Better separate the different kinds of helpers tests/qapi-schema: New flat union array branch test case qapi: Catch and reject flat union branch of array type qapi-types: Don't filter out expressions with 'gen' qapi-types: Drop unused members parameters qapi-types: Split generate_fwd_builtin() off generate_fwd_struct() qapi-types: Bury code dead since commit 6b5abc7 MAINTAINERS | 4 + docs/qapi-code-gen.txt | 2 - scripts/qapi-types.py | 31 +-- scripts/qapi.py | 346 +++++++++++++------------ tests/Makefile | 3 +- tests/qapi-schema/flat-union-array-branch.err | 1 + tests/qapi-schema/flat-union-array-branch.exit | 1 + tests/qapi-schema/flat-union-array-branch.json | 12 + tests/qapi-schema/flat-union-array-branch.out | 0 tests/qapi-schema/include-cycle.err | 4 +- tests/qapi-schema/include-nested-err.err | 2 +- 11 files changed, 212 insertions(+), 194 deletions(-) create mode 100644 tests/qapi-schema/flat-union-array-branch.err create mode 100644 tests/qapi-schema/flat-union-array-branch.exit create mode 100644 tests/qapi-schema/flat-union-array-branch.json create mode 100644 tests/qapi-schema/flat-union-array-branch.out -- 1.9.3