]> git.proxmox.com Git - qemu.git/commit
block: move qmp and info dump related code to block/qapi.c
authorWenchao Xia <xiawenc@linux.vnet.ibm.com>
Sat, 25 May 2013 03:09:44 +0000 (11:09 +0800)
committerKevin Wolf <kwolf@redhat.com>
Tue, 4 Jun 2013 11:56:30 +0000 (13:56 +0200)
commitf364ec65b56b69c55b674cb6560aa1fbbea9e013
tree69c599a8c75d2c7f76f660913f4cd4e100c1b829
parentde08c606f9ddafe647b6843e2b10a6d6030b0fc0
block: move qmp and info dump related code to block/qapi.c

This patch is a pure code move patch, except following modification:
1 get_human_readable_size() is changed to static function.
2 dump_human_image_info() is renamed to bdrv_image_info_dump().
3 in qmp_query_block() and qmp_query_blockstats, use bdrv_next(bs)
instead of direct traverse of global array 'bdrv_states'.
4 collect_snapshots() and collect_image_info() are renamed, unused parameter
*fmt in collect_image_info() is removed.
5 code style fix.

To avoid conflict and tip better, macro in header file is BLOCK_QAPI_H
instead of QAPI_H. Now block.h and snapshot.h are at the same level in
include path, block_int.h and qapi.h will both include them.

Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
block.c
block/Makefile.objs
block/qapi.c [new file with mode: 0644]
include/block/block.h
include/block/block_int.h
include/block/qapi.h [new file with mode: 0644]
qemu-img.c
savevm.c