mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/riscv/sifive_u.c: simplify create_fdt()

Browse Source 
'cmdline' isn't being used. Remove it.

A MachineState pointer is being retrieved via a MACHINE() macro calling
qdev_get_machine(). Use MACHINE(s) instead to avoid calling qdev().

 'mem_size' is being set as machine->ram_size by the caller. Retrieve it
via ms->ram_size.

Cc: Palmer Dabbelt <palmer@dabbelt.com>
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20230111170948.316276-4-dbarboza@ventanamicro.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Daniel Henrique Barboza 2023-01-11 14:09:41 -03:00 committed by Alistair Francis
parent cdb785683a
commit f5be2ccb43
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/riscv/sifive_u.c
View File

@ -94,9 +94,10 @@ static const MemMapEntry sifive_u_memmap[] = {
#define GEM_REVISION 0x10070109 #define GEM_REVISION 0x10070109
static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap, static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,
uint64_t mem_size, const char *cmdline, bool is_32_bit) bool is_32_bit)
{ {
MachineState *ms = MACHINE(qdev_get_machine()); MachineState *ms = MACHINE(s);
uint64_t mem_size = ms->ram_size;
void *fdt; void *fdt;
int cpu, fdt_size; int cpu, fdt_size;
uint32_t *cells; uint32_t *cells;
@ -560,8 +561,7 @@ static void sifive_u_machine_init(MachineState *machine)
qemu_allocate_irq(sifive_u_machine_reset, NULL, 0)); qemu_allocate_irq(sifive_u_machine_reset, NULL, 0));
/* create device tree */ /* create device tree */
create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline, create_fdt(s, memmap, riscv_is_32bit(&s->soc.u_cpus));
riscv_is_32bit(&s->soc.u_cpus));
if (s->start_in_flash) { if (s->start_in_flash) {
/* /*