I'm including balloon patches in the hope that they too can go through Luiz's tree.
v2: * PATCH 1+8: Use bool [Eric] * PATCH 9: Clarify commit message [Eric] * R-bys retrained since changes are trivial 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
