Message ID | 20200622104250.1404835-14-armbru@redhat.com |
---|---|
State | New |
Headers | show |
Series | Error handling fixes & cleanups | expand |
On 6/22/20 12:42 PM, Markus Armbruster wrote: > Replace > > sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &local_err); > error_propagate(&err, local_err); > if (err) { > error_propagate(errp, err); > return; > } > > by > > sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &err); > if (err) { > error_propagate(errp, err); > return; > } > > Cc: Cédric Le Goater <clg@kaod.org> > Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> > --- > hw/arm/aspeed_ast2600.c | 10 ++++------ > hw/arm/aspeed_soc.c | 10 ++++------ > 2 files changed, 8 insertions(+), 12 deletions(-) > > diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c > index 6da687299f..08b3592e36 100644 > --- a/hw/arm/aspeed_ast2600.c > +++ b/hw/arm/aspeed_ast2600.c > @@ -228,7 +228,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) > int i; > AspeedSoCState *s = ASPEED_SOC(dev); > AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > - Error *err = NULL, *local_err = NULL; > + Error *err = NULL; > qemu_irq irq; > > /* IO space */ > @@ -394,8 +394,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) > return; > } > object_property_set_int(OBJECT(&s->spi[i]), 1, "num-cs", &err); > - sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &local_err); > - error_propagate(&err, local_err); > + sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &err); > if (err) { > error_propagate(errp, err); > return; > @@ -446,11 +445,10 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) > for (i = 0; i < sc->macs_num; i++) { > object_property_set_bool(OBJECT(&s->ftgmac100[i]), true, "aspeed", > &err); > - sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), &local_err); > - error_propagate(&err, local_err); > + sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), &err); > if (err) { > error_propagate(errp, err); > - return; > + return; > } > sysbus_mmio_map(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, > sc->memmap[ASPEED_ETH1 + i]); > diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c > index 810cf9b6cc..ec21de50ce 100644 > --- a/hw/arm/aspeed_soc.c > +++ b/hw/arm/aspeed_soc.c > @@ -218,7 +218,7 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) > int i; > AspeedSoCState *s = ASPEED_SOC(dev); > AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > - Error *err = NULL, *local_err = NULL; > + Error *err = NULL; > > /* IO space */ > create_unimplemented_device("aspeed_soc.io", sc->memmap[ASPEED_IOMEM], > @@ -340,8 +340,7 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) > /* SPI */ > for (i = 0; i < sc->spis_num; i++) { > object_property_set_int(OBJECT(&s->spi[i]), 1, "num-cs", &err); > - sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &local_err); > - error_propagate(&err, local_err); > + sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &err); > if (err) { > error_propagate(errp, err); > return; > @@ -392,11 +391,10 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) > for (i = 0; i < sc->macs_num; i++) { > object_property_set_bool(OBJECT(&s->ftgmac100[i]), true, "aspeed", > &err); > - sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), &local_err); > - error_propagate(&err, local_err); > + sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), &err); > if (err) { > error_propagate(errp, err); > - return; > + return; > } > sysbus_mmio_map(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, > sc->memmap[ASPEED_ETH1 + i]); >
diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c index 6da687299f..08b3592e36 100644 --- a/hw/arm/aspeed_ast2600.c +++ b/hw/arm/aspeed_ast2600.c @@ -228,7 +228,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) int i; AspeedSoCState *s = ASPEED_SOC(dev); AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); - Error *err = NULL, *local_err = NULL; + Error *err = NULL; qemu_irq irq; /* IO space */ @@ -394,8 +394,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) return; } object_property_set_int(OBJECT(&s->spi[i]), 1, "num-cs", &err); - sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &local_err); - error_propagate(&err, local_err); + sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &err); if (err) { error_propagate(errp, err); return; @@ -446,11 +445,10 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) for (i = 0; i < sc->macs_num; i++) { object_property_set_bool(OBJECT(&s->ftgmac100[i]), true, "aspeed", &err); - sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), &local_err); - error_propagate(&err, local_err); + sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), &err); if (err) { error_propagate(errp, err); - return; + return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, sc->memmap[ASPEED_ETH1 + i]); diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index 810cf9b6cc..ec21de50ce 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -218,7 +218,7 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) int i; AspeedSoCState *s = ASPEED_SOC(dev); AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); - Error *err = NULL, *local_err = NULL; + Error *err = NULL; /* IO space */ create_unimplemented_device("aspeed_soc.io", sc->memmap[ASPEED_IOMEM], @@ -340,8 +340,7 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) /* SPI */ for (i = 0; i < sc->spis_num; i++) { object_property_set_int(OBJECT(&s->spi[i]), 1, "num-cs", &err); - sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &local_err); - error_propagate(&err, local_err); + sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &err); if (err) { error_propagate(errp, err); return; @@ -392,11 +391,10 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) for (i = 0; i < sc->macs_num; i++) { object_property_set_bool(OBJECT(&s->ftgmac100[i]), true, "aspeed", &err); - sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), &local_err); - error_propagate(&err, local_err); + sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), &err); if (err) { error_propagate(errp, err); - return; + return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, sc->memmap[ASPEED_ETH1 + i]);
Replace sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &local_err); error_propagate(&err, local_err); if (err) { error_propagate(errp, err); return; } by sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &err); if (err) { error_propagate(errp, err); return; } Cc: Cédric Le Goater <clg@kaod.org> Signed-off-by: Markus Armbruster <armbru@redhat.com> --- hw/arm/aspeed_ast2600.c | 10 ++++------ hw/arm/aspeed_soc.c | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-)