Re: [PATCH 03/10] hw/riscv/sifive_u.c: simplify create_fdt()

[Alistair Francis]

On Thu, Jan 12, 2023 at 3:25 AM Daniel Henrique Barboza
<dbarboza@ventanamicro.com> wrote:
>
> '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: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  hw/riscv/sifive_u.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
> index 9a75d4aa62..ccad386920 100644
> --- a/hw/riscv/sifive_u.c
> +++ b/hw/riscv/sifive_u.c
> @@ -94,9 +94,10 @@ static const MemMapEntry sifive_u_memmap[] = {
>  #define GEM_REVISION        0x10070109
>
>  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;
>      int cpu, fdt_size;
>      uint32_t *cells;
> @@ -560,8 +561,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(s, memmap, riscv_is_32bit(&s->soc.u_cpus));
>
>      if (s->start_in_flash) {
>          /*
> --
> 2.39.0
>
>