From nobody Fri Oct 24 20:17:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of _spf.google.com designates 209.85.220.193 as permitted sender) client-ip=209.85.220.193; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-qk0-f193.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of _spf.google.com designates 209.85.220.193 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by mx.zohomail.com with SMTPS id 1518668982034749.0598895085271; Wed, 14 Feb 2018 20:29:42 -0800 (PST) Received: by mail-qk0-f193.google.com with SMTP id h129so9489714qke.8 for ; Wed, 14 Feb 2018 20:29:41 -0800 (PST) Return-Path: Return-Path: Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:40 -0800 (PST) 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=cHo3IqmJnidyW8qrMtzClvncOVx94DO22vcee+MWuHM=; b=Hjccw0zqn7jjL1NqJq78YVHBeGoMsieZFyD/pvqdNVzxmk5Jbss9jgt58rejH8/VoN lOjFSEI83IPU+0GWSoCyZvfof3RFTUaNVD9XYhHmfavwVfV3cIpDgubVQe6gUATrzPQt XX/gmgGgcTvDmMaJ1VSDRi2h6WVx8zJWRmM7fLjhNg3eNOK9TEWfXNqqaD19CeFP6Lo6 2kh1lXlWt97Z+ac7uS94wibxAosCfm7CzF6ua7j5sOg+bxF/torZsx7iFhA8EwSOoEgS LoYETXnAM5tDrSD5syI/dhVKxDpne3Zhl3ygL/iSZgcghzl7FbAMe21TPM6dt4AMMdR+ RUvQ== 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=cHo3IqmJnidyW8qrMtzClvncOVx94DO22vcee+MWuHM=; b=fHwFp1p8K0ZANIlGai5LWv7xXu+fFXdpAfN/sGDOX6Kavb2DCN+ldPfhiVIh7PJOYw j+O56YEGFI9a2FY72YWMcIEisWbQFy1lNOO4W9sjF8P1yTdxlX4eFt9KqUJSl4HluzQv eN7NeH8khJgJQfwbeh0wYhoWkJk4tMW+vbcnn+obKjLVxtPME1lvSBm96ijKlo8SnTgt RTEQ+reonSXyeB8rvj67pAy9xDJ+UyGo/LJAYoLce5YxlVEvzJ2zUSYGtsECe9m81cbD 1bvEewY3sjdTFnjbd0qrUkZvZYWCIc4fUblMnqZqWEUo264AkC6VrKFzHbOm6kIHla5q W5tw== X-Gm-Message-State: APf1xPB4Pt1ZTk7RAl5NIRsNYEdAPVUjc8C8LmxDZe6Yw+wBpZfQgYAd coz0rOT1863ctsu5PDEXh2w= X-Google-Smtp-Source: AH8x227kKVn0E5LfuRDDc+V0t+TAgxHbuWCFH9GKbfV+BPxBJth1us7bnaIBy60nTkHCMSo5JqyAZQ== X-Received: by 10.55.138.68 with SMTP id m65mr2132902qkd.166.1518668981169; Wed, 14 Feb 2018 20:29:41 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabien Chouteau , Mark Cave-Ayland , Artyom Tarasenko Subject: [PATCH 09/30] hw/sparc: use the BYTE-based definitions Date: Thu, 15 Feb 2018 01:28:39 -0300 Message-Id: <20180215042900.16078-10-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZohoMail: RDKM_0 RSF_0 Z_629925259 SPT_0 It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc/leon3.c | 8 ++++---- hw/sparc/sun4m.c | 7 +++---- hw/sparc64/niagara.c | 2 +- hw/sparc64/sun4u.c | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index bba3aa3dee..31be3f32b0 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -139,9 +139,9 @@ static void leon3_generic_hw_init(MachineState *machine) env->qemu_irq_ack =3D leon3_irq_manager; =20 /* Allocate RAM */ - if ((uint64_t)ram_size > (1UL << 30)) { - error_report("Too much memory for this machine: %d, maximum 1G", - (unsigned int)(ram_size / (1024 * 1024))); + if (ram_size > 1 * G_BYTE) { + error_report("Too much memory for this machine: %lluMB, maximum 1G= ", + ram_size / M_BYTE); exit(1); } =20 @@ -149,7 +149,7 @@ static void leon3_generic_hw_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0x40000000, ram); =20 /* Allocate BIOS */ - prom_size =3D 8 * 1024 * 1024; /* 8Mb */ + prom_size =3D 8 * M_BYTE; memory_region_init_ram(prom, NULL, "Leon3.bios", prom_size, &error_fat= al); memory_region_set_readonly(prom, true); memory_region_add_subregion(address_space_mem, 0x00000000, prom); diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 0008b90b04..40f4e0c883 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -66,7 +66,7 @@ #define KERNEL_LOAD_ADDR 0x00004000 #define CMDLINE_ADDR 0x007ff000 #define INITRD_LOAD_ADDR 0x00800000 -#define PROM_SIZE_MAX (1024 * 1024) +#define PROM_SIZE_MAX (1 * M_BYTE) #define PROM_VADDR 0xffd00000 #define PROM_FILENAME "openbios-sparc32" #define CFG_ADDR 0xd00000510ULL @@ -744,9 +744,8 @@ static void ram_init(hwaddr addr, ram_addr_t RAM_size, =20 /* allocate RAM */ if ((uint64_t)RAM_size > max_mem) { - error_report("Too much memory for this machine: %d, maximum %d", - (unsigned int)(RAM_size / (1024 * 1024)), - (unsigned int)(max_mem / (1024 * 1024))); + error_report("Too much memory for this machine: %llu, maximum %llu= ", + RAM_size / M_BYTE, max_mem / M_BYTE); exit(1); } dev =3D qdev_create(NULL, "memory"); diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 1874477ef6..97a78ca9a2 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -84,7 +84,7 @@ typedef struct NiagaraBoardState { #define NIAGARA_PROM_BASE 0xfff0000000ULL #define NIAGARA_Q_OFFSET 0x10000ULL #define NIAGARA_OBP_OFFSET 0x80000ULL -#define PROM_SIZE_MAX (4 * 1024 * 1024) +#define PROM_SIZE_MAX (4 * M_BYTE) =20 static void add_rom_or_fail(const char *file, const hwaddr addr) { diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index b84589e0b6..7a39ec7859 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -53,7 +53,7 @@ =20 #define KERNEL_LOAD_ADDR 0x00404000 #define CMDLINE_ADDR 0x003ff000 -#define PROM_SIZE_MAX (4 * 1024 * 1024) +#define PROM_SIZE_MAX (4 * M_BYTE) #define PROM_VADDR 0x000ffd00000ULL #define PBM_SPECIAL_BASE 0x1fe00000000ULL #define PBM_MEM_BASE 0x1ff00000000ULL --=20 2.16.1