From nobody Mon Feb 9 07:05:54 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502118995341296.8877359577393; Mon, 7 Aug 2017 08:16:35 -0700 (PDT) Received: from localhost ([::1]:37834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejlh-0001If-Ln for importer@patchew.org; Mon, 07 Aug 2017 11:16:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejJB-0007U0-LF for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:47:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dejIv-000405-Vq for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:47:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58270) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dejIX-0003cW-6U; Mon, 07 Aug 2017 10:46:25 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1EC457F3E4; Mon, 7 Aug 2017 14:46:24 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-254.ams2.redhat.com [10.36.116.254]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3FF427F479; Mon, 7 Aug 2017 14:46:21 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 70ED01138611; Mon, 7 Aug 2017 16:46:00 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1EC457F3E4 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=armbru@redhat.com From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 7 Aug 2017 16:45:34 +0200 Message-Id: <1502117160-24655-31-git-send-email-armbru@redhat.com> In-Reply-To: <1502117160-24655-1-git-send-email-armbru@redhat.com> References: <1502117160-24655-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 07 Aug 2017 14:46:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 30/56] block: Make write thresholds unsigned in QAPI/QMP 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, famz@redhat.com, qemu-block@nongnu.org, quintela@redhat.com, jcody@redhat.com, dgilbert@redhat.com, mreitz@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" File offsets should use QAPI type 'size' (uint64_t). block-set-write-threshold parameter @write-threshold is 'int' (int64_t). qmp_block_set_write_threshold() passes it on to bdrv_write_threshold_set(), implicitly converting to uint64_t. BLOCK_WRITE_THRESHOLD parameters @write-threshold, @amount-exceeded are 'int'. before_write_notify() gets them from BlockDriverState member write_threshold_offset and bdrv_write_threshold_exceeded(), implicitly converting from uint64_t. BlockDeviceInfo members @write_threshold is 'int'. bdrv_block_device_info() gets it from bdrv_write_threshold_get(), implicitly converting from uint64_t. Change them all to 'size'. Drop a redundant initializer while there. block-set-write-threshold now accepts file offsets between 2^63 and 2^64-1. It accepts negative values as before, because that's how the QObject input visitor works for backward compatibility. There is no matching HMP command. BLOCK_WRITE_THRESHOLD, query-block and query-named-block-nodes now report write threshold values above 2^63-1 correctly instead of their (negative) two's complement. HMP's info block does not report write thresholds. Signed-off-by: Markus Armbruster --- block/write-threshold.c | 2 +- qapi/block-core.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/block/write-threshold.c b/block/write-threshold.c index 0bd1a01..c4572d9 100644 --- a/block/write-threshold.c +++ b/block/write-threshold.c @@ -56,7 +56,7 @@ static int coroutine_fn before_write_notify(NotifierWithR= eturn *notifier, { BdrvTrackedRequest *req =3D opaque; BlockDriverState *bs =3D req->bs; - uint64_t amount =3D 0; + uint64_t amount; =20 amount =3D bdrv_write_threshold_exceeded(bs, req); if (amount > 0) { diff --git a/qapi/block-core.json b/qapi/block-core.json index 60e1b6f..9e96590 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -366,7 +366,7 @@ '*bps_wr_max_length': 'int', '*iops_max_length': 'int', '*iops_rd_max_length': 'int', '*iops_wr_max_length': 'int', '*iops_size': 'int', '*group': 'str', 'cache': 'BlockdevCacheI= nfo', - 'write_threshold': 'int' } } + 'write_threshold': 'size' } } =20 ## # @BlockDeviceIoStatus: @@ -3748,8 +3748,8 @@ ## { 'event': 'BLOCK_WRITE_THRESHOLD', 'data': { 'node-name': 'str', - 'amount-exceeded': 'uint64', - 'write-threshold': 'uint64' } } + 'amount-exceeded': 'size', + 'write-threshold': 'size' } } =20 ## # @block-set-write-threshold: @@ -3779,7 +3779,7 @@ # ## { 'command': 'block-set-write-threshold', - 'data': { 'node-name': 'str', 'write-threshold': 'uint64' } } + 'data': { 'node-name': 'str', 'write-threshold': 'size' } } =20 ## # @x-blockdev-change: --=20 2.7.5