diff options
author | Dou Liyang <douly.fnst@cn.fujitsu.com> | 2017-01-15 16:01:14 +0800 |
---|---|---|
committer | Max Reitz <mreitz@redhat.com> | 2017-02-12 00:47:42 +0100 |
commit | 20a6d768f5c1a590d8a42c343aa862f89966cb23 (patch) | |
tree | d56227993712cb4b726fc3b06d462876c20e743f /block | |
parent | 256e3b6387c91113a39cdfaa5d3b020ccd4b1a33 (diff) | |
download | qemu-20a6d768f5c1a590d8a42c343aa862f89966cb23.zip qemu-20a6d768f5c1a590d8a42c343aa862f89966cb23.tar.gz qemu-20a6d768f5c1a590d8a42c343aa862f89966cb23.tar.bz2 |
block/qapi: reduce the coupling between the bdrv_query_stats and bdrv_query_bds_stats
The bdrv_query_stats and bdrv_query_bds_stats functions need to call
each other, that increases the coupling. it also makes the program
complicated and makes some unnecessary tests.
Remove the call from bdrv_query_bds_stats to bdrv_query_stats, just
take some recursion to make it clearly.
Avoid testing whether the blk is NULL during querying the bds stats.
It is unnecessary.
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Message-id: 1484467275-27919-2-git-send-email-douly.fnst@cn.fujitsu.com
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/qapi.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/block/qapi.c b/block/qapi.c index 6329735..48105ed 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -357,10 +357,6 @@ static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info, qapi_free_BlockInfo(info); } -static BlockStats *bdrv_query_stats(BlockBackend *blk, - const BlockDriverState *bs, - bool query_backing); - static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk) { BlockAcctStats *stats = blk_get_stats(blk); @@ -428,9 +424,18 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk) } } -static void bdrv_query_bds_stats(BlockStats *s, const BlockDriverState *bs, +static BlockStats *bdrv_query_bds_stats(const BlockDriverState *bs, bool query_backing) { + BlockStats *s = NULL; + + s = g_malloc0(sizeof(*s)); + s->stats = g_malloc0(sizeof(*s->stats)); + + if (!bs) { + return s; + } + if (bdrv_get_node_name(bs)[0]) { s->has_node_name = true; s->node_name = g_strdup(bdrv_get_node_name(bs)); @@ -440,14 +445,15 @@ static void bdrv_query_bds_stats(BlockStats *s, const BlockDriverState *bs, if (bs->file) { s->has_parent = true; - s->parent = bdrv_query_stats(NULL, bs->file->bs, query_backing); + s->parent = bdrv_query_bds_stats(bs->file->bs, query_backing); } if (query_backing && bs->backing) { s->has_backing = true; - s->backing = bdrv_query_stats(NULL, bs->backing->bs, query_backing); + s->backing = bdrv_query_bds_stats(bs->backing->bs, query_backing); } + return s; } static BlockStats *bdrv_query_stats(BlockBackend *blk, @@ -456,17 +462,13 @@ static BlockStats *bdrv_query_stats(BlockBackend *blk, { BlockStats *s; - s = g_malloc0(sizeof(*s)); - s->stats = g_malloc0(sizeof(*s->stats)); + s = bdrv_query_bds_stats(bs, query_backing); if (blk) { s->has_device = true; s->device = g_strdup(blk_name(blk)); bdrv_query_blk_stats(s->stats, blk); } - if (bs) { - bdrv_query_bds_stats(s, bs, query_backing); - } return s; } |