From: Peter Maydell Date: Mon, 2 Nov 2015 11:11:39 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2015-11-02' into staging X-Git-Tag: v2.5.0-rc0~36 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3d861a01093f8eedfac9889746ccafcfd32039b7;p=qemu-xen-unstable.git Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2015-11-02' into staging QAPI patches # gpg: Signature made Mon 02 Nov 2015 09:07:23 GMT using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster " # gpg: aka "Markus Armbruster " * remotes/armbru/tags/pull-qapi-2015-11-02: (25 commits) qapi: Simplify gen_struct_field() qapi: Reserve 'u' member name qapi: Finish converting to new qapi union layout tpm: Convert to new qapi union layout memory: Convert to new qapi union layout input: Convert to new qapi union layout char: Convert to new qapi union layout net: Convert to new qapi union layout sockets: Convert to new qapi union layout block: Convert to new qapi union layout tests: Convert to new qapi union layout qapi-visit: Convert to new qapi union layout qapi: Start converting to new qapi union layout qapi-visit: Remove redundant functions for flat union base qapi: Unbox base members qapi: Prefer typesafe upcasts to qapi base classes qapi-types: Refactor base fields output qapi-visit: Split off visit_type_FOO_fields forward decl vnc: Hoist allocation of VncBasicInfo to callers qapi: Reserve 'q_*' and 'has_*' member names ... Signed-off-by: Peter Maydell --- 3d861a01093f8eedfac9889746ccafcfd32039b7