From nobody Thu Nov 6 03:26:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539350452936328.0930660828725; Fri, 12 Oct 2018 06:20:52 -0700 (PDT) Received: from localhost ([::1]:40572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAxMz-00061u-F2 for importer@patchew.org; Fri, 12 Oct 2018 09:20:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAxHv-0003ID-Ej for qemu-devel@nongnu.org; Fri, 12 Oct 2018 09:15:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAxHk-0002Ey-7M for qemu-devel@nongnu.org; Fri, 12 Oct 2018 09:15:29 -0400 Received: from relay.sw.ru ([185.231.240.75]:49384) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gAxHi-00024l-7y; Fri, 12 Oct 2018 09:15:19 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1gAxHa-0007gx-OP; Fri, 12 Oct 2018 16:15:10 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 12 Oct 2018 16:15:08 +0300 Message-Id: <20181012131509.16370-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181012131509.16370-1-vsementsov@virtuozzo.com> References: <20181012131509.16370-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v2 1/2] qapi: move to QOM path for x-block-latency-histogram-set X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, nshirokovskiy@virtuozzo.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Move to way of device selecting, however fall back to device name if path is not found. Signed-off-by: Vladimir Sementsov-Ogievskiy --- qapi/block-core.json | 4 ++-- blockdev.c | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index cfb37f8c1d..f4ae61e2e4 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -489,7 +489,7 @@ # If only @device parameter is specified, remove all present latency histo= grams # for the device. Otherwise, add/reset some of (or all) latency histograms. # -# @device: device name to set latency histogram for. +# @id: The QOM path or name of the guest device. # # @boundaries: list of interval boundary values (see description in # BlockLatencyHistogramInfo definition). If specified, all @@ -547,7 +547,7 @@ # <- { "return": {} } ## { 'command': 'x-block-latency-histogram-set', - 'data': {'device': 'str', + 'data': {'id': 'str', '*boundaries': ['uint64'], '*boundaries-read': ['uint64'], '*boundaries-write': ['uint64'], diff --git a/blockdev.c b/blockdev.c index a8755bd908..52e131f47b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -4368,20 +4368,28 @@ void qmp_x_blockdev_set_iothread(const char *node_n= ame, StrOrNull *iothread, } =20 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 =3D blk_by_name(device); BlockAcctStats *stats; + Error *local_err =3D NULL; + BlockBackend *blk =3D blk_by_qdev_id(id, &local_err); =20 if (!blk) { - error_setg(errp, "Device '%s' not found", device); - return; + blk =3D blk_by_name(id); + if (!blk) { + error_propagate(errp, local_err); + return; + } else { + error_free(local_err); + local_err =3D NULL; + } } + stats =3D blk_get_stats(blk); =20 if (!has_boundaries && !has_boundaries_read && !has_boundaries_write && --=20 2.18.0 From nobody Thu Nov 6 03:26:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539350324315282.7412060352884; Fri, 12 Oct 2018 06:18:44 -0700 (PDT) Received: from localhost ([::1]:40560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAxL1-00050b-6v for importer@patchew.org; Fri, 12 Oct 2018 09:18:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAxHv-0003IF-G5 for qemu-devel@nongnu.org; Fri, 12 Oct 2018 09:15:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAxHk-0002F5-8L for qemu-devel@nongnu.org; Fri, 12 Oct 2018 09:15:29 -0400 Received: from relay.sw.ru ([185.231.240.75]:49390) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gAxHi-00024n-7x; Fri, 12 Oct 2018 09:15:19 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1gAxHa-0007gx-U1; Fri, 12 Oct 2018 16:15:10 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 12 Oct 2018 16:15:09 +0300 Message-Id: <20181012131509.16370-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181012131509.16370-1-vsementsov@virtuozzo.com> References: <20181012131509.16370-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v2 2/2] qapi: drop x- from x-block-latency-histogram-set X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, nshirokovskiy@virtuozzo.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop x- and x_ prefixes for latency histograms and update version to 3.1 Signed-off-by: Vladimir Sementsov-Ogievskiy --- qapi/block-core.json | 20 ++++++++++---------- block/qapi.c | 12 ++++++------ blockdev.c | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index f4ae61e2e4..8b7c68c69d 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -476,13 +476,13 @@ # +------------------ # 10 50 100 # -# Since: 2.12 +# Since: 3.1 ## { 'struct': 'BlockLatencyHistogramInfo', 'data': {'boundaries': ['uint64'], 'bins': ['uint64'] } } =20 ## -# @x-block-latency-histogram-set: +# @block-latency-histogram-set: # # Manage read, write and flush latency histograms for the device. # @@ -512,7 +512,7 @@ # # Returns: error if device is not found or any boundary arrays are invalid. # -# Since: 2.12 +# Since: 3.1 # # Example: set new histograms for all io types with intervals # [0, 10), [10, 50), [50, 100), [100, +inf): @@ -546,7 +546,7 @@ # "arguments": { "device": "drive0" } } # <- { "return": {} } ## -{ 'command': 'x-block-latency-histogram-set', +{ 'command': 'block-latency-histogram-set', 'data': {'id': 'str', '*boundaries': ['uint64'], '*boundaries-read': ['uint64'], @@ -833,11 +833,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 3.1) # -# @x_wr_latency_histogram: @BlockLatencyHistogramInfo. (Since 2.12) +# @wr_latency_histogram: @BlockLatencyHistogramInfo. (Since 3.1) # -# @x_flush_latency_histogram: @BlockLatencyHistogramInfo. (Since 2.12) +# @flush_latency_histogram: @BlockLatencyHistogramInfo. (Since 3.1) # # Since: 0.14.0 ## @@ -852,9 +852,9 @@ 'invalid_wr_operations': 'int', 'invalid_flush_operations': 'in= t', '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' } } =20 ## # @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) } =20 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_WRIT= E], - &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_FLUS= H], - &ds->has_x_flush_latency_histogram, - &ds->x_flush_latency_histogram); + &ds->has_flush_latency_histogram, + &ds->flush_latency_histogram); } =20 static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs, diff --git a/blockdev.c b/blockdev.c index 52e131f47b..5dd9b944f3 100644 --- a/blockdev.c +++ b/blockdev.c @@ -4367,7 +4367,7 @@ void qmp_x_blockdev_set_iothread(const char *node_nam= e, StrOrNull *iothread, aio_context_release(old_context); } =20 -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, --=20 2.18.0