From nobody Wed Dec 17 05:39:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557505536; cv=none; d=zoho.com; s=zohoarc; b=J5shsyskjCLe7ixIPkhEi8NtIPM9toBvySCrkqAalOpUVbLS+cxpKvml+0VmTF1JWkNyBuQGI2xZneTmw3/z6Fvx81cx8rVWIWt/Q818e9nHlpgSn/WvZBxCEjR3Ol6kCWOjVAkGMeElS+46VQfiwxzkpiYKf1jUyeEmr1wpolE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557505536; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=HV+PvOzVAsdS0cieId6V3cCdSGVcYewE9iHpozDGrqw=; b=as5Fgk4D0EqNAOXWVBMVehcC0+75GG+7UcUq8M9hXji8eJc3U9pmDHEeEu7wNTk5uTEuoZJgEUWYMjM+gqUGSGe5SJxxo7N3H/D+HM8OW2ACt73GHK33AEmHKsDyJaNsFK6OiQ1bD26O28EsdSa+Ou43Jpwmjm0Xl9crkTPsWi0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557505536643690.6573882545315; Fri, 10 May 2019 09:25:36 -0700 (PDT) Received: from localhost ([127.0.0.1]:46251 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP8Kv-0004XK-I0 for importer@patchew.org; Fri, 10 May 2019 12:25:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP8Ca-0004Og-EI for qemu-devel@nongnu.org; Fri, 10 May 2019 12:16:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hP8CY-0000DE-13 for qemu-devel@nongnu.org; Fri, 10 May 2019 12:16:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51702) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hP8CT-0008QB-7y; Fri, 10 May 2019 12:16:45 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8F8F63082A4C; Fri, 10 May 2019 16:16:44 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-116-183.ams2.redhat.com [10.36.116.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 257CA17791; Fri, 10 May 2019 16:16:41 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 10 May 2019 18:16:06 +0200 Message-Id: <20190510161614.23236-8-kwolf@redhat.com> In-Reply-To: <20190510161614.23236-1-kwolf@redhat.com> References: <20190510161614.23236-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 10 May 2019 16:16:44 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 07/15] qemu-img: Use IEC binary prefixes for size constants 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, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Stefano Garzarella Using IEC binary prefixes in order to make the code more readable. Signed-off-by: Stefano Garzarella Signed-off-by: Kevin Wolf --- qemu-img.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index e6ad5978e0..71c92f142a 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -37,6 +37,7 @@ #include "qemu/option.h" #include "qemu/error-report.h" #include "qemu/log.h" +#include "qemu/units.h" #include "qom/object_interfaces.h" #include "sysemu/sysemu.h" #include "sysemu/block-backend.h" @@ -1216,7 +1217,7 @@ static int compare_buffers(const uint8_t *buf1, const= uint8_t *buf2, return res; } =20 -#define IO_BUF_SIZE (2 * 1024 * 1024) +#define IO_BUF_SIZE (2 * MiB) =20 /* * Check if passed sectors are empty (not allocated or contain only 0 byte= s) @@ -2960,7 +2961,7 @@ static int img_map(int argc, char **argv) int64_t n; =20 /* Probe up to 1 GiB at a time. */ - n =3D MIN(1 << 30, length - offset); + n =3D MIN(1 * GiB, length - offset); ret =3D get_block_status(bs, offset, n, &next); =20 if (ret < 0) { --=20 2.20.1