[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/47] hw/xtensa: Use the IEC binary prefix definitio
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 23/47] hw/xtensa: Use the IEC binary prefix definitions |
Date: |
Sat, 30 Jun 2018 08:10:16 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
It eases code review, unit is explicit.
Patch generated using:
$ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/
$ git grep -n '[<>][<>]= ?[1-5]0'
and modified manually.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Max Filippov <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/xtensa/xtfpga.c | 9 +++++----
target/xtensa/helper.c | 5 +++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 5dc1303..b3161de 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -26,6 +26,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/units.h"
#include "qapi/error.h"
#include "cpu.h"
#include "sysemu/sysemu.h"
@@ -152,7 +153,7 @@ static void xtfpga_net_init(MemoryRegion *address_space,
sysbus_mmio_get_region(s, 1));
ram = g_malloc(sizeof(*ram));
- memory_region_init_ram_nomigrate(ram, OBJECT(s), "open_eth.ram", 16384,
+ memory_region_init_ram_nomigrate(ram, OBJECT(s), "open_eth.ram", 16 * KiB,
&error_fatal);
vmstate_register_ram_global(ram);
memory_region_add_subregion(address_space, buffers, ram);
@@ -229,7 +230,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board,
MachineState *machine)
const char *kernel_cmdline = qemu_opt_get(machine_opts, "append");
const char *dtb_filename = qemu_opt_get(machine_opts, "dtb");
const char *initrd_filename = qemu_opt_get(machine_opts, "initrd");
- const unsigned system_io_size = 224 * 1024 * 1024;
+ const unsigned system_io_size = 224 * MiB;
int n;
for (n = 0; n < smp_cpus; n++) {
@@ -342,7 +343,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board,
MachineState *machine)
cpu_physical_memory_write(cur_lowmem, fdt, fdt_size);
cur_tagptr = put_tag(cur_tagptr, BP_TAG_FDT,
sizeof(dtb_addr), &dtb_addr);
- cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + fdt_size, 4096);
+ cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + fdt_size, 4 * KiB);
}
#else
if (dtb_filename) {
@@ -370,7 +371,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board,
MachineState *machine)
initrd_location.end = tswap32(cur_lowmem + initrd_size);
cur_tagptr = put_tag(cur_tagptr, BP_TAG_INITRD,
sizeof(initrd_location), &initrd_location);
- cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + initrd_size, 4096);
+ cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + initrd_size, 4 * KiB);
}
cur_tagptr = put_tag(cur_tagptr, BP_TAG_LAST, 0, NULL);
env->regs[2] = tagptr;
diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c
index 34844ee..c9a6132 100644
--- a/target/xtensa/helper.c
+++ b/target/xtensa/helper.c
@@ -26,6 +26,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/units.h"
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/gdbstub.h"
@@ -726,10 +727,10 @@ static void dump_tlb(FILE *f, fprintf_function
cpu_fprintf,
bool print_header = true;
if (sz >= 0x100000) {
- sz >>= 20;
+ sz /= MiB;
sz_text = "MB";
} else {
- sz >>= 10;
+ sz /= KiB;
sz_text = "KB";
}
--
1.8.3.1
- [Qemu-devel] [PULL 18/47] hw/riscv: Use the IEC binary prefix definitions, (continued)
- [Qemu-devel] [PULL 18/47] hw/riscv: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 19/47] hw/m68k: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 14/47] hw/tpm: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 16/47] hw/display: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 15/47] hw/block: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 22/47] hw/hppa: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 25/47] hw/tricore: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 20/47] hw/sparc: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 24/47] hw/alpha: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 26/47] hw/microblaze: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 23/47] hw/xtensa: Use the IEC binary prefix definitions,
Paolo Bonzini <=
- [Qemu-devel] [PULL 27/47] hw/nios2: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 21/47] hw/s390x: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 28/47] hw/cris: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 29/47] hw/lm32: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 30/47] hw/sh4: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 31/47] hw/mips/r4k: Constify params_size, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 34/47] hw/i386: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 32/47] hw/mips: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 35/47] hw/net: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 36/47] hw/usb: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30