Luiz asked me to request a pull rather than going through his tree. The following changes since commit 83761b9244ad2ed39d3cfabe8a0e901ab906f7bf:
Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20150127' into staging (2015-01-27 22:25:56 +0000) are available in the git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-error-2015-02-05 for you to fetch changes up to 2ad28a088d2cc8fd404dfa58fa1b80f9225425ff: balloon: Eliminate silly QERR_ macros (2015-01-29 10:06:02 +0100) ---------------------------------------------------------------- qmp hmp balloon: Cleanups around error reporting ---------------------------------------------------------------- Markus Armbruster (9): qmp hmp: Factor out common "using spice" test qmp hmp: Improve error messages when SPICE is not in use hmp: Compile hmp_info_spice() only with CONFIG_SPICE qmp: Clean up qmp_query_spice() #ifndef !CONFIG_SPICE dummy qmp: Simplify recognition of capability negotiation command qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro balloon: Inline qemu_balloon(), qemu_balloon_status() balloon: Factor out common "is balloon active" test balloon: Eliminate silly QERR_ macros balloon.c | 59 ++++++++++++++++++----------------------------- hmp.c | 2 ++ include/qapi/qmp/qerror.h | 9 -------- include/ui/qemu-spice.h | 10 ++++++++ monitor.c | 19 +++++++-------- qapi/qmp-dispatch.c | 3 ++- qmp.c | 27 +++++++++++----------- 7 files changed, 58 insertions(+), 71 deletions(-) -- 1.9.3