Re: [PULL 70/72] ppc/amigaone: Add kernel and initrd support

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

Hi,

On 11/3/25 13:58, Nicholas Piggin wrote:
> From: BALATON Zoltan <balaton@eik.bme.hu>
> 
> Add support for -kernel, -initrd and -append command line options.
> 
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
> Message-ID: <489b1be5d95d5153e924c95b0691b8b53f9ffb9e.1740673173.git.balaton@eik.bme.hu>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> ---
>   hw/ppc/amigaone.c | 113 +++++++++++++++++++++++++++++++++++++++++++++-
>   1 file changed, 112 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/ppc/amigaone.c b/hw/ppc/amigaone.c
> index 1c6f2a944d..359f5fa125 100644
> --- a/hw/ppc/amigaone.c
> +++ b/hw/ppc/amigaone.c


> @@ -301,6 +362,56 @@ static void amigaone_init(MachineState *machine)
>       }
>       pci_ide_create_devs(PCI_DEVICE(object_resolve_path_component(via, "ide")));
>       pci_vga_init(pci_bus);
> +
> +    if (!machine->kernel_filename) {
> +        return;
> +    }
> +
> +    /* handle -kernel, -initrd, -append options and emulate U-Boot */
> +    bi = g_new0(struct boot_info, 1);
> +    cpu->env.load_info = bi;
> +
> +    loadaddr = MIN(machine->ram_size, 256 * MiB);
> +    bi->bd_info = loadaddr - 8 * MiB;
> +    create_bd_info(bi->bd_info, machine->ram_size);
> +    bi->stack = bi->bd_info - 64 * KiB - 8;
> +
> +    if (machine->kernel_cmdline && machine->kernel_cmdline[0]) {
> +        size_t len = strlen(machine->kernel_cmdline);
> +
> +        loadaddr = bi->bd_info + 1 * MiB;
> +        cpu_physical_memory_write(loadaddr, machine->kernel_cmdline, len + 1);

This patch introduces a call to a legacy API (documented since at least
2017 in commit b7ecba0f6f6: "docs/devel/loads-stores.rst: Document our
various load and store APIs"). Can we load via &address_space_memory
instead?

> +        bi->cmdline_start = loadaddr;
> +        bi->cmdline_end = loadaddr + len + 1; /* including terminating '\0' */
> +    }
> +
> +    sz = load_elf(machine->kernel_filename, NULL, NULL, NULL,
> +                  &bi->entry, &loadaddr, NULL, NULL,
> +                  ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
> +    if (sz <= 0) {
> +        sz = load_uimage(machine->kernel_filename, &bi->entry, &loadaddr,
> +                         NULL, NULL, NULL);
> +    }
> +    if (sz <= 0) {
> +        error_report("Could not load kernel '%s'",
> +                     machine->kernel_filename);
> +        exit(1);
> +    }
> +    loadaddr += sz;
> +
> +    if (machine->initrd_filename) {
> +        loadaddr = ROUND_UP(loadaddr + 4 * MiB, 4 * KiB);
> +        loadaddr = MAX(loadaddr, INITRD_MIN_ADDR);
> +        sz = load_image_targphys(machine->initrd_filename, loadaddr,
> +                                 bi->bd_info - loadaddr);
> +        if (sz <= 0) {
> +            error_report("Could not load initrd '%s'",
> +                         machine->initrd_filename);
> +            exit(1);
> +        }
> +        bi->initrd_start = loadaddr;
> +        bi->initrd_end = loadaddr + sz;
> +    }
>   }
>   
>   static void amigaone_machine_init(MachineClass *mc)