From nobody Mon Feb 9 17:08:01 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; dkim=fail; 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 1529931713525342.46404039334504; Mon, 25 Jun 2018 06:01:53 -0700 (PDT) Received: from localhost ([::1]:46730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXR7s-0007xM-SF for importer@patchew.org; Mon, 25 Jun 2018 09:01:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXQr5-000224-Nf for qemu-devel@nongnu.org; Mon, 25 Jun 2018 08:44:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXQr3-00083s-3E for qemu-devel@nongnu.org; Mon, 25 Jun 2018 08:44:27 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:39703) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fXQr2-00083d-VO; Mon, 25 Jun 2018 08:44:25 -0400 Received: by mail-qt0-x244.google.com with SMTP id c23-v6so2827965qtn.6; Mon, 25 Jun 2018 05:44:24 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id m15-v6sm12549562qtm.84.2018.06.25.05.44.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jun 2018 05:44:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t2iQqIMi1+J2VItu51DRtsuf+lb7WIl0xZZ6TqVdeJY=; b=BEOmRjDX9ZcSVzYfPbchPn7srIWFYtydRy1d8OvpEqGLZmQKw3v2ZaCwuImZgXGUeY 2iwhc70RFMVXknOFBfpniiEhP3jikx+ybT5/U5SrlcTP2SSCTxg8BmDBAHv1OncXJkQV rAYnj9tgJTh4ajciyrb61eHpWXMvzE5MLeaDKCVe//HgTePgnELVpdaRuHxFg4Qu7eOb 0FmzKXWyLSpNGpw5t6BTAe/dJI0o9tvTMmyAt56Oympe+vy7AQVBhKL/7dnA/jUVVu+n QULGwI5ASXcm4BZLZC4RKafWk9LyL4jJjbr3elMDtEEyseID2CHSvCiDyF5SkdHjGoq8 3lWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=t2iQqIMi1+J2VItu51DRtsuf+lb7WIl0xZZ6TqVdeJY=; b=sANgNMGbIqBmCcObg4DjSx/kf399UCp9wIwBQP3q8yUVUSL0p4nSLrc9//1amSu6NH y3BckQzueA1CAgBKBX4qk/JaCh4pHyAr8GBuum3ByyP1tn9wP4E2lE0L8B1doEHHOJTe tS8FO5I/KqYeHYBM4GGNHf5pMDaokEfweTlRQkIpHV8HE1+d0pdibNEnCPTZ00OwJGX/ uYUZID3EOHYVo90jlzT3pJtoMAf3S57DvIxfRegmf3Gc0ql2mk9NPU+aZeSqWKi7qM6a TF/3PtygBIUvTj6yu0ygF8pd9OFgFECh74zDOzlZcmkPoxK09FwTik9sXD3C0BmtuwYK EcYA== X-Gm-Message-State: APt69E3Hk+8eXWY3XQ95ANDQtYDacvJwxsTw+PEz6sSDRVPcJ6sK2HKO kJDYk0HbDDs9AOH7C1qcHBo= X-Google-Smtp-Source: AAOMgpc5IIM4wraxUf+ek84IXurhqWiQpyhr3Oqp8zYz0UmYh1xC0qD1rORJ8oMC/ARYE2GHZF1h9w== X-Received: by 2002:a0c:a063:: with SMTP id b90-v6mr10713335qva.115.1529930664450; Mon, 25 Jun 2018 05:44:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Thomas Huth , Stefan Weil Date: Mon, 25 Jun 2018 09:42:19 -0300 Message-Id: <20180625124238.25339-28-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180625124238.25339-1-f4bug@amsat.org> References: <20180625124238.25339-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v5 27/46] hw/lm32: Use the IEC binary prefix definitions 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: qemu-trivial@nongnu.org, Michael Walle , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Michael Walle --- hw/lm32/lm32_boards.c | 13 +++++++------ hw/lm32/milkymist.c | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index 167058348e..fd8eccca14 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -18,6 +18,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" @@ -87,10 +88,10 @@ static void lm32_evr_init(MachineState *machine) =20 /* memory map */ hwaddr flash_base =3D 0x04000000; - size_t flash_sector_size =3D 256 * 1024; - size_t flash_size =3D 32 * 1024 * 1024; + size_t flash_sector_size =3D 256 * KiB; + size_t flash_size =3D 32 * MiB; hwaddr ram_base =3D 0x08000000; - size_t ram_size =3D 64 * 1024 * 1024; + size_t ram_size =3D 64 * MiB; hwaddr timer0_base =3D 0x80002000; hwaddr uart0_base =3D 0x80006000; hwaddr timer1_base =3D 0x8000a000; @@ -173,10 +174,10 @@ static void lm32_uclinux_init(MachineState *machine) =20 /* memory map */ hwaddr flash_base =3D 0x04000000; - size_t flash_sector_size =3D 256 * 1024; - size_t flash_size =3D 32 * 1024 * 1024; + size_t flash_sector_size =3D 256 * KiB; + size_t flash_size =3D 32 * MiB; hwaddr ram_base =3D 0x08000000; - size_t ram_size =3D 64 * 1024 * 1024; + size_t ram_size =3D 64 * MiB; hwaddr uart0_base =3D 0x80000000; hwaddr timer0_base =3D 0x80002000; hwaddr timer1_base =3D 0x80010000; diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index c36bbc4ae2..321f184595 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -18,6 +18,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" @@ -33,11 +34,10 @@ #include "milkymist-hw.h" #include "lm32.h" #include "exec/address-spaces.h" -#include "qemu/cutils.h" =20 #define BIOS_FILENAME "mmone-bios.bin" #define BIOS_OFFSET 0x00860000 -#define BIOS_SIZE (512*1024) +#define BIOS_SIZE (512 * KiB) #define KERNEL_LOAD_ADDR 0x40000000 =20 typedef struct { @@ -96,10 +96,10 @@ milkymist_init(MachineState *machine) =20 /* memory map */ hwaddr flash_base =3D 0x00000000; - size_t flash_sector_size =3D 128 * 1024; - size_t flash_size =3D 32 * 1024 * 1024; + size_t flash_sector_size =3D 128 * KiB; + size_t flash_size =3D 32 * MiB; hwaddr sdram_base =3D 0x40000000; - size_t sdram_size =3D 128 * 1024 * 1024; + size_t sdram_size =3D 128 * MiB; =20 hwaddr initrd_base =3D sdram_base + 0x1002000; hwaddr cmdline_base =3D sdram_base + 0x1000000; --=20 2.18.0