[v3,24/41] hw/microblaze: Use the BYTE-based definitions

Message ID	20180415234307.28132-25-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, Thomas Huth <thuth@redhat.com> Date: Sun, 15 Apr 2018 20:42:50 -0300 Message-Id: <20180415234307.28132-25-f4bug@amsat.org> In-Reply-To: <20180415234307.28132-1-f4bug@amsat.org> References: <20180415234307.28132-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v3 24/41] hw/microblaze: Use the BYTE-based definitions Precedence: list Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= <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 [v3,00/41] hw: Use the BYTE-based definitions when useful [v3,01/41] hw: Clean "hw/devices.h" includes [v3,02/41] hw: Do not include "sysemu/block-backend.h" if it is not necessary [v3,03/41] hw/block/nvme: Include the "qemu/cutils.h" in the source file [v3,04/41] hw/misc/mips_itu: Sort includes [v3,05/41] hw/mips/r4k: Constify params_size [v3,06/41] cutils: Extract byte-based definitions into a new header: "qemu/units.h" [v3,07/41] hw/ivshmem: Use the BYTE-based definitions [v3,08/41] hw/ipack: Use the BYTE-based definitions [v3,09/41] hw/scsi: Use the BYTE-based definitions [v3,10/41] hw/smbios: Use the BYTE-based definitions [v3,11/41] hw/xen: Use the BYTE-based definitions [v3,12/41] hw/tpm: Use the BYTE-based definitions [v3,13/41] hw/block: Use the BYTE-based definitions [v3,15/41] hw/misc: Use the BYTE-based definitions [v3,16/41] hw/riscv: Use the BYTE-based definitions [v3,17/41] hw/m68k: Use the BYTE-based definitions [v3,18/41] hw/sparc: Use the BYTE-based definitions [v3,19/41] hw/s390x: Use the BYTE-based definitions [v3,20/41] hw/hppa: Use the BYTE-based definitions [v3,21/41] hw/xtensa: Use the BYTE-based definitions [v3,22/41] hw/alpha: Use the BYTE-based definitions [v3,23/41] hw/tricore: Use the BYTE-based definitions [v3,24/41] hw/microblaze: Use the BYTE-based definitions [v3,25/41] hw/nios2: Use the BYTE-based definitions [v3,26/41] hw/cris: Use the BYTE-based definitions [v3,27/41] hw/lm32: Use the BYTE-based definitions [v3,28/41] hw/sh4: Use the BYTE-based definitions [v3,29/41] hw/mips: Use the BYTE-based definitions [v3,30/41] hw/arm: Use the BYTE-based definitions [v3,33/41] hw/net: Use the BYTE-based definitions [v3,34/41] hw/usb: Use the BYTE-based definitions [v3,35/41] hw/sd: Use the BYTE-based definitions [v3,36/41] hw/vfio: Use the BYTE-based definitions [v3,37/41] hw/virtio: Use the BYTE-based definitions [v3,38/41] hw/rdma: Use the BYTE-based definitions [v3,39/41] hw/nvdimm: Use the BYTE-based definitions [v3,40/41] hw/loader: Use the BYTE-based definitions [v3,41/41] cutils: Do not include "qemu/units.h" directly

Message ID

20180415234307.28132-25-f4bug@amsat.org

State

New

Headers

From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
To: qemu-trivial@nongnu.org,
	Thomas Huth <thuth@redhat.com>
Date: Sun, 15 Apr 2018 20:42:50 -0300
Message-Id: <20180415234307.28132-25-f4bug@amsat.org>
In-Reply-To: <20180415234307.28132-1-f4bug@amsat.org>
References: <20180415234307.28132-1-f4bug@amsat.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH v3 24/41] hw/microblaze: Use the BYTE-based
	definitions
Precedence: list
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, =?utf-8?q?Philippe_Mat?=
	=?utf-8?q?hieu-Daud=C3=A9?= <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é April 15, 2018, 11:42 p.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/microblaze/petalogix_ml605_mmu.c      | 7 ++++---
 hw/microblaze/petalogix_s3adsp1800_mmu.c | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index b664dc0f9c..5c4fe2345c 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -26,6 +26,7 @@ 
  */
 
 #include "qemu/osdep.h"
+#include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "cpu.h"
@@ -45,8 +46,8 @@ 
 
 #include "hw/stream.h"
 
-#define LMB_BRAM_SIZE  (128 * 1024)
-#define FLASH_SIZE     (32 * 1024 * 1024)
+#define LMB_BRAM_SIZE  (128 * K_BYTE)
+#define FLASH_SIZE     (32 * M_BYTE)
 
 #define BINARY_DEVICE_TREE_FILE "petalogix-ml605.dtb"
 
@@ -110,7 +111,7 @@  petalogix_ml605_init(MachineState *machine)
     pflash_cfi01_register(FLASH_BASEADDR,
                           NULL, "petalogix_ml605.flash", FLASH_SIZE,
                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
-                          (64 * 1024), FLASH_SIZE >> 16,
+                          64 * K_BYTE, FLASH_SIZE >> 16,
                           2, 0x89, 0x18, 0x0000, 0x0, 0);
 
 
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 5cb4deb69e..32e73a589f 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -24,6 +24,7 @@ 
  */
 
 #include "qemu/osdep.h"
+#include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "cpu.h"
@@ -40,8 +41,8 @@ 
 
 #include "boot.h"
 
-#define LMB_BRAM_SIZE  (128 * 1024)
-#define FLASH_SIZE     (16 * 1024 * 1024)
+#define LMB_BRAM_SIZE  (128 * K_BYTE)
+#define FLASH_SIZE     (16 * M_BYTE)
 
 #define BINARY_DEVICE_TREE_FILE "petalogix-s3adsp1800.dtb"
 
@@ -88,7 +89,7 @@  petalogix_s3adsp1800_init(MachineState *machine)
     pflash_cfi01_register(FLASH_BASEADDR,
                           NULL, "petalogix_s3adsp1800.flash", FLASH_SIZE,
                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
-                          (64 * 1024), FLASH_SIZE >> 16,
+                          64 * K_BYTE, FLASH_SIZE >> 16,
                           1, 0x89, 0x18, 0x0000, 0x0, 1);
 
     dev = qdev_create(NULL, "xlnx.xps-intc");