From nobody Mon Feb 9 23:00:05 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 1502117957464628.6743180520195; Mon, 7 Aug 2017 07:59:17 -0700 (PDT) Received: from localhost ([::1]:37754 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejUy-0001c8-7U for importer@patchew.org; Mon, 07 Aug 2017 10:59:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejJ1-0007JL-GE for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:47:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dejIl-0003ry-Je for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:46:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58040) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dejIU-0003YU-DG; Mon, 07 Aug 2017 10:46:22 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 57E407F409; Mon, 7 Aug 2017 14:46:21 +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 905BE68D41; Mon, 7 Aug 2017 14:46:19 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5E4711138605; Mon, 7 Aug 2017 16:46:00 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 57E407F409 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:29 +0200 Message-Id: <1502117160-24655-26-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.16 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:21 +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 25/56] block/qcow2: Change qcow2_calc_prealloc_size() to uint64_t 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" Change parameter @total_size and return value to uint64_t. Callers mix uint64_t and int64_t. Thus, the commit reduces, but does not eliminate implicit conversions. qcow2_create2() passes a (presumably non-negative) int64_t argument, then passes the result through a local variable to qemu_opt_set_number(). Change the local variable to uint64_t to avoid pointless conversions. qcow2_measure() passes a uint64_t argument, then assigns the result to int64_t (which the next commit will change to uint64_t). Signed-off-by: Markus Armbruster --- block/qcow2.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index d7c600b..d96d1f6 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2613,13 +2613,13 @@ int64_t qcow2_refcount_metadata_size(int64_t cluste= rs, size_t cluster_size, * Returns: Total number of bytes required for the fully allocated image * (including metadata). */ -static int64_t qcow2_calc_prealloc_size(int64_t total_size, - size_t cluster_size, - int refcount_order) +static uint64_t qcow2_calc_prealloc_size(uint64_t total_size, + size_t cluster_size, + int refcount_order) { - int64_t meta_size =3D 0; + uint64_t meta_size =3D 0; uint64_t nl1e, nl2e; - int64_t aligned_total_size =3D align_offset(total_size, cluster_size); + uint64_t aligned_total_size =3D align_offset(total_size, cluster_size); =20 /* header: 1 cluster */ meta_size +=3D cluster_size; @@ -2729,7 +2729,7 @@ static int qcow2_create2(const char *filename, int64_= t total_size, int ret; =20 if (prealloc =3D=3D PREALLOC_MODE_FULL || prealloc =3D=3D PREALLOC_MOD= E_FALLOC) { - int64_t prealloc_size =3D + uint64_t prealloc_size =3D qcow2_calc_prealloc_size(total_size, cluster_size, refcount_or= der); qemu_opt_set_number(opts, BLOCK_OPT_SIZE, prealloc_size, &error_ab= ort); qemu_opt_set(opts, BLOCK_OPT_PREALLOC, PreallocMode_lookup[preallo= c], --=20 2.7.5