On Mon, 6 Jul 2020 10:09:10 +0200
Markus Armbruster <arm...@redhat.com> wrote:
> macio_newworld_realize() effectively ignores ns->gpio realization
> errors, leaking the Error object. Fortunately, macio_gpio_realize()
> can't actually fail. Tidy up.
>
> Cc: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
> Cc: David Gibson <da...@gibson.dropbear.id.au>
> Signed-off-by: Markus Armbruster <arm...@redhat.com>
> Reviewed-by: Eric Blake <ebl...@redhat.com>
> Acked-by: David Gibson <da...@gibson.dropbear.id.au>
> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
> ---
Reviewed-by: Greg Kurz <gr...@kaod.org>
> hw/misc/macio/macio.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
> index 42414797e2..be66bb7758 100644
> --- a/hw/misc/macio/macio.c
> +++ b/hw/misc/macio/macio.c
> @@ -334,7 +334,9 @@ static void macio_newworld_realize(PCIDevice *d, Error
> **errp)
> &error_abort);
> memory_region_add_subregion(&s->bar, 0x50,
> sysbus_mmio_get_region(sysbus_dev, 0));
> - qdev_realize(DEVICE(&ns->gpio), BUS(&s->macio_bus), &err);
> + if (!qdev_realize(DEVICE(&ns->gpio), BUS(&s->macio_bus), errp)) {
> + return;
> + }
>
> /* PMU */
> object_initialize_child(OBJECT(s), "pmu", &s->pmu, TYPE_VIA_PMU);
