[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/53] macio: Tidy up error handling in macio_newworld_realize()
From: |
Markus Armbruster |
Subject: |
[PULL 05/53] macio: Tidy up error handling in macio_newworld_realize() |
Date: |
Tue, 7 Jul 2020 23:24:15 +0200 |
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-ayland@ilande.co.uk>
Cc: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Message-Id: <20200707160613.848843-6-armbru@redhat.com>
---
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);
--
2.26.2
- [PULL 07/53] qemu-option: Check return value instead of @err where convenient, (continued)
- [PULL 07/53] qemu-option: Check return value instead of @err where convenient, Markus Armbruster, 2020/07/08
- [PULL 32/53] qdev: Use returned bool to check for failure, Coccinelle part, Markus Armbruster, 2020/07/08
- [PULL 06/53] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize(), Markus Armbruster, 2020/07/08
- [PULL 44/53] qdev: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/07/08
- [PULL 52/53] nbd: Use ERRP_GUARD(), Markus Armbruster, 2020/07/08
- [PULL 27/53] qom: Make functions taking Error ** return bool, not void, Markus Armbruster, 2020/07/08
- [PULL 09/53] qemu-option: Factor out helper find_default_by_name(), Markus Armbruster, 2020/07/08
- [PULL 25/53] qom: Use return values to check for error where that's simpler, Markus Armbruster, 2020/07/08
- [PULL 35/53] error: Eliminate error_propagate() with Coccinelle, part 2, Markus Armbruster, 2020/07/08
- [PULL 19/53] qapi: Use returned bool to check for failure, manual part, Markus Armbruster, 2020/07/08
- [PULL 05/53] macio: Tidy up error handling in macio_newworld_realize(),
Markus Armbruster <=
- [PULL 28/53] qom: Use returned bool to check for failure, Coccinelle part, Markus Armbruster, 2020/07/08
- [PULL 22/53] qom: Rename qdev_get_type() to object_get_type(), Markus Armbruster, 2020/07/08
- [PULL 41/53] qapi: Purge error_propagate() from QAPI core, Markus Armbruster, 2020/07/08
- [PULL 24/53] qom: Don't handle impossible object_property_get_link() failure, Markus Armbruster, 2020/07/08
- [PULL 45/53] hmp: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/07/08
- [PULL 16/53] hmp: Eliminate a variable in hmp_migrate_set_parameter(), Markus Armbruster, 2020/07/08
- [PULL 49/53] pflash: Use ERRP_GUARD(), Markus Armbruster, 2020/07/08
- [PULL 30/53] qom: Make functions taking Error ** return bool, not 0/-1, Markus Armbruster, 2020/07/08
- [PULL 46/53] error: New macro ERRP_GUARD(), Markus Armbruster, 2020/07/08
- [PULL 42/53] error: Avoid error_propagate() after migrate_add_blocker(), Markus Armbruster, 2020/07/08