diff options
| author | Markus Armbruster <armbru@redhat.com> | 2020-07-07 18:05:57 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-07-10 15:18:08 +0200 |
| commit | f07ad48d46fdbc739dd72ac4ad1677dbbfe7ed44 (patch) | |
| tree | d9bb9a9b9351273e64dec084a985f5eac4499b41 /hw/core/qdev.c | |
| parent | 778a2dc59213d789f5bf8409547b529af4eb9ead (diff) | |
qom: Use returned bool to check for failure, manual part
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>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-30-armbru@redhat.com>
Diffstat (limited to 'hw/core/qdev.c')
| -rw-r--r-- | hw/core/qdev.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index ae3b006f39..68948761f2 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -388,8 +388,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) { @@ -398,10 +396,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); } /* |