From nobody Thu Nov 6 01:32:26 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155229201773023.780779775976157; Mon, 11 Mar 2019 01:13:37 -0700 (PDT) Received: from localhost ([127.0.0.1]:57039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3G3v-00067h-CR for importer@patchew.org; Mon, 11 Mar 2019 04:13:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56384) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3G2b-0005Ps-Ou for qemu-devel@nongnu.org; Mon, 11 Mar 2019 04:12:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3G2a-00084m-6K for qemu-devel@nongnu.org; Mon, 11 Mar 2019 04:12:09 -0400 Received: from relay.sw.ru ([185.231.240.75]:45436) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3G2Z-00081V-TF; Mon, 11 Mar 2019 04:12:08 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1h3G2W-0005he-AF; Mon, 11 Mar 2019 11:12:04 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 11 Mar 2019 11:12:01 +0300 Message-Id: <20190311081202.13079-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190311081202.13079-1-vsementsov@virtuozzo.com> References: <20190311081202.13079-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 v5 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, 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" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy --- qapi/block-core.json | 14 +++++++------- blockdev.c | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 919d0530b2..9a72e3ee5f 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -547,10 +547,10 @@ # # Manage read, write and flush latency histograms for the device. # -# If only @device parameter is specified, remove all present latency histo= grams +# If only @id 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 @@ -579,7 +579,7 @@ # [0, 10), [10, 50), [50, 100), [100, +inf): # # -> { "execute": "block-latency-histogram-set", -# "arguments": { "device": "drive0", +# "arguments": { "id": "drive0", # "boundaries": [10, 50, 100] } } # <- { "return": {} } # @@ -587,7 +587,7 @@ # not changed (or not created): # # -> { "execute": "block-latency-histogram-set", -# "arguments": { "device": "drive0", +# "arguments": { "id": "drive0", # "boundaries-write": [10, 50, 100] } } # <- { "return": {} } # @@ -596,7 +596,7 @@ # write: [0, 1000), [1000, 5000), [5000, +inf) # # -> { "execute": "block-latency-histogram-set", -# "arguments": { "device": "drive0", +# "arguments": { "id": "drive0", # "boundaries": [10, 50, 100], # "boundaries-write": [1000, 5000] } } # <- { "return": {} } @@ -604,11 +604,11 @@ # Example: remove all latency histograms: # # -> { "execute": "block-latency-histogram-set", -# "arguments": { "device": "drive0" } } +# "arguments": { "id": "drive0" } } # <- { "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 871966ca13..850fb34c52 100644 --- a/blockdev.c +++ b/blockdev.c @@ -4453,21 +4453,21 @@ 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); + BlockBackend *blk =3D qmp_get_blk(NULL, id, errp); BlockAcctStats *stats; int ret; =20 if (!blk) { - error_setg(errp, "Device '%s' not found", device); return; } + stats =3D blk_get_stats(blk); =20 if (!has_boundaries && !has_boundaries_read && !has_boundaries_write && @@ -4482,7 +4482,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", devic= e); + error_setg(errp, "Device '%s' set read boundaries fail", id); return; } } @@ -4492,7 +4492,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", devi= ce); + error_setg(errp, "Device '%s' set write boundaries fail", id); return; } } @@ -4502,7 +4502,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", devi= ce); + error_setg(errp, "Device '%s' set flush boundaries fail", id); return; } } --=20 2.18.0