From nobody Wed Feb 11 03:25:55 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 1528681942931645.9497357094176; Sun, 10 Jun 2018 18:52:22 -0700 (PDT) Received: from localhost ([::1]:45903 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSC0E-0000S1-NU for importer@patchew.org; Sun, 10 Jun 2018 21:52:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSBS8-0005mG-KU for qemu-devel@nongnu.org; Sun, 10 Jun 2018 21:17:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSBS7-0003L8-IX for qemu-devel@nongnu.org; Sun, 10 Jun 2018 21:17:00 -0400 Received: from mail-qk0-x235.google.com ([2607:f8b0:400d:c09::235]:40521) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSBS7-0003Kw-DF; Sun, 10 Jun 2018 21:16:59 -0400 Received: by mail-qk0-x235.google.com with SMTP id r66-v6so12067176qkr.7; Sun, 10 Jun 2018 18:16:59 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id o5-v6sm28237223qtm.60.2018.06.10.18.16.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Jun 2018 18:16:58 -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=e4rAQDgc4IrFnB8r9yX3M8IOSgASkZXZB3UA0UkXeoM=; b=Nx09TW7/xPEsIGvA+hfOdUOqjEwZPWr2YCFTstT1zU8yaWRLK1YxBFaYLcZ5GElnII /aLpXz6jOjr5353NZoVk/m8fMKm9WMLnrPGbOq/SIBf3uN9SBwo7MXhlRyDT3zHBy5sQ 6nVR0QUXo5uSDmS06uY2tJ+yC+LHJm50cznXbf2HCi8rRgVzTGhsigibAH4+7ln39JYb UaPpvLcM8pdy0K53JMBknCEFP7LUKuaC9uNO2ObLvEU+2h4t/bM/XqKQ69+LantGVPD3 q4SytN9kO9IIIO188uFZwD6Ih6AQsqTB3CghtJDE+DpUAmrj/Xa3ihnw0gzAvXA/XHy6 6e/g== 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=e4rAQDgc4IrFnB8r9yX3M8IOSgASkZXZB3UA0UkXeoM=; b=J2daXDRxAEc6I1KqNAxtzaCtEp2y8eguSlsu0NCwxS0J+WapUfT6A0LUXYYgeH8t4j OjfYCb9EOsIMwZ/38zIuxRGVXetiDAWRsPHslm/xWwDu3ikZRRL08GSJfwNw/qG0Qq/c j4CEd6jNI3br43GdSuNXt0Te0Lc8oEIRufYGzg8+NZ2yznmU1lRSz9zOCqLWZqhIlcoy 3t/S/hlndyacgrlUyat9SvmAkJ9nlts1jV7ftAcDgXuOOqaxCTO9mHVbvEF5B2AJ2aGm mlW4MVLZYIHXkx/OwW1rZpi7Np19FeDw0RRzI175Kj3rRCD3mUN6WGtA7bff+iPjggBs 1Hzg== X-Gm-Message-State: APt69E3TZXwATJJOjIG31K3idSmNO3htqHQfhWQMfDXTa2MhtN2ATrdn FAqR+IHVncpG/3pKsxH+bIs= X-Google-Smtp-Source: ADUXVKJHEkPzw2nzclCbeB51FTPct9G92B2Hs6nwh+ECup4DiUa0dgrLzajPtFI88iZYkWJC6lYhOQ== X-Received: by 2002:a37:8f45:: with SMTP id r66-v6mr5356792qkd.47.1528679818932; Sun, 10 Jun 2018 18:16:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Thomas Huth , Stefan Weil Date: Sun, 10 Jun 2018 22:14:48 -0300 Message-Id: <20180611011501.10235-28-f4bug@amsat.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180611011501.10235-1-f4bug@amsat.org> References: <20180611011501.10235-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:c09::235 Subject: [Qemu-devel] [PATCH v4 27/40] 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.17.1