From: Peter Maydell Date: Thu, 5 Feb 2015 11:11:56 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-05' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2c918a245ca2a0b3339b8ded926b3f887d6d409e;p=qemu.git Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-05' into staging qmp hmp balloon: Cleanups around error reporting # gpg: Signature made Thu 05 Feb 2015 07:15:11 GMT using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster " # gpg: aka "Markus Armbruster " * remotes/armbru/tags/pull-error-2015-02-05: balloon: Eliminate silly QERR_ macros balloon: Factor out common "is balloon active" test balloon: Inline qemu_balloon(), qemu_balloon_status() qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro qmp: Simplify recognition of capability negotiation command qmp: Clean up qmp_query_spice() #ifndef !CONFIG_SPICE dummy hmp: Compile hmp_info_spice() only with CONFIG_SPICE qmp hmp: Improve error messages when SPICE is not in use qmp hmp: Factor out common "using spice" test Signed-off-by: Peter Maydell --- 2c918a245ca2a0b3339b8ded926b3f887d6d409e