From: Peter Maydell Date: Fri, 4 May 2018 12:49:08 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-05-04' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7c867af89a43e4be56ea25dd9691196eb1818fe6;p=qemu.git Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-05-04' into staging QAPI patches for 2018-05-04 # gpg: Signature made Fri 04 May 2018 08:59:16 BST # gpg: using RSA key 3870B400EB918653 # gpg: Good signature from "Markus Armbruster " # gpg: aka "Markus Armbruster " # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-qapi-2018-05-04: qapi: deprecate CpuInfoFast.arch qapi: discriminate CpuInfoFast on SysEmuTarget, not CpuInfoArch qapi: change the type of TargetInfo.arch from string to enum SysEmuTarget qapi: add SysEmuTarget to "common.json" qapi: fill in CpuInfoFast.arch in query-cpus-fast qobject: Modify qobject_ref() to return obj qobject: Replace qobject_incref/QINCREF qobject_decref/QDECREF qobject: use a QObjectBase_ struct qobject: Ensure base is at offset 0 qobject: Use qobject_to() instead of type cast Signed-off-by: Peter Maydell --- 7c867af89a43e4be56ea25dd9691196eb1818fe6