Commit c24d9716 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

hw/arm: Drop useless object_property_set_link() error handling 



object_property_set_link() fails when the property doesn't exist, is
not settable, or its .check() method fails.  These are all programming
errors here, so passing it &error_abort is appropriate.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: "Cédric Le Goater" <clg@kaod.org>
Cc: Andrew Jeffery <andrew@aj.id.au>
Cc: Joel Stanley <joel@jms.id.au>
Cc: qemu-arm@nongnu.org
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
Message-Id: <20200630090351.1247703-17-armbru@redhat.com>
parent 2726dc51

hw/arm/armsse.c

+12 −41
Original line number Diff line number Diff line
@@ -563,16 +563,8 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
                                                &s->container, -1);

        }

        object_property_set_link(cpuobj, OBJECT(&s->cpu_container[i]),

                                 "memory", &err);

        if (err) {

            error_propagate(errp, err);

            return;

        }

        object_property_set_link(cpuobj, OBJECT(s), "idau", &err);

        if (err) {

            error_propagate(errp, err);

            return;

        }

                                 "memory", &error_abort);

        object_property_set_link(cpuobj, OBJECT(s), "idau", &error_abort);

        sysbus_realize(SYS_BUS_DEVICE(cpuobj), &err);

        if (err) {

            error_propagate(errp, err);
@@ -699,11 +691,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
            return;

        }

        object_property_set_link(OBJECT(&s->mpc[i]), OBJECT(&s->sram[i]),

                                 "downstream", &err);

        if (err) {

            error_propagate(errp, err);

            return;

        }

                                 "downstream", &error_abort);

        sysbus_realize(SYS_BUS_DEVICE(&s->mpc[i]), &err);

        if (err) {

            error_propagate(errp, err);
@@ -754,11 +742,8 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer0), 0,

                       armsse_get_common_irq_in(s, 3));

    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer0), 0);

    object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[0]", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[0]",

                             &error_abort);



    qdev_prop_set_uint32(DEVICE(&s->timer1), "pclk-frq", s->mainclk_frq);

    sysbus_realize(SYS_BUS_DEVICE(&s->timer1), &err);
@@ -769,12 +754,8 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer1), 0,

                       armsse_get_common_irq_in(s, 4));

    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer1), 0);

    object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[1]", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[1]",

                             &error_abort);



    qdev_prop_set_uint32(DEVICE(&s->dualtimer), "pclk-frq", s->mainclk_frq);

    sysbus_realize(SYS_BUS_DEVICE(&s->dualtimer), &err);
@@ -785,11 +766,8 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->dualtimer), 0,

                       armsse_get_common_irq_in(s, 5));

    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->dualtimer), 0);

    object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[2]", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[2]",

                             &error_abort);



    if (info->has_mhus) {

        /*
@@ -814,12 +792,8 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
            port = g_strdup_printf("port[%d]", i + 3);

            mr = sysbus_mmio_get_region(mhu_sbd, 0);

            object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr),

                                     port, &err);

                                     port, &error_abort);

            g_free(port);

            if (err) {

                error_propagate(errp, err);

                return;

            }



            /*

             * Each MHU has an irq line for each CPU:
@@ -966,11 +940,8 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->s32ktimer), 0,

                       armsse_get_common_irq_in(s, 2));

    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->s32ktimer), 0);

    object_property_set_link(OBJECT(&s->apb_ppc1), OBJECT(mr), "port[0]", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    object_property_set_link(OBJECT(&s->apb_ppc1), OBJECT(mr), "port[0]",

                             &error_abort);



    sysbus_realize(SYS_BUS_DEVICE(&s->apb_ppc1), &err);

    if (err) {

hw/arm/armv7m.c

+2 −5
Original line number Diff line number Diff line
@@ -170,11 +170,8 @@ static void armv7m_realize(DeviceState *dev, Error **errp) 
    object_property_set_link(OBJECT(s->cpu), OBJECT(&s->container), "memory",

                             &error_abort);

    if (object_property_find(OBJECT(s->cpu), "idau", NULL)) {

        object_property_set_link(OBJECT(s->cpu), s->idau, "idau", &err);

        if (err != NULL) {

            error_propagate(errp, err);

            return;

        }

        object_property_set_link(OBJECT(s->cpu), s->idau, "idau",

                                 &error_abort);

    }

    if (object_property_find(OBJECT(s->cpu), "init-svtor", NULL)) {

        object_property_set_uint(OBJECT(s->cpu), s->init_svtor,

hw/arm/aspeed_ast2600.c

+5 −15
Original line number Diff line number Diff line
@@ -341,11 +341,8 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) 
    }



    /* I2C */

    object_property_set_link(OBJECT(&s->i2c), OBJECT(s->dram_mr), "dram", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    object_property_set_link(OBJECT(&s->i2c), OBJECT(s->dram_mr), "dram",

                             &error_abort);

    sysbus_realize(SYS_BUS_DEVICE(&s->i2c), &err);

    if (err) {

        error_propagate(errp, err);
@@ -363,11 +360,8 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) 
    }



    /* FMC, The number of CS is set at the board level */

    object_property_set_link(OBJECT(&s->fmc), OBJECT(s->dram_mr), "dram", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    object_property_set_link(OBJECT(&s->fmc), OBJECT(s->dram_mr), "dram",

                             &error_abort);

    object_property_set_int(OBJECT(&s->fmc), sc->memmap[ASPEED_SDRAM],

                            "sdram-base", &err);

    if (err) {
@@ -388,11 +382,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) 
    /* SPI */

    for (i = 0; i < sc->spis_num; i++) {

        object_property_set_link(OBJECT(&s->spi[i]), OBJECT(s->dram_mr),

                                 "dram", &err);

        if (err) {

            error_propagate(errp, err);

            return;

        }

                                 "dram", &error_abort);

        object_property_set_int(OBJECT(&s->spi[i]), 1, "num-cs", &err);

        sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &err);

        if (err) {

hw/arm/aspeed_soc.c

+4 −10
Original line number Diff line number Diff line
@@ -300,11 +300,8 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) 
    }



    /* I2C */

    object_property_set_link(OBJECT(&s->i2c), OBJECT(s->dram_mr), "dram", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    object_property_set_link(OBJECT(&s->i2c), OBJECT(s->dram_mr), "dram",

                             &error_abort);

    sysbus_realize(SYS_BUS_DEVICE(&s->i2c), &err);

    if (err) {

        error_propagate(errp, err);
@@ -315,11 +312,8 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) 
                       aspeed_soc_get_irq(s, ASPEED_I2C));



    /* FMC, The number of CS is set at the board level */

    object_property_set_link(OBJECT(&s->fmc), OBJECT(s->dram_mr), "dram", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    object_property_set_link(OBJECT(&s->fmc), OBJECT(s->dram_mr), "dram",

                             &error_abort);

    object_property_set_int(OBJECT(&s->fmc), sc->memmap[ASPEED_SDRAM],

                            "sdram-base", &err);

    if (err) {

hw/arm/nrf51_soc.c

+1 −5
Original line number Diff line number Diff line
@@ -66,11 +66,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) 
    }



    object_property_set_link(OBJECT(&s->cpu), OBJECT(&s->container), "memory",

            &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

                             &error_abort);

    sysbus_realize(SYS_BUS_DEVICE(&s->cpu), &err);

    if (err) {

        error_propagate(errp, err);