On Tue, Mar 24, 2020 at 6:50 AM Peter Maydell <[email protected]> wrote: > > In some places in xlnx_zynqmp_realize() we were putting an > error into our local Error*, but forgetting to check for > failure and pass it back to the caller. Add the missing code. > > Signed-off-by: Peter Maydell <[email protected]>
Reviewed-by: Alistair Francis <[email protected]> Alistair > --- > Spotted while I was writing the previous patch. > --- > hw/arm/xlnx-zynqmp.c | 24 ++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > index a13dbeeacec..b84d153d56a 100644 > --- a/hw/arm/xlnx-zynqmp.c > +++ b/hw/arm/xlnx-zynqmp.c > @@ -530,8 +530,20 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error > **errp) > * - eMMC Specification Version 4.51 > */ > object_property_set_uint(sdhci, 3, "sd-spec-version", &err); > + if (err) { > + error_propagate(errp, err); > + return; > + } > object_property_set_uint(sdhci, SDHCI_CAPABILITIES, "capareg", &err); > + if (err) { > + error_propagate(errp, err); > + return; > + } > object_property_set_uint(sdhci, UHS_I, "uhs", &err); > + if (err) { > + error_propagate(errp, err); > + return; > + } > object_property_set_bool(sdhci, true, "realized", &err); > if (err) { > error_propagate(errp, err); > @@ -551,6 +563,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error > **errp) > gchar *bus_name; > > object_property_set_bool(OBJECT(&s->spi[i]), true, "realized", &err); > + if (err) { > + error_propagate(errp, err); > + return; > + } > > sysbus_mmio_map(SYS_BUS_DEVICE(&s->spi[i]), 0, spi_addr[i]); > sysbus_connect_irq(SYS_BUS_DEVICE(&s->spi[i]), 0, > @@ -565,6 +581,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error > **errp) > } > > object_property_set_bool(OBJECT(&s->qspi), true, "realized", &err); > + if (err) { > + error_propagate(errp, err); > + return; > + } > sysbus_mmio_map(SYS_BUS_DEVICE(&s->qspi), 0, QSPI_ADDR); > sysbus_mmio_map(SYS_BUS_DEVICE(&s->qspi), 1, LQSPI_ADDR); > sysbus_connect_irq(SYS_BUS_DEVICE(&s->qspi), 0, gic_spi[QSPI_IRQ]); > @@ -619,6 +639,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error > **errp) > > for (i = 0; i < XLNX_ZYNQMP_NUM_GDMA_CH; i++) { > object_property_set_uint(OBJECT(&s->gdma[i]), 128, "bus-width", > &err); > + if (err) { > + error_propagate(errp, err); > + return; > + } > object_property_set_bool(OBJECT(&s->gdma[i]), true, "realized", > &err); > if (err) { > error_propagate(errp, err); > -- > 2.20.1 > >
