improve block-latency-histogram-set
v4 cover improve block-latency-histogram-set
Move to QOM path for block-latency-histogram-set and drop x- prefix.
v4:
01: update definition of @id [Markus]
go only through qmp_get_blk [Kevin]
Vladimir Sementsov-Ogievskiy (2):
qapi: move to QOM path for x-block-latency-histogram-set
qapi: drop x- from x-block-latency-histogram-set
qapi/block-core.json | 24 ++++++++++++------------ block/qapi.c | 12 ++++++------ blockdev.c | 14 +++++++------- 3 files changed, 25 insertions(+), 25 deletions(-)
Signature · 1 line
2.18.0
PATCH v4 1/2 qapi: move to QOM path for x-block-latency-histogram-set
--- qapi/block-core.json | 4 ++-- blockdev.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
qapi/block-core.json +2 -2
@@ -541,7 +541,7 @@ # If only @device parameter is specified, remove all present latency histograms # for the device. Otherwise, add/reset some of (or all) latency histograms. # -# @device: device name to set latency histogram for. +# @id: The name or QOM path of the guest device. # # @boundaries: list of interval boundary values (see description in # BlockLatencyHistogramInfo definition). If specified, all
@@ -599,7 +599,7 @@ # <- { "return": {} } ## { 'command': 'x-block-latency-histogram-set', - 'data': {'device': 'str', + 'data': {'id': 'str', '*boundaries': ['uint64'], '*boundaries-read': ['uint64'], '*boundaries-write': ['uint64'],
blockdev.c +6 -6
@@ -4451,21 +4451,21 @@ void qmp_x_blockdev_set_iothread(const char *node_name, StrOrNull *iothread, }void qmp_x_block_latency_histogram_set ( -const char *device, +const char *id,bool has_boundaries,uint64List *boundaries,bool has_boundaries_read,uint64List *boundaries_read,bool has_boundaries_write,uint64List *boundaries_write,bool has_boundaries_flush,uint64List *boundaries_flush,Error **errp) { -BlockBackend *blk =blk_by_name (device); +BlockBackend *blk =qmp_get_blk (NULL , id, errp);BlockAcctStats *stats;int ret;if (!blk) { -error_setg (errp,"Device '%s' not found" , device);return ; } + stats =blk_get_stats (blk); if (!has_boundaries && !has_boundaries_read && !has_boundaries_write &&
@@ -4480,7 +4480,7 @@ void qmp_x_block_latency_histogram_set( stats,BLOCK_ACCT_READ , has_boundaries_read ? boundaries_read : boundaries);if (ret) { -error_setg (errp,"Device '%s' set read boundaries fail" , device); +error_setg (errp,"Device '%s' set read boundaries fail" , id);return ; } }
@@ -4490,7 +4490,7 @@ void qmp_x_block_latency_histogram_set( stats,BLOCK_ACCT_WRITE , has_boundaries_write ? boundaries_write : boundaries);if (ret) { -error_setg (errp,"Device '%s' set write boundaries fail" , device); +error_setg (errp,"Device '%s' set write boundaries fail" , id);return ; } }
@@ -4500,7 +4500,7 @@ void qmp_x_block_latency_histogram_set( stats,BLOCK_ACCT_FLUSH , has_boundaries_flush ? boundaries_flush : boundaries);if (ret) { -error_setg (errp,"Device '%s' set flush boundaries fail" , device); +error_setg (errp,"Device '%s' set flush boundaries fail" , id);return ; } }
Signature · 1 line
2.18.0
Re: [Qemu-devel] [PATCH v4 1/2] qapi: move to QOM path for x-block-latency-histogram-set
Am 05.03.2019 um 13:53 hat Vladimir Sementsov-Ogievskiy geschrieben:
qapi/block-core.json line 541
Quoted 12 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- qapi/block-core.json | 4 ++-- blockdev.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)qapi/block-core.json +0
-0@@ -541,7 +541,7 @@ # If only @device parameter is specified, remove all present latency histograms
@device doesn't exist any more, so this should become @id.
The examples below need to be changed, too.
Quoted 8 lines
qapi/block-core.json +1
-1# for the device. Otherwise, add/reset some of (or all) latency histograms. # -# @device: device name to set latency histogram for. +# @id: The name or QOM path of the guest device. # # @boundaries: list of interval boundary values (see description in # BlockLatencyHistogramInfo definition). If specified, all
qapi/block-core.json line 605
Quoted 8 lines
qapi/block-core.json +1
-1@@ -599,7 +599,7 @@ # <- { "return": {} } ## { 'command': 'x-block-latency-histogram-set', - 'data': {'device': 'str', + 'data': {'id': 'str', '*boundaries': ['uint64'], '*boundaries-read': ['uint64'], '*boundaries-write': ['uint64'],
The rest of the series looks good to me.
Kevin
PATCH v4 2/2 qapi: drop x- from x-block-latency-histogram-set
In reply to Vladimir Sementsov-OgievskiyDrop x- and x_ prefixes for latency histograms and update version to 3.1
--- qapi/block-core.json | 20 ++++++++++---------- block/qapi.c | 12 ++++++------ blockdev.c | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-)
qapi/block-core.json +10 -10
@@ -528,13 +528,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. #
@@ -564,7 +564,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):
@@ -598,7 +598,7 @@ # "arguments": { "device": "drive0" } } # <- { "return": {} } ## -{ 'command': 'x-block-latency-histogram-set', +{ 'command': 'block-latency-histogram-set', 'data': {'id': 'str', '*boundaries': ['uint64'], '*boundaries-read': ['uint64'],
@@ -885,11 +885,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 ##
@@ -904,9 +904,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:
block/qapi.c +6 -6
@@ -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
@@ -4450,7 +4450,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,
Signature · 1 line
2.18.0