On Thu, Aug 27, 2015 at 1:47 PM, Alistair Francis <[email protected]> wrote: > Convert all of the non-realize error_propagate() calls into error_abort > calls as they shouldn't be user visible failure cases. > > Signed-off-by: Alistair Francis <[email protected]>
So normally these are needed to catch bad usages of -cpu to CPUs that don't have these props, but since ZynqMP doesn't allow -cpu these are promotable to fatal error. Reviewed-by: Peter Crosthwaite <[email protected]> > --- > > hw/arm/xlnx-zynqmp.c | 14 ++------------ > 1 files changed, 2 insertions(+), 12 deletions(-) > > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > index 388baef..6756c74 100644 > --- a/hw/arm/xlnx-zynqmp.c > +++ b/hw/arm/xlnx-zynqmp.c > @@ -162,12 +162,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error > **errp) > g_free(name); > > object_property_set_int(OBJECT(&s->apu_cpu[i]), GIC_BASE_ADDR, > - "reset-cbar", &err); > - if (err) { > - error_propagate((errp), (err)); > - return; > - } > - > + "reset-cbar", &error_abort); > object_property_set_bool(OBJECT(&s->apu_cpu[i]), true, "realized", > &err); > if (err) { > @@ -200,12 +195,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error > **errp) > g_free(name); > > object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true, > "reset-hivecs", > - &err); > - if (err != NULL) { > - error_propagate(errp, err); > - return; > - } > - > + &error_abort); > object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true, "realized", > &err); > if (err) { > -- > 1.7.1 >
