From patchwork Mon Aug 7 14:45:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 9885593 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CAEAA602CC for ; Mon, 7 Aug 2017 15:21:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD5FB286A8 for ; Mon, 7 Aug 2017 15:21:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B1428286CF; Mon, 7 Aug 2017 15:21:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 02F7E286A8 for ; Mon, 7 Aug 2017 15:21:41 +0000 (UTC) Received: from localhost ([::1]:37857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejqe-0005Cz-59 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 07 Aug 2017 11:21:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejJJ-0007fG-K4 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 1dejJ4-00047H-9J for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:47:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35608) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dejIa-0003hH-9X; Mon, 07 Aug 2017 10:46:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 36C1478EA2; Mon, 7 Aug 2017 14:46:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 36C1478EA2 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 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 8DBF09520C; Mon, 7 Aug 2017 14:46:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BF71E1133001; Mon, 7 Aug 2017 16:46:00 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 7 Aug 2017 16:45:57 +0200 Message-Id: <1502117160-24655-54-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.12 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:27 +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 53/56] block: Make blockdev-add byte counts 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP File offsets, sizes and alignments should use QAPI type 'size' (uint64_t). blockdev-add parameters are 'int' (int64_t): BlockdevOptionsNull member @size; BlockdevOptionsQcow2 members @cache-size, @l2-cache-size, @refcount-cache-size; BlockdevOptionsNfs members @readahead-size, @page-cache-size; BlockdevOptionsCurlBase member @readahead; BlockdevOptionsRaw members @offset, @size. The block drivers get their values with qemu_opt_get_size(), which returns uint64_t. They store them in uint64_t variables, except for the null driver, which stores in BDRVNullState member int64_t length. Change these BlockdevOptionsFOO members to 'size'. Change BDRVNullState member length to uint64_t. This moves the implicit conversion to int64_t from null_file_open() to null_getlength(). No worse than before. blockdev-add and -blockdev now accept values between 2^63 and 2^64-1. They accept negative values as before, because that's how the QObject input visitor works for backward compatibility. Values above 2^63 are unlikely to actually work; the block subsystem isn't prepared for them. Again, no worse than before. Aside: we call the same thing @readahead-size in one place, and @readahead in another place. Sad. Signed-off-by: Markus Armbruster --- block/null.c | 2 +- qapi/block-core.json | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/block/null.c b/block/null.c index 876f909..2ab0e70 100644 --- a/block/null.c +++ b/block/null.c @@ -20,7 +20,7 @@ #define NULL_OPT_ZEROES "read-zeroes" typedef struct { - int64_t length; + uint64_t length; int64_t latency_ns; bool read_zeroes; } BDRVNullState; diff --git a/qapi/block-core.json b/qapi/block-core.json index 64b84a5..3482f8c 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2189,7 +2189,7 @@ # Since: 2.9 ## { 'struct': 'BlockdevOptionsNull', - 'data': { '*size': 'int', '*latency-ns': 'uint64' } } + 'data': { '*size': 'size', '*latency-ns': 'uint64' } } ## # @BlockdevOptionsVVFAT: @@ -2421,9 +2421,9 @@ '*pass-discard-snapshot': 'bool', '*pass-discard-other': 'bool', '*overlap-check': 'Qcow2OverlapChecks', - '*cache-size': 'int', - '*l2-cache-size': 'int', - '*refcount-cache-size': 'int', + '*cache-size': 'size', + '*l2-cache-size': 'size', + '*refcount-cache-size': 'size', '*cache-clean-interval': 'int', '*encrypt': 'BlockdevQcow2Encryption' } } @@ -2568,9 +2568,9 @@ { 'struct': 'BlockdevOptionsBlkdebug', 'data': { 'image': 'BlockdevRef', '*config': 'str', - '*align': 'int', '*max-transfer': 'int32', - '*opt-write-zero': 'int32', '*max-write-zero': 'int32', - '*opt-discard': 'int32', '*max-discard': 'int32', + '*align': 'size', '*max-transfer': 'size', + '*opt-write-zero': 'size', '*max-write-zero': 'size', + '*opt-discard': 'size', '*max-discard': 'size', '*inject-error': ['BlkdebugInjectErrorOptions'], '*set-state': ['BlkdebugSetStateOptions'] } } @@ -2862,8 +2862,8 @@ '*user': 'int', '*group': 'int', '*tcp-syn-count': 'int', - '*readahead-size': 'int', - '*page-cache-size': 'int', + '*readahead-size': 'size', + '*page-cache-size': 'size', '*debug': 'int' } } ## @@ -2893,7 +2893,7 @@ ## { 'struct': 'BlockdevOptionsCurlBase', 'data': { 'url': 'str', - '*readahead': 'int', + '*readahead': 'size', '*timeout': 'int', '*username': 'str', '*password-secret': 'str', @@ -3001,7 +3001,7 @@ ## { 'struct': 'BlockdevOptionsRaw', 'base': 'BlockdevOptionsGenericFormat', - 'data': { '*offset': 'int', '*size': 'int' } } + 'data': { '*offset': 'size', '*size': 'size' } } ## # @BlockdevOptionsVxHS: