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 1528680754514985.7498637299734; Sun, 10 Jun 2018 18:32:34 -0700 (PDT) Received: from localhost ([::1]:45778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSBhB-0001Th-PU for importer@patchew.org; Sun, 10 Jun 2018 21:32:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSBRp-0005W0-E3 for qemu-devel@nongnu.org; Sun, 10 Jun 2018 21:16:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSBRo-0003AS-CJ for qemu-devel@nongnu.org; Sun, 10 Jun 2018 21:16:41 -0400 Received: from mail-qk0-x230.google.com ([2607:f8b0:400d:c09::230]:35581) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSBRo-0003A3-7v; Sun, 10 Jun 2018 21:16:40 -0400 Received: by mail-qk0-x230.google.com with SMTP id d130-v6so12074926qkc.2; Sun, 10 Jun 2018 18:16:40 -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.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Jun 2018 18:16:39 -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=Zecdqlx+t+QjL5kIVXQiXiPtE7455TcRO//qafDt234=; b=lR49vALo/mpNJ6/IjzRaxMgto1ADnjWNIjOIb8tissJ1Rcz9XHRQ/T80CPs/yhBq/T Dt0fcZyLyxemeVh6cM9ooTm/Zk9mnaA9IerZ2Ww+HboZhz+ncQPwSlsF1dAaTA2piwcd GMNlo9UhVHEx3LMnELCS57MM8E/rGIv7X9YJF9sWp8MP5uSXRVLtsxfWX2bFE1A8ve4B QFm+j3YNJTOoAU0z8z+JbuaD9qmTyseKM8fQf6RyqC++Y4NvcNIr/e3cLbGyjhJKXWxt mQw6/6ZH59LqvlFvROLHjtuu0haML1EEo3pDSJK5a7kF1kzAPblGgxw+AGmOc2f3eVpi Ojnw== 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=Zecdqlx+t+QjL5kIVXQiXiPtE7455TcRO//qafDt234=; b=SEKWmQy/JVW1OYYBNlbFCylujjZjC+TN0oSpuVnQwAuHPqCwj8r3ae7+zRBRnHofSG sYo57t3b1oTXHSVzxtPXTJ20spxK3ntsefsOmHZ2y9cGtYJR9aKdZOLf99N+Fu6sb+/5 tyFDpKTrYWjnVluffDW5v/308GpqOwmOhwRbPL5K0V5v6qLM7x+L5BKM0pQD3MD7AH24 vqIN6OzZVUMqxPXU3Df5asitWwSrNEVCpLTZ7utSMSuMVKiRuGY6H1lqn/kPDx9IMwjd fM1QRScSYjcSpCRsMl6+OmrqqDOG/+jlfZx+zD8TDpkuR7TQ1MLgOx8DGiQFQETq7ZJ6 zDGQ== X-Gm-Message-State: APt69E1/b6wm7e/n7u/bRLNnZ9EYRNEgKilFZi9da9nqqJm4t/KODyBz meDtpGlyzvDS/ejwjEAf7Bk= X-Google-Smtp-Source: ADUXVKIoEYO87o0LYxBtDCmsspzbIlIdzsMVMJpW3ajSyb0IcH0xWYWEi8tA9aUhqwouLvHBCdLUNQ== X-Received: by 2002:a37:5f01:: with SMTP id t1-v6mr2745758qkb.231.1528679799843; Sun, 10 Jun 2018 18:16:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Thomas Huth , Stefan Weil Date: Sun, 10 Jun 2018 22:14:41 -0300 Message-Id: <20180611011501.10235-21-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::230 Subject: [Qemu-devel] [PATCH v4 20/40] hw/hppa: 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, Richard Henderson , =?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 --- hw/hppa/dino.c | 3 ++- hw/hppa/machine.c | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c index 26f2704cd5..564b938e3a 100644 --- a/hw/hppa/dino.c +++ b/hw/hppa/dino.c @@ -11,6 +11,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" #include "hw/hw.h" @@ -76,7 +77,7 @@ /* #define xxx 0x200 - bit 9 not used */ #define RS232INT 0x400 =20 -#define DINO_MEM_CHUNK_SIZE (8 * 1024 * 1024) /* 8MB */ +#define DINO_MEM_CHUNK_SIZE (8 * MiB) =20 #define DINO_PCI_HOST_BRIDGE(obj) \ OBJECT_CHECK(DinoState, (obj), TYPE_DINO_PCI_HOST_BRIDGE) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 2ba26962f9..77513223b0 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -17,7 +17,7 @@ #include "hw/timer/i8254.h" #include "hw/char/serial.h" #include "hppa_sys.h" -#include "qemu/cutils.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu/log.h" =20 @@ -178,8 +178,8 @@ static void machine_hppa_init(MachineState *machine) } qemu_log_mask(CPU_LOG_PAGE, "Kernel loaded at 0x%08" PRIx64 "-0x%08" PRIx64 ", entry at 0x%08" PRIx64 - ", size %ld kB.\n", - kernel_low, kernel_high, kernel_entry, size / 1024); + ", size %llu kB\n", + kernel_low, kernel_high, kernel_entry, size / KiB); =20 if (kernel_cmdline) { cpu[0]->env.gr[24] =3D 0x4000; @@ -203,8 +203,8 @@ static void machine_hppa_init(MachineState *machine) (1) Due to sign-extension problems and PDC, put the initrd no higher than 1G. (2) Reserve 64k for stack. */ - initrd_base =3D MIN(ram_size, 1024 * 1024 * 1024); - initrd_base =3D initrd_base - 64 * 1024; + initrd_base =3D MIN(ram_size, 1 * GiB); + initrd_base =3D initrd_base - 64 * KiB; initrd_base =3D (initrd_base - initrd_size) & TARGET_PAGE_MASK; =20 if (initrd_base < kernel_high) { --=20 2.17.1