Commit 8f04e88e authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/ipl: switch error reporting to error_setg 



Now that we can report errors in the realize function, let's replace
the fprintf's and hw_error's with error_setg.

Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 04fccf10

hw/s390x/ipl.c

+11 −7
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) 
    S390IPLState *ipl = S390_IPL(dev);

    uint64_t pentry = KERN_IMAGE_START;

    int kernel_size;

    Error *l_err = NULL;



    int bios_size;

    char *bios_filename;
@@ -93,7 +94,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) 


        bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);

        if (bios_filename == NULL) {

            hw_error("could not find stage1 bootloader\n");

            error_setg(&l_err, "could not find stage1 bootloader\n");

            goto error;

        }



        bios_size = load_elf(bios_filename, bios_translate_addr, &fwbase,
@@ -111,7 +113,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) 
        g_free(bios_filename);



        if (bios_size == -1) {

            hw_error("could not load bootloader '%s'\n", bios_name);

            error_setg(&l_err, "could not load bootloader '%s'\n", bios_name);

            goto error;

        }



        /* default boot target is the bios */
@@ -125,8 +128,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) 
            kernel_size = load_image_targphys(ipl->kernel, 0, ram_size);

        }

        if (kernel_size < 0) {

            fprintf(stderr, "could not load kernel '%s'\n", ipl->kernel);

            exit(1);

            error_setg(&l_err, "could not load kernel '%s'\n", ipl->kernel);

            goto error;

        }

        /*

         * Is it a Linux kernel (starting at 0x10000)? If yes, we fill in the
@@ -153,9 +156,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) 
            initrd_size = load_image_targphys(ipl->initrd, initrd_offset,

                                              ram_size - initrd_offset);

            if (initrd_size == -1) {

                fprintf(stderr, "qemu: could not load initrd '%s'\n",

                        ipl->initrd);

                exit(1);

                error_setg(&l_err, "could not load initrd '%s'\n", ipl->initrd);

                goto error;

            }



            /*
@@ -167,6 +169,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) 
        }

    }

    qemu_register_reset(qdev_reset_all_fn, dev);

error:

    error_propagate(errp, l_err);

}



static Property s390_ipl_properties[] = {