[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 28/44] qom: Use returned bool to check for failure, manual par
From: |
Markus Armbruster |
Subject: |
[PATCH v3 28/44] qom: Use returned bool to check for failure, manual part |
Date: |
Mon, 6 Jul 2020 10:09:34 +0200 |
The previous commit used Coccinelle to convert from checking the Error
object to checking the return value. Convert a few more manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
hw/core/bus.c | 6 +-----
hw/core/qdev.c | 7 +------
hw/s390x/s390-virtio-ccw.c | 13 +++++++------
3 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/hw/core/bus.c b/hw/core/bus.c
index 00d1d31762..6b987b6946 100644
--- a/hw/core/bus.c
+++ b/hw/core/bus.c
@@ -166,11 +166,7 @@ BusState *qbus_create(const char *typename, DeviceState
*parent, const char *nam
bool qbus_realize(BusState *bus, Error **errp)
{
- Error *err = NULL;
-
- object_property_set_bool(OBJECT(bus), "realized", true, &err);
- error_propagate(errp, err);
- return !err;
+ return object_property_set_bool(OBJECT(bus), "realized", true, errp);
}
void qbus_unrealize(BusState *bus)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index d6416fb894..17bd8fc2ec 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -386,8 +386,6 @@ void qdev_simple_device_unplug_cb(HotplugHandler
*hotplug_dev,
*/
bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp)
{
- Error *err = NULL;
-
assert(!dev->realized && !dev->parent_bus);
if (bus) {
@@ -396,10 +394,7 @@ bool qdev_realize(DeviceState *dev, BusState *bus, Error
**errp)
assert(!DEVICE_GET_CLASS(dev)->bus_type);
}
- if (!object_property_set_bool(OBJECT(dev), "realized", true, &err)) {
- error_propagate(errp, err);
- }
- return !err;
+ return object_property_set_bool(OBJECT(dev), "realized", true, errp);
}
/*
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 62af349c31..f7a68343ef 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -70,19 +70,20 @@ static S390CPU *s390x_new_cpu(const char *typename,
uint32_t core_id,
{
S390CPU *cpu = S390_CPU(object_new(typename));
Error *err = NULL;
+ S390CPU *ret = NULL;
if (!object_property_set_int(OBJECT(cpu), "core-id", core_id, &err)) {
goto out;
}
- qdev_realize(DEVICE(cpu), NULL, &err);
+ if (!qdev_realize(DEVICE(cpu), NULL, &err)) {
+ goto out;
+ }
+ ret = cpu;
out:
object_unref(OBJECT(cpu));
- if (err) {
- error_propagate(errp, err);
- cpu = NULL;
- }
- return cpu;
+ error_propagate(errp, err);
+ return ret;
}
static void s390_init_cpus(MachineState *machine)
--
2.26.2
- Re: [PATCH v3 26/44] qom: Make functions taking Error ** return bool, not void, (continued)
- [PATCH v3 27/44] qom: Use returned bool to check for failure, Coccinelle part, Markus Armbruster, 2020/07/06
- [PATCH v3 34/44] error: Eliminate error_propagate() with Coccinelle, part 2, Markus Armbruster, 2020/07/06
- [PATCH v3 16/44] qapi: Make visitor functions taking Error ** return bool, not void, Markus Armbruster, 2020/07/06
- [PATCH v3 19/44] s390x/pci: Fix harmless mistake in zpci's property fid's setter, Markus Armbruster, 2020/07/06
- [PATCH v3 05/44] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize(), Markus Armbruster, 2020/07/06
- [PATCH v3 41/44] error: Avoid error_propagate() after migrate_add_blocker(), Markus Armbruster, 2020/07/06
- [PATCH v3 44/44] hmp: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/07/06
- [PATCH v3 32/44] error: Avoid unnecessary error_propagate() after error_setg(), Markus Armbruster, 2020/07/06
- [PATCH v3 28/44] qom: Use returned bool to check for failure, manual part,
Markus Armbruster <=
- [PATCH v3 35/44] error: Eliminate error_propagate() manually, Markus Armbruster, 2020/07/06
- [PATCH v3 25/44] qom: Put name parameter before value / visitor parameter, Markus Armbruster, 2020/07/06
- Re: [PATCH v3 00/44] Less clumsy error checking, Markus Armbruster, 2020/07/06
- [PATCH v3 43/44] qdev: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/07/06
- [PATCH v3 42/44] qemu-img: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/07/06
- [PATCH v3 37/44] block/parallels: Simplify parallels_open() after previous commit, Markus Armbruster, 2020/07/06
- [PATCH v3 33/44] error: Eliminate error_propagate() with Coccinelle, part 1, Markus Armbruster, 2020/07/06