From: Peter Maydell Date: Tue, 5 May 2015 17:22:12 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-qmp-2015-05-05' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=233353ec93e4541fa7ab1c53a922a6d5c2bfce7a;p=qemu.git Merge remote-tracking branch 'remotes/armbru/tags/pull-qmp-2015-05-05' into staging drop qapi nested structs # gpg: Signature made Tue May 5 17:40:40 2015 BST using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster " # gpg: aka "Markus Armbruster " * remotes/armbru/tags/pull-qmp-2015-05-05: (40 commits) qapi: Check for member name conflicts with a base class qapi: Support (subset of) \u escapes in strings qapi: Tweak doc references to QMP when QGA is also meant qapi: Drop dead visitor code related to nested structs qapi: Drop support for inline nested types qapi: Drop inline nested structs in query-pci qapi: Drop inline nested struct in query-version qapi: Drop tests for inline nested structs qapi: Merge UserDefTwo and UserDefNested in tests qapi: Forbid 'type' in schema qapi: Use 'struct' instead of 'type' in schema qapi: Document 'struct' metatype qapi: Prefer 'struct' over 'type' in generator qapi: More rigorous checking for type safety bypass qapi: Whitelist commands that don't return dictionary qapi: Require valid names qapi: More rigourous checking of types qapi: Add some type check tests qapi: Unify type bypass and add tests qapi: Allow true, false and null in schema json ... Signed-off-by: Peter Maydell --- 233353ec93e4541fa7ab1c53a922a6d5c2bfce7a