[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 15/15] hw/riscv/sifive_u: simplify create_fdt()
|
From: |
Daniel Henrique Barboza |
|
Subject: |
[PATCH 15/15] hw/riscv/sifive_u: simplify create_fdt() |
|
Date: |
Wed, 21 Dec 2022 15:23:00 -0300 |
cmdline' isn't being used. A MachineState pointer is being retrieved via
a MACHINE() macro calling qdev_get_machine(). 'mem_size' is being set as
machine->ram_size.
Remove the 'cmdline' and 'mem_size' parameters, add MachineState as a
parameter to avoid the cast and retrieve 'mem_size' via ms->ram_size.
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
---
hw/riscv/sifive_u.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index 0c9bf7fe6a..97a561dc52 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -93,10 +93,10 @@ static const MemMapEntry sifive_u_memmap[] = {
#define OTP_SERIAL 1
#define GEM_REVISION 0x10070109
-static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,
- uint64_t mem_size, const char *cmdline, bool is_32_bit)
+static void create_fdt(MachineState *ms, SiFiveUState *s,
+ const MemMapEntry *memmap, bool is_32_bit)
{
- MachineState *ms = MACHINE(qdev_get_machine());
+ uint64_t mem_size = ms->ram_size;
void *fdt;
int cpu, fdt_size;
uint32_t *cells;
@@ -560,8 +560,7 @@ static void sifive_u_machine_init(MachineState *machine)
qemu_allocate_irq(sifive_u_machine_reset, NULL, 0));
/* create device tree */
- create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline,
- riscv_is_32bit(&s->soc.u_cpus));
+ create_fdt(machine, s, memmap, riscv_is_32bit(&s->soc.u_cpus));
if (s->start_in_flash) {
/*
--
2.38.1
- [PATCH 04/15] hw/riscv/boot.c: make riscv_find_firmware() static, (continued)
- [PATCH 04/15] hw/riscv/boot.c: make riscv_find_firmware() static, Daniel Henrique Barboza, 2022/12/21
- [PATCH 06/15] hw/riscv/spike.c: load initrd right after riscv_load_kernel(), Daniel Henrique Barboza, 2022/12/21
- [PATCH 07/15] hw/riscv: write initrd 'chosen' FDT inside riscv_load_initrd(), Daniel Henrique Barboza, 2022/12/21
- [PATCH 08/15] hw/riscv: write bootargs 'chosen' FDT after riscv_load_kernel(), Daniel Henrique Barboza, 2022/12/21
- [PATCH 09/15] hw/riscv/boot.c: use MachineState in riscv_load_initrd(), Daniel Henrique Barboza, 2022/12/21
- [PATCH 10/15] hw/riscv/boot.c: use MachineState in riscv_load_kernel(), Daniel Henrique Barboza, 2022/12/21
- [PATCH 11/15] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel(), Daniel Henrique Barboza, 2022/12/21
- [PATCH 12/15] hw/riscv/boot.c: make riscv_load_initrd() static, Daniel Henrique Barboza, 2022/12/21
- [PATCH 13/15] hw/riscv/spike.c: simplify create_fdt(), Daniel Henrique Barboza, 2022/12/21
- [PATCH 14/15] hw/riscv/virt.c: simplify create_fdt(), Daniel Henrique Barboza, 2022/12/21
- [PATCH 15/15] hw/riscv/sifive_u: simplify create_fdt(),
Daniel Henrique Barboza <=