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.
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. v3: Address Stefan's comments: 2/4: do not move bdrv_is_snapshot(). 4/4: reuse fprintf_function function pointer instead of a new function. Stefan Hajnoczi (1): 1 block: drop bs_snapshots global variable Wenchao Xia (3): 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 block: dump snapshot and image info to specified output block.c | 313 -------------------------------------- block/Makefile.objs | 1 + block/qapi.c | 366 +++++++++++++++++++++++++++++++++++++++++++++ block/snapshot.c | 157 +++++++++++++++++++ include/block/block.h | 28 +---- include/block/block_int.h | 1 + include/block/qapi.h | 43 ++++++ include/block/snapshot.h | 53 +++++++ qemu-img.c | 163 +------------------- savevm.c | 40 ++--- 10 files changed, 646 insertions(+), 519 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