Commit 4875a779 authored by Fam Zheng's avatar Fam Zheng Committed by Kevin Wolf
Browse files

block: Include "node-name" if present in query-blockstats 



Node name is a better identifier of BDS.

We will want to query statistics of a BDS node buried in the BDS graph,
so reporting the node's name if there is one will do the trick.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 20a9e77d

block/qapi.c

+5 −0
Original line number Diff line number Diff line
@@ -311,6 +311,11 @@ static BlockStats *bdrv_query_stats(const BlockDriverState *bs) 
        s->device = g_strdup(bdrv_get_device_name(bs));

    }



    if (bdrv_get_node_name(bs)[0]) {

        s->has_node_name = true;

        s->node_name = g_strdup(bdrv_get_node_name(bs));

    }



    s->stats = g_malloc0(sizeof(*s->stats));

    s->stats->rd_bytes = bs->stats.nr_bytes[BLOCK_ACCT_READ];

    s->stats->wr_bytes = bs->stats.nr_bytes[BLOCK_ACCT_WRITE];

qapi/block-core.json

+4 −1
Original line number Diff line number Diff line
@@ -405,6 +405,8 @@ 
# @device: #optional If the stats are for a virtual block device, the name

#          corresponding to the virtual block device.

#

# @device: #optional The node name of the device. (Since 2.3)

#

# @stats:  A @BlockDeviceStats for the device.

#

# @parent: #optional This describes the file block device if it has one.
@@ -415,7 +417,8 @@ 
# Since: 0.14.0

##

{ 'type': 'BlockStats',

  'data': {'*device': 'str', 'stats': 'BlockDeviceStats',

  'data': {'*device': 'str', '*node-name': 'str',

           'stats': 'BlockDeviceStats',

           '*parent': 'BlockStats',

           '*backing': 'BlockStats'} }