These patches are the common part of my hmp/qmp block query series and Pavel's qmp snapshot command converion series. It mainly does following things: 1 move snapshot related code to block/snapshot.c, qmp and info dumping code to block/qapi.c. 2 better info dumping function to get rid of buffer, avoid string truncation.
Stefan Hajnoczi (1): 1 block: drop bs_snapshots global variable v2: Squash code moving patches since they are reviewed in v1. Drop bdrv_snapshot_find() function change patch, since it related to snapshot logic which should be changed together with Pavel's serial. Use a parameter in message_printf() to tell where to print, instead of use global variable "cur_mon" inside. Wenchao Xia (4): 2 block: move snapshot code in block.c to block/snapshot.c 3 block: move qmp and info dump related code to block/qapi.c 4 util: add new function message_printf() 5 block: dump to specified output for bdrv_snapshot_dump() and bdrv_image_info_dump() block.c | 318 ------------------------------------- block/Makefile.objs | 1 + block/qapi.c | 365 +++++++++++++++++++++++++++++++++++++++++++ block/snapshot.c | 162 +++++++++++++++++++ include/block/block.h | 29 +---- include/block/block_int.h | 1 + include/block/qapi.h | 42 +++++ include/block/snapshot.h | 54 +++++++ include/qemu/error-report.h | 13 ++ qemu-img.c | 169 ++------------------- savevm.c | 44 +++--- util/qemu-error.c | 28 +++- 12 files changed, 697 insertions(+), 529 deletions(-) create mode 100644 block/qapi.c create mode 100644 block/snapshot.c create mode 100644 include/block/qapi.h create mode 100644 include/block/snapshot.h