From nobody Tue Nov 4 18:44:20 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530339943196781.3946189409817; Fri, 29 Jun 2018 23:25:43 -0700 (PDT) Received: from localhost ([::1]:45739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9KI-0000LO-B2 for importer@patchew.org; Sat, 30 Jun 2018 02:25:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96I-0004Nc-Pm for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96H-0002OX-Id for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:14 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:56118) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96H-0002Ly-AO for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:13 -0400 Received: by mail-wm0-x233.google.com with SMTP id v16-v6so4106213wmv.5 for ; Fri, 29 Jun 2018 23:11:13 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:11 -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=mPDIUvn4Z7n8mjHSBtJXA9SmtwhdUvf5qbGFYyTOvNM=; b=u/7czeM9KjSPfTOcKQCUH8c1iyTzauKilEBuOFboHOqqEPeay1Jj2DcPG+xB1GGcjk IoyfXCkKjIyJvEVla9i5zob2A9V7PVJ282r0C7vsieAAMChCyL1qLcQb+aeKY12A9+ZS oC9KtM5Y1kaOa8cte459/LA1qf8XrmtUDAThrLUxF8jHsoudSFwSCBc1/2rtFPPlldsa PtBtNEDr3dWO5Rpw0NjgSS+8LKVXgXhpe7VWF9aItcFMlDda6dqaKmOKOJGqlLZcEbG2 imAsaKZnyJkRMXxH4q5keXnWch/s6sYZtG7NeMeInKskT+NW+eUfa5FdMk4Y57VUxXZ4 v2Ig== 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=mPDIUvn4Z7n8mjHSBtJXA9SmtwhdUvf5qbGFYyTOvNM=; b=UG5U1HSa5dZuCGEtrB67mHVMl6NcTavIfQHhAkxB6RFOTsyZPThB+5iCdSKZFEqqZB TkoJf/48nP+16P6MjNpsPUVXCYc7gl9QaN9tjmDischzxVNaynmM4fdditMy8DOM2d88 Dhe77iAtTpwGnuP8KbOQS8ASV7Y+40e0ctVyt0t37EYDD7jup12ukm4YAnAoru0hLq7D pU5ImYUN+GpC8cblqbqXrLQT3685FlO1pmLs5a3G2AojLPR8o/0WYs6NA8/OccgzEkVh UPGM4law/jG3+CFVGwzi7IgnzReU2lZHxakJH2ekgwz4IXkpQMdPoDpvXHjlKCyXMHQ5 kM2Q== X-Gm-Message-State: APt69E1r/AYXtUSx5vOZJYg2xkSfHlxd16oa3Jl3TaH7V6O8t3dxT+xK fz9oJ1MjZ8M0c6G4d9RwEy1seDQ+ X-Google-Smtp-Source: AAOMgpdWVhEfiNGfVRH7gFdo6yrD+yLmNmWJio4yxAu2Ah2oEpdaejLPOi79gogGyiRxTwiKEIlCuw== X-Received: by 2002:a1c:7d47:: with SMTP id y68-v6mr3369481wmc.62.1530339072192; Fri, 29 Jun 2018 23:11:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:22 +0200 Message-Id: <20180630061040.6018-30-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> 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: 2a00:1450:400c:c09::233 Subject: [Qemu-devel] [PULL 29/47] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 From: Philippe Mathieu-Daud=C3=A9 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 Message-Id: <20180625124238.25339-28-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- 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 1670583..fd8eccc 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 c36bbc4..321f184 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 1.8.3.1