From: Peter Maydell Date: Thu, 18 Jun 2015 12:32:39 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2015-06-18' into staging X-Git-Tag: v2.4.0-rc0~64 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ffe756da0481233e1bd518b2b16489f51856292;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2015-06-18' into staging QAPI patches # gpg: Signature made Thu Jun 18 13:20:00 2015 BST using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster " # gpg: aka "Markus Armbruster " * remotes/armbru/tags/pull-qapi-2015-06-18: qapi-types: Bury code dead since commit 6b5abc7 qapi-types: Split generate_fwd_builtin() off generate_fwd_struct() qapi-types: Drop unused members parameters qapi-types: Don't filter out expressions with 'gen' qapi: Catch and reject flat union branch of array type tests/qapi-schema: New flat union array branch test case qapi: Better separate the different kinds of helpers qapi: Move exprs checking from parse_schema() to check_exprs() qapi: Fix to reject stray 't', 'f' and 'n' qapi: Simplify inclusion cycle detection qapi: Fix file name in error messages for included files qapi: Improve a couple of confusing variable names qapi: Eliminate superfluous QAPISchema attribute input_dir qapi: Drop bogus command from docs MAINTAINERS: Fix up QAPI and QAPI schema file patterns Signed-off-by: Peter Maydell --- 8ffe756da0481233e1bd518b2b16489f51856292