From nobody Mon Feb 9 04:45:07 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 1502119429949689.4470543272298; Mon, 7 Aug 2017 08:23:49 -0700 (PDT) Received: from localhost ([::1]:37879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejsi-0007r9-Oz for importer@patchew.org; Mon, 07 Aug 2017 11:23:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejJJ-0007dd-7d for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:47:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dejJ2-00045x-Hi for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:47:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54698) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dejIZ-0003fs-G8; Mon, 07 Aug 2017 10:46:27 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 39220806A2; Mon, 7 Aug 2017 14:46:26 +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 0C5268FBE2; Mon, 7 Aug 2017 14:46:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id ABAA61133049; Mon, 7 Aug 2017 16:46:00 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 39220806A2 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.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:51 +0200 Message-Id: <1502117160-24655-48-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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 07 Aug 2017 14:46:26 +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 47/56] blockjob: Make BlockJobInfo and event offsets 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). BlockJobInfo members @len, offset and parameters @len, @offset 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() get them from BlockJob members @len and @offset, which are int64_t, but should never be negative. Change the BlockJobInfo members and the event parameters to 'size', for QAPI/QMP consistency. Signed-off-by: Markus Armbruster --- hmp.c | 8 ++++---- qapi/block-core.json | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hmp.c b/hmp.c index fae974e..867c50b 100644 --- a/hmp.c +++ b/hmp.c @@ -966,16 +966,16 @@ void hmp_info_block_jobs(Monitor *mon, const QDict *q= dict) =20 while (list) { if (strcmp(list->value->type, "stream") =3D=3D 0) { - monitor_printf(mon, "Streaming device %s: Completed %" PRId64 - " of %" PRId64 " bytes, speed limit %" PRIu64 + monitor_printf(mon, "Streaming device %s: Completed %" PRIu64 + " of %" PRIu64 " bytes, speed limit %" PRIu64 " bytes/s\n", list->value->device, list->value->offset, list->value->len, list->value->speed); } else { - monitor_printf(mon, "Type %s, device %s: Completed %" PRId64 - " of %" PRId64 " bytes, speed limit %" PRIu64 + monitor_printf(mon, "Type %s, device %s: Completed %" PRIu64 + " of %" PRIu64 " 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 9e9f2d8..b8442f3 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -955,8 +955,8 @@ # Since: 1.1 ## { 'struct': 'BlockJobInfo', - 'data': {'type': 'str', 'device': 'str', 'len': 'int', - 'offset': 'int', 'busy': 'bool', 'paused': 'bool', + 'data': {'type': 'str', 'device': 'str', 'len': 'size', + 'offset': 'size', 'busy': 'bool', 'paused': 'bool', 'speed': 'size', 'io-status': 'BlockDeviceIoStatus', 'ready': 'bool'} } =20 @@ -3606,8 +3606,8 @@ { 'event': 'BLOCK_JOB_COMPLETED', 'data': { 'type' : 'BlockJobType', 'device': 'str', - 'len' : 'int', - 'offset': 'int', + 'len' : 'size', + 'offset': 'size', 'speed' : 'size', '*error': 'str' } } =20 @@ -3642,8 +3642,8 @@ { 'event': 'BLOCK_JOB_CANCELLED', 'data': { 'type' : 'BlockJobType', 'device': 'str', - 'len' : 'int', - 'offset': 'int', + 'len' : 'size', + 'offset': 'size', 'speed' : 'size' } } =20 ## @@ -3707,8 +3707,8 @@ { 'event': 'BLOCK_JOB_READY', 'data': { 'type' : 'BlockJobType', 'device': 'str', - 'len' : 'int', - 'offset': 'int', + 'len' : 'size', + 'offset': 'size', 'speed' : 'size' } } =20 ## --=20 2.7.5