From nobody Mon Feb 9 14:33:59 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 1502117620813949.6569734648273; Mon, 7 Aug 2017 07:53:40 -0700 (PDT) Received: from localhost ([::1]:37721 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejPX-0004o7-L3 for importer@patchew.org; Mon, 07 Aug 2017 10:53:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejJA-0007Rd-3k for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:47:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dejIu-0003ym-GP for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:47:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35386) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dejIX-0003ce-6x; 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 22D3A78EB2; 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 7F7A17FE80; Mon, 7 Aug 2017 14:46:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 88A7E113855A; Mon, 7 Aug 2017 16:46:00 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 22D3A78EB2 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.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:41 +0200 Message-Id: <1502117160-24655-38-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.27]); 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 37/56] blockjob: Make BlockJobInfo and event speed 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" Byte rates should use QAPI type 'size' (uint64_t). BlockJobInfo member @speed and parameter @speed of events BLOCK_JOB_COMPLETED, BLOCK_JOB_CANCELLED, BLOCK_JOB_READY are 'int' (int64_t). block_job_query(), block_job_event_completed(), block_job_event_cancelled(), block_job_event_ready() all get it from BlockJob member @speed, implicitly converting from uint64_t (since the commit before previous). The conversion is safe, because block_job_set_speed() won't set speeds above INT_MAX. Change the BlockJobInfo member and the event parameters to 'size', for QAPI/QMP consistency. Signed-off-by: Markus Armbruster --- hmp.c | 4 ++-- qapi/block-core.json | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hmp.c b/hmp.c index ecacb7f..fae974e 100644 --- a/hmp.c +++ b/hmp.c @@ -967,7 +967,7 @@ void hmp_info_block_jobs(Monitor *mon, const QDict *qdi= ct) while (list) { if (strcmp(list->value->type, "stream") =3D=3D 0) { monitor_printf(mon, "Streaming device %s: Completed %" PRId64 - " of %" PRId64 " bytes, speed limit %" PRId64 + " of %" PRId64 " bytes, speed limit %" PRIu64 " bytes/s\n", list->value->device, list->value->offset, @@ -975,7 +975,7 @@ void hmp_info_block_jobs(Monitor *mon, const QDict *qdi= ct) list->value->speed); } else { monitor_printf(mon, "Type %s, device %s: Completed %" PRId64 - " of %" PRId64 " bytes, speed limit %" PRId64 + " of %" PRId64 " bytes, speed limit %" PRIu64 " bytes/s\n", list->value->type, list->value->device, diff --git a/qapi/block-core.json b/qapi/block-core.json index 1d68669..ceaab43 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -956,7 +956,8 @@ ## { 'struct': 'BlockJobInfo', 'data': {'type': 'str', 'device': 'str', 'len': 'int', - 'offset': 'int', 'busy': 'bool', 'paused': 'bool', 'speed': 'in= t', + 'offset': 'int', 'busy': 'bool', 'paused': 'bool', + 'speed': 'size', 'io-status': 'BlockDeviceIoStatus', 'ready': 'bool'} } =20 ## @@ -3607,7 +3608,7 @@ 'device': 'str', 'len' : 'int', 'offset': 'int', - 'speed' : 'int', + 'speed' : 'size', '*error': 'str' } } =20 ## @@ -3643,7 +3644,7 @@ 'device': 'str', 'len' : 'int', 'offset': 'int', - 'speed' : 'int' } } + 'speed' : 'size' } } =20 ## # @BLOCK_JOB_ERROR: @@ -3708,7 +3709,7 @@ 'device': 'str', 'len' : 'int', 'offset': 'int', - 'speed' : 'int' } } + 'speed' : 'size' } } =20 ## # @PreallocMode: --=20 2.7.5