Commit cb8aac37 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Kevin Wolf
Browse files

qapi: drop x- from x-block-latency-histogram-set 



Drop x- and x_ prefixes for latency histograms and update version to
4.0

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent af0a2265

block/qapi.c

+6 −6
Original line number Diff line number Diff line
@@ -493,14 +493,14 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk) 
    }



    bdrv_latency_histogram_stats(&stats->latency_histogram[BLOCK_ACCT_READ],

                                 &ds->has_x_rd_latency_histogram,

                                 &ds->x_rd_latency_histogram);

                                 &ds->has_rd_latency_histogram,

                                 &ds->rd_latency_histogram);

    bdrv_latency_histogram_stats(&stats->latency_histogram[BLOCK_ACCT_WRITE],

                                 &ds->has_x_wr_latency_histogram,

                                 &ds->x_wr_latency_histogram);

                                 &ds->has_wr_latency_histogram,

                                 &ds->wr_latency_histogram);

    bdrv_latency_histogram_stats(&stats->latency_histogram[BLOCK_ACCT_FLUSH],

                                 &ds->has_x_flush_latency_histogram,

                                 &ds->x_flush_latency_histogram);

                                 &ds->has_flush_latency_histogram,

                                 &ds->flush_latency_histogram);

}



static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs,

blockdev.c

+1 −1
Original line number Diff line number Diff line
@@ -4452,7 +4452,7 @@ void qmp_x_blockdev_set_iothread(const char *node_name, StrOrNull *iothread, 
    aio_context_release(old_context);

}



void qmp_x_block_latency_histogram_set(

void qmp_block_latency_histogram_set(

    const char *id,

    bool has_boundaries, uint64List *boundaries,

    bool has_boundaries_read, uint64List *boundaries_read,

qapi/block-core.json

+10 −10
Original line number Diff line number Diff line
@@ -537,13 +537,13 @@ 
#         +------------------

#             10   50   100

#

# Since: 2.12

# Since: 4.0

##

{ 'struct': 'BlockLatencyHistogramInfo',

  'data': {'boundaries': ['uint64'], 'bins': ['uint64'] } }



##

# @x-block-latency-histogram-set:

# @block-latency-histogram-set:

#

# Manage read, write and flush latency histograms for the device.

#
@@ -573,7 +573,7 @@ 
#

# Returns: error if device is not found or any boundary arrays are invalid.

#

# Since: 2.12

# Since: 4.0

#

# Example: set new histograms for all io types with intervals

# [0, 10), [10, 50), [50, 100), [100, +inf):
@@ -607,7 +607,7 @@ 
#      "arguments": { "device": "drive0" } }

# <- { "return": {} }

##

{ 'command': 'x-block-latency-histogram-set',

{ 'command': 'block-latency-histogram-set',

  'data': {'id': 'str',

           '*boundaries': ['uint64'],

           '*boundaries-read': ['uint64'],
@@ -894,11 +894,11 @@ 
# @timed_stats: Statistics specific to the set of previously defined

#               intervals of time (Since 2.5)

#

# @x_rd_latency_histogram: @BlockLatencyHistogramInfo. (Since 2.12)

# @rd_latency_histogram: @BlockLatencyHistogramInfo. (Since 4.0)

#

# @x_wr_latency_histogram: @BlockLatencyHistogramInfo. (Since 2.12)

# @wr_latency_histogram: @BlockLatencyHistogramInfo. (Since 4.0)

#

# @x_flush_latency_histogram: @BlockLatencyHistogramInfo. (Since 2.12)

# @flush_latency_histogram: @BlockLatencyHistogramInfo. (Since 4.0)

#

# Since: 0.14.0

##
@@ -913,9 +913,9 @@ 
           'invalid_wr_operations': 'int', 'invalid_flush_operations': 'int',

           'account_invalid': 'bool', 'account_failed': 'bool',

           'timed_stats': ['BlockDeviceTimedStats'],

           '*x_rd_latency_histogram': 'BlockLatencyHistogramInfo',

           '*x_wr_latency_histogram': 'BlockLatencyHistogramInfo',

           '*x_flush_latency_histogram': 'BlockLatencyHistogramInfo' } }

           '*rd_latency_histogram': 'BlockLatencyHistogramInfo',

           '*wr_latency_histogram': 'BlockLatencyHistogramInfo',

           '*flush_latency_histogram': 'BlockLatencyHistogramInfo' } }



##

# @BlockStats: