On Thu, Oct 16, 2025 at 09:27:36PM +0200, BALATON Zoltan wrote:
> On Thu, 16 Oct 2025, Vishal Chourasia wrote:
> > Pass errp to load_image_targphys() calls in ppc machine initialization
> > to capture detailed error information when loading firmware, kernel,
> > and initrd images.
> >
> > Use error_reportf_err() instead of error_report() to print the
> > underlying error details along with context about which image failed
> > to load.
> >
<snipped>
> > diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
> > index 7fa14fd0e6..d4703f79da 100644
> > --- a/hw/ppc/pegasos2.c
> > +++ b/hw/ppc/pegasos2.c
> > @@ -129,6 +129,7 @@ static void pegasos2_init(MachineState *machine)
> > int i;
> > ssize_t sz;
> > uint8_t *spd_data;
> > + Error *errp = NULL;
> >
> > /* init CPU */
> > pm->cpu = POWERPC_CPU(cpu_create(machine->cpu_type));
> > @@ -164,10 +165,10 @@ static void pegasos2_init(MachineState *machine)
> > ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
> > if (sz <= 0) {
> > sz = load_image_targphys(filename, pm->vof ? 0 : PROM_ADDR,
> > PROM_SIZE,
> > - NULL);
> > + &errp);
> > }
> > if (sz <= 0 || sz > PROM_SIZE) {
> > - error_report("Could not load firmware '%s'", filename);
> > + error_reportf_err(errp, "Could not load firmware '%s': ",
> > filename);
>
> We can get here with *errp == NULL if load_elf did not fail but tried to
> load a too large image. Is that a problem? It's the same in prep.c. Mac
> machines also try different formats but those only check for size < 0 so
> maybe not a problem there.
>
/* return < 0 if error, otherwise the number of bytes loaded in memory */
ssize_t load_elf(const char *filename,
load_elf returns number of bytes.
Yes, this is a problem. If load_elf() succeeds but the returned value
is greater than PROM_SIZE, then *errp == NULL and this would cause a
segmentation fault when trying to report the error.
Any location where an error check is performed based on a condition
other than *errp (such as size checks) runs the risk of segmentation
fault.
> > exit(1);
> > }
> > g_free(filename);
> > @@ -260,10 +261,10 @@ static void pegasos2_init(MachineState *machine)
> > pm->initrd_addr = ROUND_UP(pm->initrd_addr, 4);
> > pm->initrd_addr = MAX(pm->initrd_addr, INITRD_MIN_ADDR);
> > sz = load_image_targphys(machine->initrd_filename, pm->initrd_addr,
> > - machine->ram_size - pm->initrd_addr,
> > NULL);
> > + machine->ram_size - pm->initrd_addr,
> > &errp);
> > if (sz <= 0) {
> > - error_report("Could not load initrd '%s'",
> > - machine->initrd_filename);
> > + error_reportf_err(errp, "Could not load initrd '%s': ",
> > + machine->initrd_filename);
> > exit(1);
> > }
> > pm->initrd_size = sz;
> > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> > index a3e5203970..88668a700e 100644
> > --- a/hw/ppc/pnv.c
> > +++ b/hw/ppc/pnv.c
> > @@ -1015,6 +1015,7 @@ static void pnv_init(MachineState *machine)
> > char *chip_typename;
> > DriveInfo *pnor;
> > DeviceState *dev;
> > + Error *errp = NULL;
> >
> > if (kvm_enabled()) {
> > error_report("machine %s does not support the KVM accelerator",
> > @@ -1069,9 +1070,10 @@ static void pnv_init(MachineState *machine)
> > }
> >
> > fw_size = load_image_targphys(fw_filename, pnv->fw_load_addr,
> > FW_MAX_SIZE,
> > - NULL);
> > + &errp);
> > if (fw_size < 0) {
> > - error_report("Could not load OPAL firmware '%s'", fw_filename);
> > + error_reportf_err(errp, "Could not load OPAL firmware '%s': ",
> > + fw_filename);
> > exit(1);
> > }
> > g_free(fw_filename);
> > @@ -1082,10 +1084,10 @@ static void pnv_init(MachineState *machine)
> >
> > kernel_size = load_image_targphys(machine->kernel_filename,
> > KERNEL_LOAD_ADDR, KERNEL_MAX_SIZE,
> > - NULL);
> > + &errp);
> > if (kernel_size < 0) {
> > - error_report("Could not load kernel '%s'",
> > - machine->kernel_filename);
> > + error_reportf_err(errp, "Could not load kernel '%s': ",
> > + machine->kernel_filename);
> > exit(1);
> > }
> > }
> > @@ -1094,10 +1096,10 @@ static void pnv_init(MachineState *machine)
> > if (machine->initrd_filename) {
> > pnv->initrd_base = INITRD_LOAD_ADDR;
> > pnv->initrd_size = load_image_targphys(machine->initrd_filename,
> > - pnv->initrd_base, INITRD_MAX_SIZE, NULL);
> > + pnv->initrd_base, INITRD_MAX_SIZE,
> > &errp);
> > if (pnv->initrd_size < 0) {
> > - error_report("Could not load initial ram disk '%s'",
> > - machine->initrd_filename);
> > + error_reportf_err(errp, "Could not load initial ram disk '%s':
> > ",
> > + machine->initrd_filename);
> > exit(1);
> > }
> > }
> > diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
> > index 7c66912c10..9e55e56ee0 100644
> > --- a/hw/ppc/ppc440_bamboo.c
> > +++ b/hw/ppc/ppc440_bamboo.c
> > @@ -141,6 +141,7 @@ static void bamboo_init(MachineState *machine)
> > DeviceState *uicdev;
> > SysBusDevice *uicsbd;
> > int success;
> > + Error *errp = NULL;
> >
> > if (kvm_enabled()) {
> > error_report("machine %s does not support the KVM accelerator",
> > @@ -243,11 +244,11 @@ static void bamboo_init(MachineState *machine)
> > if (initrd_filename) {
> > initrd_size = load_image_targphys(initrd_filename, RAMDISK_ADDR,
> > machine->ram_size - RAMDISK_ADDR,
> > - NULL);
> > + &errp);
> >
> > if (initrd_size < 0) {
> > - error_report("could not load ram disk '%s' at %x",
> > - initrd_filename, RAMDISK_ADDR);
> > + error_reportf_err(errp, "could not load ram disk '%s' at %x: ",
> > + initrd_filename, RAMDISK_ADDR);
> > exit(1);
> > }
> > }
> > diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
> > index edd3da7102..f8cf6dc16e 100644
> > --- a/hw/ppc/prep.c
> > +++ b/hw/ppc/prep.c
> > @@ -250,6 +250,7 @@ static void ibm_40p_init(MachineState *machine)
> > uint32_t kernel_base = 0, initrd_base = 0;
> > long kernel_size = 0, initrd_size = 0;
> > char boot_device;
> > + Error *errp = NULL;
> >
> > if (kvm_enabled()) {
> > error_report("machine %s does not support the KVM accelerator",
> > @@ -280,10 +281,10 @@ static void ibm_40p_init(MachineState *machine)
> > bios_size = load_elf(filename, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
> > ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
> > if (bios_size < 0) {
> > - bios_size = load_image_targphys(filename, BIOS_ADDR, BIOS_SIZE,
> > NULL);
> > + bios_size = load_image_targphys(filename, BIOS_ADDR, BIOS_SIZE,
> > &errp);
> > }
> > if (bios_size < 0 || bios_size > BIOS_SIZE) {
> > - error_report("Could not load bios image '%s'", filename);
> > + error_reportf_err(errp, "Could not load bios image '%s': ",
> > filename);
> > return;
> > }
> > g_free(filename);
> > @@ -381,10 +382,10 @@ static void ibm_40p_init(MachineState *machine)
> > kernel_size = load_image_targphys(machine->kernel_filename,
> > kernel_base,
> > machine->ram_size - kernel_base,
> > - NULL);
> > + &errp);
> > if (kernel_size < 0) {
> > - error_report("could not load kernel '%s'",
> > - machine->kernel_filename);
> > + error_reportf_err(errp, "could not load kernel '%s': ",
> > + machine->kernel_filename);
> > exit(1);
> > }
> > fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, kernel_base);
> > @@ -395,10 +396,10 @@ static void ibm_40p_init(MachineState *machine)
> > initrd_size = load_image_targphys(machine->initrd_filename,
> > initrd_base,
> > machine->ram_size -
> > initrd_base,
> > - NULL);
> > + &errp);
> > if (initrd_size < 0) {
> > - error_report("could not load initial ram disk '%s'",
> > - machine->initrd_filename);
> > + error_reportf_err(errp, "could not load initial ram disk
> > '%s': ",
> > + machine->initrd_filename);
> > exit(1);
> > }
> > fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_ADDR, initrd_base);
> > diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
> > index 68d3eacbff..a5cb8e0738 100644
> > --- a/hw/ppc/sam460ex.c
> > +++ b/hw/ppc/sam460ex.c
> > @@ -262,6 +262,7 @@ static void sam460ex_init(MachineState *machine)
> > struct boot_info *boot_info;
> > uint8_t *spd_data;
> > int success;
> > + Error *errp = NULL;
> >
> > cpu = POWERPC_CPU(cpu_create(machine->cpu_type));
> > env = &cpu->env;
> > @@ -495,10 +496,10 @@ static void sam460ex_init(MachineState *machine)
> > initrd_size = load_image_targphys(machine->initrd_filename,
> > RAMDISK_ADDR,
> > machine->ram_size - RAMDISK_ADDR,
> > - NULL);
> > + &errp);
> > if (initrd_size < 0) {
> > - error_report("could not load ram disk '%s' at %x",
> > - machine->initrd_filename, RAMDISK_ADDR);
> > + error_reportf_err(errp, "could not load ram disk '%s' at %x: ",
> > + machine->initrd_filename, RAMDISK_ADDR);
> > exit(1);
> > }
> > }
> > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> > index 9e17b5a31d..0be542c888 100644
> > --- a/hw/ppc/spapr.c
> > +++ b/hw/ppc/spapr.c
> > @@ -2824,9 +2824,10 @@ static void spapr_machine_init(MachineState *machine)
> > error_report("Could not find LPAR firmware '%s'", bios_name);
> > exit(1);
> > }
> > - fw_size = load_image_targphys(filename, 0, FW_MAX_SIZE, NULL);
> > + fw_size = load_image_targphys(filename, 0, FW_MAX_SIZE, &errp);
> > if (fw_size <= 0) {
> > - error_report("Could not load LPAR firmware '%s'", filename);
> > + error_reportf_err(errp, "Could not load LPAR firmware '%s': ",
> > + filename);
> > exit(1);
> > }
> >
> > @@ -3090,10 +3091,10 @@ static void spapr_machine_init(MachineState
> > *machine)
> > spapr->initrd_base,
> > load_limit
> > - spapr->initrd_base,
> > - NULL);
> > + &errp);
> > if (spapr->initrd_size < 0) {
> > - error_report("could not load initial ram disk '%s'",
> > - initrd_filename);
> > + error_reportf_err(errp, "could not load initial ram disk
> > '%s': ",
> > + initrd_filename);
> > exit(1);
> > }
> > }
> > diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
> > index 00d9ab7509..a7d3de62fa 100644
> > --- a/hw/ppc/virtex_ml507.c
> > +++ b/hw/ppc/virtex_ml507.c
> > @@ -195,6 +195,7 @@ static void virtex_init(MachineState *machine)
> > qemu_irq irq[32], cpu_irq;
> > int kernel_size;
> > int i;
> > + Error *errp = NULL;
> >
> > /* init CPUs */
> > cpu = ppc440_init_xilinx(machine->cpu_type, 400000000);
> > @@ -253,7 +254,7 @@ static void virtex_init(MachineState *machine)
> > /* If we failed loading ELF's try a raw image. */
> > kernel_size = load_image_targphys(kernel_filename,
> > boot_offset,
> > - machine->ram_size, NULL);
> > + machine->ram_size, &errp);
>
> What checks and reports errp? Was something left out here?
The error check was missing here. After reviewing the code, it seems a
check should be added. I will add it in the next version.
Thanks,
vishalc
>
> Regards,
> BALATON Zoltan
>
> > boot_info.bootstrap_pc = boot_offset;
> > high = boot_info.bootstrap_pc + kernel_size + 8192;
> > }
> > @@ -265,11 +266,11 @@ static void virtex_init(MachineState *machine)
> > initrd_base = high = ROUND_UP(high, 4);
> > initrd_size = load_image_targphys(machine->initrd_filename,
> > high, machine->ram_size -
> > high,
> > - NULL);
> > + &errp);
> >
> > if (initrd_size < 0) {
> > - error_report("couldn't load ram disk '%s'",
> > - machine->initrd_filename);
> > + error_reportf_err(errp, "couldn't load ram disk '%s': ",
> > + machine->initrd_filename);
> > exit(1);
> > }
> > high = ROUND_UP(high + initrd_size, 4);
> >
>
