Anthony, This pull request contains only my "QAPI conversions round 2" series (which got no review comments... last chance!).
The changes (since 9f60639b848944200c3d33a89233d808de0b5a43) are available in the following repository: git://repo.or.cz/qemu/qmp-unstable.git queue/qmp Luiz Capitulino (19): qapi-commands.py: Don't call the output marshal on error qapi: Convert query-mice qapi: Convert query-migrate Monitor: Make mon_set_cpu() public Monitor: Introduce monitor_get_cpu_index() qapi: Convert the cpu command qapi: Convert query-cpus block: iostatus: Drop BDRV_IOS_INVAL block: Rename the BlockIOStatus enum values qapi: Convert query-block qapi: Convert query-blockstats qerror: Add a user string for QERR_FEATURE_DISABLED qapi: Convert query-vnc qapi: Convert query-spice qapi: Convert query-balloon qapi: Convert query-pci QMP: Drop the query commands dispatch table Monitor: do_info(): Drop QMP command handling code Drop qemu-objects.h from modules that don't require it balloon.c | 72 +----- balloon.h | 6 +- block.c | 234 ++++++------------ block.h | 5 - block_int.h | 4 +- console.h | 9 - cpus.c | 45 ++++ error.c | 3 +- hmp-commands.hx | 3 +- hmp.c | 407 ++++++++++++++++++++++++++++++ hmp.h | 10 + hw/pci-stub.c | 15 +- hw/pci.c | 322 +++++++++--------------- hw/pci.h | 4 - hw/virtio-balloon.c | 78 +----- input.c | 64 ++---- migration.c | 82 ++----- monitor.c | 313 ++---------------------- monitor.h | 2 + qapi-schema.json | 616 ++++++++++++++++++++++++++++++++++++++++++++++ qerror.c | 4 + qmp-commands.hx | 60 +++++- qmp.c | 27 ++ scripts/qapi-commands.py | 4 +- ui/spice-core.c | 139 +++++------ ui/vnc.c | 135 +++++++---- vl.c | 2 +- 27 files changed, 1611 insertions(+), 1054 deletions(-)