david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: add bdrv_query_stats

Browse Source 
qmp_query_blockstat cannot have errors, remove the Error argument and
create a new public function bdrv_query_stats out of it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-10-18 16:49:16 +02:00 committed by Kevin Wolf
parent ac84adac48
commit 9887b61661
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
block.c
View File

@ -2867,8 +2867,7 @@ BlockInfoList *qmp_query_block(Error **errp)
return head; return head;
} }
/* Consider exposing this as a full fledged QMP command */ BlockStats *bdrv_query_stats(const BlockDriverState *bs)
static BlockStats *qmp_query_blockstat(const BlockDriverState *bs, Error **errp)
{ {
BlockStats *s; BlockStats *s;
@ -2892,7 +2891,7 @@ static BlockStats *qmp_query_blockstat(const BlockDriverState *bs, Error **errp)
if (bs->file) { if (bs->file) {
s->has_parent = true; s->has_parent = true;
s->parent = qmp_query_blockstat(bs->file, NULL); s->parent = bdrv_query_stats(bs->file);
} }
return s; return s;
@ -2900,20 +2899,15 @@ static BlockStats *qmp_query_blockstat(const BlockDriverState *bs, Error **errp)
BlockStatsList *qmp_query_blockstats(Error **errp) BlockStatsList *qmp_query_blockstats(Error **errp)
{ {
BlockStatsList *head = NULL, *cur_item = NULL; BlockStatsList *head = NULL, **p_next = &head;
BlockDriverState *bs; BlockDriverState *bs;
QTAILQ_FOREACH(bs, &bdrv_states, list) { QTAILQ_FOREACH(bs, &bdrv_states, list) {
BlockStatsList *info = g_malloc0(sizeof(*info)); BlockStatsList *info = g_malloc0(sizeof(*info));
info->value = qmp_query_blockstat(bs, NULL); info->value = bdrv_query_stats(bs);
/* XXX: waiting for the qapi to support GSList */ *p_next = info;
if (!cur_item) { p_next = &info->next;
head = cur_item = info;
} else {
cur_item->next = info;
cur_item = info;
}
} }
return head; return head;

1
block.h
View File

@ -314,6 +314,7 @@ void bdrv_get_backing_filename(BlockDriverState *bs,
void bdrv_get_full_backing_filename(BlockDriverState *bs, void bdrv_get_full_backing_filename(BlockDriverState *bs,
char *dest, size_t sz); char *dest, size_t sz);
BlockInfo *bdrv_query_info(BlockDriverState *s); BlockInfo *bdrv_query_info(BlockDriverState *s);
BlockStats *bdrv_query_stats(const BlockDriverState *bs);
int bdrv_can_snapshot(BlockDriverState *bs); int bdrv_can_snapshot(BlockDriverState *bs);
int bdrv_is_snapshot(BlockDriverState *bs); int bdrv_is_snapshot(BlockDriverState *bs);
BlockDriverState *bdrv_snapshots(void); BlockDriverState *bdrv_snapshots(void);