diff options
| author | Wenchao Xia <xiawenc@linux.vnet.ibm.com> | 2013-05-25 11:09:44 +0800 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2013-06-04 13:56:30 +0200 |
| commit | f364ec65b56b69c55b674cb6560aa1fbbea9e013 (patch) | |
| tree | 69c599a8c75d2c7f76f660913f4cd4e100c1b829 /include/block/block.h | |
| parent | de08c606f9ddafe647b6843e2b10a6d6030b0fc0 (diff) | |
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>
Diffstat (limited to 'include/block/block.h')
| -rw-r--r-- | include/block/block.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/block/block.h b/include/block/block.h index a50a75f2a6..dc5b388d87 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -7,11 +7,6 @@ #include "block/coroutine.h" #include "qapi/qmp/qobject.h" #include "qapi-types.h" -/* - * snapshot.h is needed since bdrv_snapshot_dump(), it can be removed when the - * function is moved to other file. - */ -#include "block/snapshot.h" /* block.c */ typedef struct BlockDriver BlockDriver; @@ -323,12 +318,8 @@ void bdrv_get_backing_filename(BlockDriverState *bs, char *filename, int filename_size); void bdrv_get_full_backing_filename(BlockDriverState *bs, char *dest, size_t sz); -BlockInfo *bdrv_query_info(BlockDriverState *s); -BlockStats *bdrv_query_stats(const BlockDriverState *bs); int bdrv_is_snapshot(BlockDriverState *bs); -char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn); -char *get_human_readable_size(char *buf, int buf_size, int64_t size); int path_is_absolute(const char *path); void path_combine(char *dest, int dest_size, const char *base_path, |