Re: [Qemu-devel] [PATCH 2/2] qapi: drop x- from x-block-latency-histogram-set

[Vladimir Sementsov-Ogievskiy]

02.10.2018 14:33, Vladimir Sementsov-Ogievskiy wrote:
> Libvirt part is ready, let's drop x- prefix.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
> ---
>   qapi/block-core.json | 4 ++--
>   blockdev.c           | 2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/qapi/block-core.json b/qapi/block-core.json
> index 4efd60d8ab..e9c0079933 100644
> --- a/qapi/block-core.json
> +++ b/qapi/block-core.json
> @@ -482,7 +482,7 @@
>     'data': {'boundaries': ['uint64'], 'bins': ['uint64'] } }
>   
>   ##
> -# @x-block-latency-histogram-set:
> +# @block-latency-histogram-set:
>   #
>   # Manage read, write and flush latency histograms for the device.
>   #
> @@ -548,7 +548,7 @@
>   #      "arguments": { "device": "drive0" } }
>   # <- { "return": {} }
>   ##
> -{ 'command': 'x-block-latency-histogram-set',
> +{ 'command': 'block-latency-histogram-set',
>     'data': {'*device': 'str', '*id': 'str',
>              '*boundaries': ['uint64'],
>              '*boundaries-read': ['uint64'],
> diff --git a/blockdev.c b/blockdev.c
> index 87f4ab3316..bc579d8f81 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -4367,7 +4367,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(
>       bool has_device, const char *device,
>       bool has_id, const char *id,
>       bool has_boundaries, uint64List *boundaries,

please amend (drop x_ from statistic output too):

diff --git a/qapi/block-core.json b/qapi/block-core.json
index e9c0079933..faaaf339a6 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -835,11 +835,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 2.12)
 #
-# @x_wr_latency_histogram: @BlockLatencyHistogramInfo. (Since 2.12)
+# @wr_latency_histogram: @BlockLatencyHistogramInfo. (Since 2.12)
 #
-# @x_flush_latency_histogram: @BlockLatencyHistogramInfo. (Since 2.12)
+# @flush_latency_histogram: @BlockLatencyHistogramInfo. (Since 2.12)
 #
 # Since: 0.14.0
 ##
@@ -854,9 +854,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:
diff --git a/block/qapi.c b/block/qapi.c
index c66f949db8..dc7508a06d 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -492,14 +492,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,


--
Best regards,
Vladimir