From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:35972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNPQx-0004JX-4H for qemu-devel@nongnu.org; Sun, 05 May 2019 18:16:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNPQt-0008JP-8Y for qemu-devel@nongnu.org; Sun, 05 May 2019 18:16:33 -0400 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Mon, 6 May 2019 00:15:34 +0200 Message-Id: <20190505221544.31568-4-philmd@redhat.com> In-Reply-To: <20190505221544.31568-1-philmd@redhat.com> References: <20190505221544.31568-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 03/13] tests/pflash-cfi02: Use IEC binary prefixes for size constants List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Stephen Checkoway Cc: Markus Armbruster , Max Reitz , Thomas Huth , Laurent Vivier , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Using IEC binary prefixes in order to make the code more readable. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/pflash-cfi02-test.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/pflash-cfi02-test.c b/tests/pflash-cfi02-test.c index ff775618c02..3c37465499a 100644 --- a/tests/pflash-cfi02-test.c +++ b/tests/pflash-cfi02-test.c @@ -8,6 +8,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "libqtest.h" =20 /* @@ -16,7 +17,7 @@ * all. In particular, we're limited to a 16-bit wide flash device. */ =20 -#define MP_FLASH_SIZE_MAX (32 * 1024 * 1024) +#define MP_FLASH_SIZE_MAX (32 * MiB) #define BASE_ADDR (0x100000000ULL - MP_FLASH_SIZE_MAX) =20 #define FLASH_WIDTH 2 @@ -205,7 +206,7 @@ int main(int argc, char **argv) char *image_path; int fd =3D g_file_open_tmp("pflash-cfi02-XXXXXX.raw", &image_path, &= error); g_assert_no_error(error); - if (ftruncate(fd, 8 * 1024 * 1024) < 0) { + if (ftruncate(fd, 8 * MiB) < 0) { g_printerr("Failed to truncate file %s to 8 MB: %s\n", image_pat= h, strerror(errno)); close(fd); --=20 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBA17C004C9 for ; Sun, 5 May 2019 22:20:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 909D1205C9 for ; Sun, 5 May 2019 22:20:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 909D1205C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:46950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNPUr-0007Q7-O4 for qemu-devel@archiver.kernel.org; Sun, 05 May 2019 18:20:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNPQx-0004JX-4H for qemu-devel@nongnu.org; Sun, 05 May 2019 18:16:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNPQt-0008JP-8Y for qemu-devel@nongnu.org; Sun, 05 May 2019 18:16:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55218) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNPQf-0007iI-Ld; Sun, 05 May 2019 18:16:21 -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 4FADE30842B5; Sun, 5 May 2019 22:16:09 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-58.brq.redhat.com [10.40.204.58]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36A6B7C386; Sun, 5 May 2019 22:16:04 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Stephen Checkoway Date: Mon, 6 May 2019 00:15:34 +0200 Message-Id: <20190505221544.31568-4-philmd@redhat.com> In-Reply-To: <20190505221544.31568-1-philmd@redhat.com> References: <20190505221544.31568-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" 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.40]); Sun, 05 May 2019 22:16:09 +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] [PATCH 03/13] tests/pflash-cfi02: 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: Laurent Vivier , Kevin Wolf , Thomas Huth , qemu-block@nongnu.org, Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Max Reitz , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190505221534.chiWUO23iY4ALJsnfLnqhiP1e2TnbaEkt0S0DTu1rTc@z> Using IEC binary prefixes in order to make the code more readable. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/pflash-cfi02-test.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/pflash-cfi02-test.c b/tests/pflash-cfi02-test.c index ff775618c02..3c37465499a 100644 --- a/tests/pflash-cfi02-test.c +++ b/tests/pflash-cfi02-test.c @@ -8,6 +8,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "libqtest.h" =20 /* @@ -16,7 +17,7 @@ * all. In particular, we're limited to a 16-bit wide flash device. */ =20 -#define MP_FLASH_SIZE_MAX (32 * 1024 * 1024) +#define MP_FLASH_SIZE_MAX (32 * MiB) #define BASE_ADDR (0x100000000ULL - MP_FLASH_SIZE_MAX) =20 #define FLASH_WIDTH 2 @@ -205,7 +206,7 @@ int main(int argc, char **argv) char *image_path; int fd =3D g_file_open_tmp("pflash-cfi02-XXXXXX.raw", &image_path, &= error); g_assert_no_error(error); - if (ftruncate(fd, 8 * 1024 * 1024) < 0) { + if (ftruncate(fd, 8 * MiB) < 0) { g_printerr("Failed to truncate file %s to 8 MB: %s\n", image_pat= h, strerror(errno)); close(fd); --=20 2.20.1