vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20200630090351.1247703-17-armbru@redhat.com>
master
Markus Armbruster 2020-06-30 11:03:41 +02:00
parent 2726dc51e0
commit c24d97168a
5 changed files with 24 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
hw/arm/armsse.c
View File

@ -563,16 +563,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
&s->container, -1); &s->container, -1);
} }
object_property_set_link(cpuobj, OBJECT(&s->cpu_container[i]), object_property_set_link(cpuobj, OBJECT(&s->cpu_container[i]),
"memory", &err); "memory", &error_abort);
if (err) { object_property_set_link(cpuobj, OBJECT(s), "idau", &error_abort);
error_propagate(errp, err);
return;
}
object_property_set_link(cpuobj, OBJECT(s), "idau", &err);
if (err) {
error_propagate(errp, err);
return;
}
sysbus_realize(SYS_BUS_DEVICE(cpuobj), &err); sysbus_realize(SYS_BUS_DEVICE(cpuobj), &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
@ -699,11 +691,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)
return; return;
} }
object_property_set_link(OBJECT(&s->mpc[i]), OBJECT(&s->sram[i]), object_property_set_link(OBJECT(&s->mpc[i]), OBJECT(&s->sram[i]),
"downstream", &err); "downstream", &error_abort);
if (err) {
error_propagate(errp, err);
return;
}
sysbus_realize(SYS_BUS_DEVICE(&s->mpc[i]), &err); sysbus_realize(SYS_BUS_DEVICE(&s->mpc[i]), &err);
if (err) { if (err) {
error_propagate(errp, 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, sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer0), 0,
armsse_get_common_irq_in(s, 3)); armsse_get_common_irq_in(s, 3));
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer0), 0); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer0), 0);
object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[0]", &err); object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[0]",
if (err) { &error_abort);
error_propagate(errp, err);
return;
}
qdev_prop_set_uint32(DEVICE(&s->timer1), "pclk-frq", s->mainclk_frq); qdev_prop_set_uint32(DEVICE(&s->timer1), "pclk-frq", s->mainclk_frq);
sysbus_realize(SYS_BUS_DEVICE(&s->timer1), &err); 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, sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer1), 0,
armsse_get_common_irq_in(s, 4)); armsse_get_common_irq_in(s, 4));
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer1), 0); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer1), 0);
object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[1]", &err); object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[1]",
if (err) { &error_abort);
error_propagate(errp, err);
return;
}
qdev_prop_set_uint32(DEVICE(&s->dualtimer), "pclk-frq", s->mainclk_frq); qdev_prop_set_uint32(DEVICE(&s->dualtimer), "pclk-frq", s->mainclk_frq);
sysbus_realize(SYS_BUS_DEVICE(&s->dualtimer), &err); 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, sysbus_connect_irq(SYS_BUS_DEVICE(&s->dualtimer), 0,
armsse_get_common_irq_in(s, 5)); armsse_get_common_irq_in(s, 5));
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->dualtimer), 0); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->dualtimer), 0);
object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[2]", &err); object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[2]",
if (err) { &error_abort);
error_propagate(errp, err);
return;
}
if (info->has_mhus) { if (info->has_mhus) {
/* /*
@ -814,12 +792,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
port = g_strdup_printf("port[%d]", i + 3); port = g_strdup_printf("port[%d]", i + 3);
mr = sysbus_mmio_get_region(mhu_sbd, 0); mr = sysbus_mmio_get_region(mhu_sbd, 0);
object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr),
port, &err); port, &error_abort);
g_free(port); g_free(port);
if (err) {
error_propagate(errp, err);
return;
}
/* /*
* Each MHU has an irq line for each CPU: * 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, sysbus_connect_irq(SYS_BUS_DEVICE(&s->s32ktimer), 0,
armsse_get_common_irq_in(s, 2)); armsse_get_common_irq_in(s, 2));
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->s32ktimer), 0); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->s32ktimer), 0);
object_property_set_link(OBJECT(&s->apb_ppc1), OBJECT(mr), "port[0]", &err); object_property_set_link(OBJECT(&s->apb_ppc1), OBJECT(mr), "port[0]",
if (err) { &error_abort);
error_propagate(errp, err);
return;
}
sysbus_realize(SYS_BUS_DEVICE(&s->apb_ppc1), &err); sysbus_realize(SYS_BUS_DEVICE(&s->apb_ppc1), &err);
if (err) { if (err) {

7
hw/arm/armv7m.c
View File

@ -170,11 +170,8 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
object_property_set_link(OBJECT(s->cpu), OBJECT(&s->container), "memory", object_property_set_link(OBJECT(s->cpu), OBJECT(&s->container), "memory",
&error_abort); &error_abort);
if (object_property_find(OBJECT(s->cpu), "idau", NULL)) { if (object_property_find(OBJECT(s->cpu), "idau", NULL)) {
object_property_set_link(OBJECT(s->cpu), s->idau, "idau", &err); object_property_set_link(OBJECT(s->cpu), s->idau, "idau",
if (err != NULL) { &error_abort);
error_propagate(errp, err);
return;
}
} }
if (object_property_find(OBJECT(s->cpu), "init-svtor", NULL)) { if (object_property_find(OBJECT(s->cpu), "init-svtor", NULL)) {
object_property_set_uint(OBJECT(s->cpu), s->init_svtor, object_property_set_uint(OBJECT(s->cpu), s->init_svtor,

20
hw/arm/aspeed_ast2600.c
View File

@ -341,11 +341,8 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)
} }
/* I2C */ /* I2C */
object_property_set_link(OBJECT(&s->i2c), OBJECT(s->dram_mr), "dram", &err); object_property_set_link(OBJECT(&s->i2c), OBJECT(s->dram_mr), "dram",
if (err) { &error_abort);
error_propagate(errp, err);
return;
}
sysbus_realize(SYS_BUS_DEVICE(&s->i2c), &err); sysbus_realize(SYS_BUS_DEVICE(&s->i2c), &err);
if (err) { if (err) {
error_propagate(errp, 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 */ /* FMC, The number of CS is set at the board level */
object_property_set_link(OBJECT(&s->fmc), OBJECT(s->dram_mr), "dram", &err); object_property_set_link(OBJECT(&s->fmc), OBJECT(s->dram_mr), "dram",
if (err) { &error_abort);
error_propagate(errp, err);
return;
}
object_property_set_int(OBJECT(&s->fmc), sc->memmap[ASPEED_SDRAM], object_property_set_int(OBJECT(&s->fmc), sc->memmap[ASPEED_SDRAM],
"sdram-base", &err); "sdram-base", &err);
if (err) { if (err) {
@ -388,11 +382,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)
/* SPI */ /* SPI */
for (i = 0; i < sc->spis_num; i++) { for (i = 0; i < sc->spis_num; i++) {
object_property_set_link(OBJECT(&s->spi[i]), OBJECT(s->dram_mr), object_property_set_link(OBJECT(&s->spi[i]), OBJECT(s->dram_mr),
"dram", &err); "dram", &error_abort);
if (err) {
error_propagate(errp, err);
return;
}
object_property_set_int(OBJECT(&s->spi[i]), 1, "num-cs", &err); object_property_set_int(OBJECT(&s->spi[i]), 1, "num-cs", &err);
sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &err); sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &err);
if (err) { if (err) {

14
hw/arm/aspeed_soc.c
View File

@ -300,11 +300,8 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
} }
/* I2C */ /* I2C */
object_property_set_link(OBJECT(&s->i2c), OBJECT(s->dram_mr), "dram", &err); object_property_set_link(OBJECT(&s->i2c), OBJECT(s->dram_mr), "dram",
if (err) { &error_abort);
error_propagate(errp, err);
return;
}
sysbus_realize(SYS_BUS_DEVICE(&s->i2c), &err); sysbus_realize(SYS_BUS_DEVICE(&s->i2c), &err);
if (err) { if (err) {
error_propagate(errp, 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)); aspeed_soc_get_irq(s, ASPEED_I2C));
/* FMC, The number of CS is set at the board level */ /* FMC, The number of CS is set at the board level */
object_property_set_link(OBJECT(&s->fmc), OBJECT(s->dram_mr), "dram", &err); object_property_set_link(OBJECT(&s->fmc), OBJECT(s->dram_mr), "dram",
if (err) { &error_abort);
error_propagate(errp, err);
return;
}
object_property_set_int(OBJECT(&s->fmc), sc->memmap[ASPEED_SDRAM], object_property_set_int(OBJECT(&s->fmc), sc->memmap[ASPEED_SDRAM],
"sdram-base", &err); "sdram-base", &err);
if (err) { if (err) {

6
hw/arm/nrf51_soc.c
View File

@ -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", object_property_set_link(OBJECT(&s->cpu), OBJECT(&s->container), "memory",
&err); &error_abort);
if (err) {
error_propagate(errp, err);
return;
}
sysbus_realize(SYS_BUS_DEVICE(&s->cpu), &err); sysbus_realize(SYS_BUS_DEVICE(&s->cpu), &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);