[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 10/21] block/qapi: reduce the coupling between the bd
From: |
Max Reitz |
Subject: |
[Qemu-block] [PULL 10/21] block/qapi: reduce the coupling between the bdrv_query_stats and bdrv_query_bds_stats |
Date: |
Sun, 12 Feb 2017 02:38:33 +0100 |
From: Dou Liyang <address@hidden>
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 <address@hidden>
Message-id: address@hidden
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
block/qapi.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/block/qapi.c b/block/qapi.c
index 63297353f7..48105ed277 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;
}
--
2.11.0
- [Qemu-block] [PULL 01/21] iotests: Fix a problem in common.filter, (continued)
- [Qemu-block] [PULL 01/21] iotests: Fix a problem in common.filter, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 02/21] qemu-img: Improve commit invalid base message, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 03/21] qapi: Tweak error message of bdrv_query_image_info, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 04/21] iotests: Fix reference output for 059, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 05/21] iotests: record separate timings per format, protocol pair, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 06/21] block/vmdk: Fix the endian problem of buf_len and lba, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 07/21] block: check full backing filename when searching protocol filenames, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 08/21] qemu-iotests: Don't create fifos / pidfiles with protocol paths, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 09/21] qemu-iotest: test to lookup protocol-based image with relative backing, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 11/21] block/qapi: reduce the execution time of qmp_query_blockstats, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 10/21] block/qapi: reduce the coupling between the bdrv_query_stats and bdrv_query_bds_stats,
Max Reitz <=
- [Qemu-block] [PULL 12/21] block: bdrv_invalidate_cache: invalidate children first, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 13/21] block/nfs: fix NULL pointer dereference in URI parsing, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 14/21] block/nfs: fix naming of runtime opts, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 16/21] qemu-iotests: Add _unsupported_fmt helper, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 15/21] qemu-io: Return non-zero exit code on failure, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 17/21] qemu-io: Add failure regression tests, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 18/21] qcow2: Optimize the refcount-block overlap check, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 19/21] qemu-io: don't allow I/O operations larger than BDRV_REQUEST_MAX_BYTES, Max Reitz, 2017/02/11
- [Qemu-block] [PULL 20/21] qemu-img: Use qemu_strtoul() rather than raw strtoul(), Max Reitz, 2017/02/11
- [Qemu-block] [PULL 21/21] qemu-img: Avoid setting ret to unused value in img_convert(), Max Reitz, 2017/02/11