[v2,12/30] hw/hppa: use the BYTE-based definitions

Message ID	20180305112732.26471-13-f4bug@amsat.org
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> To: qemu-trivial@nongnu.org Date: Mon, 5 Mar 2018 08:27:14 -0300 Message-Id: <20180305112732.26471-13-f4bug@amsat.org> In-Reply-To: <20180305112732.26471-1-f4bug@amsat.org> References: <20180305112732.26471-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2 12/30] hw/hppa: use the BYTE-based definitions Precedence: list Cc: Richard Henderson <rth@twiddle.net>, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= <f4bug@amsat.org>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	hw: use the BYTE-based definitions when useful \| expand [v2,00/30] hw: use the BYTE-based definitions when useful [v2,01/30] util/cutils: extract byte-based definitions into a new header: "qemu/cunits.h" [RFC,v2,02/30] hw: include "qemu/cunits.h" and clean unused "qemu/cutils.h" [v2,03/30] hw/block/nvme: include the "qemu/cutils.h" in the source file [v2,04/30] hw/lm32/milkymist: remove unused include [v2,05/30] hw/mips/r4k: constify params_size [v2,06/30] hw/mips: use the BYTE-based definitions [v2,07/30] hw/arm: use the BYTE-based definitions [v2,08/30] hw/i386: use the BYTE-based definitions [v2,09/30] hw/sparc: use the BYTE-based definitions [v2,10/30] hw/ppc: use the BYTE-based definitions [v2,11/30] hw/s390x: use the BYTE-based definitions [v2,12/30] hw/hppa: use the BYTE-based definitions [v2,13/30] hw/xtensa: use the BYTE-based definitions [v2,14/30] hw/alpha: use the BYTE-based definitions [v2,15/30] hw/lm32: use the BYTE-based definitions [v2,16/30] hw/sh4: use the BYTE-based definitions [v2,17/30] hw/tricore: use the BYTE-based definitions [v2,18/30] hw/microblaze: use the BYTE-based definitions [v2,19/30] hw/nios2: use the BYTE-based definitions [v2,20/30] hw/cris: use the BYTE-based definitions [v2,21/30] hw/misc: use the BYTE-based definitions [v2,23/30] hw/net: use the BYTE-based definitions [v2,24/30] hw/ipack: use the BYTE-based definitions [v2,25/30] hw/scsi: use the BYTE-based definitions [v2,26/30] hw/smbios: use the BYTE-based definitions [v2,27/30] vfio/pci: use the BYTE-based definitions [v2,28/30] ivshmem: use the BYTE-based definitions [v2,29/30] tpm: use the BYTE-based definitions [v2,30/30] xen: use the BYTE-based definitions

Message ID

20180305112732.26471-13-f4bug@amsat.org

State

New

Headers

From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
To: qemu-trivial@nongnu.org
Date: Mon,  5 Mar 2018 08:27:14 -0300
Message-Id: <20180305112732.26471-13-f4bug@amsat.org>
In-Reply-To: <20180305112732.26471-1-f4bug@amsat.org>
References: <20180305112732.26471-1-f4bug@amsat.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH v2 12/30] hw/hppa: use the BYTE-based
	definitions
Precedence: list
Cc: Richard Henderson <rth@twiddle.net>, =?utf-8?q?Philippe_Mathieu-Daud?=
	=?utf-8?b?w6k=?= <f4bug@amsat.org>, 	qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

hw: use the BYTE-based definitions when useful | expand

Commit Message

Philippe Mathieu-Daudé March 5, 2018, 11:27 a.m. UTC

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é <f4bug@amsat.org>
---
 hw/hppa/dino.c    | 2 +-
 hw/hppa/machine.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c
index 15aefde09c..7728123cc8 100644
--- a/hw/hppa/dino.c
+++ b/hw/hppa/dino.c
@@ -76,7 +76,7 @@ 
 /* #define xxx    0x200 - bit 9 not used */
 #define RS232INT  0x400
 
-#define DINO_MEM_CHUNK_SIZE (8 * 1024 * 1024) /* 8MB */
+#define DINO_MEM_CHUNK_SIZE (8 * M_BYTE)
 
 #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 22a15112df..8fd364ad43 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -177,8 +177,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 / K_BYTE);
 
         if (kernel_cmdline) {
             cpu[0]->env.gr[24] = 0x4000;
@@ -202,8 +202,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 = MIN(ram_size, 1024 * 1024 * 1024);
-            initrd_base = initrd_base - 64 * 1024;
+            initrd_base = MIN(ram_size, 1 * G_BYTE);
+            initrd_base = initrd_base - 64 * K_BYTE;
             initrd_base = (initrd_base - initrd_size) & TARGET_PAGE_MASK;
 
             if (initrd_base < kernel_high) {