[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 23/35] hw/core/qdev: cleanup Error ** variables
From: |
Markus Armbruster |
Subject: |
[PULL v2 23/35] hw/core/qdev: cleanup Error ** variables |
Date: |
Wed, 18 Dec 2019 09:17:09 +0100 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Rename Error ** parameter in check_only_migratable to common errp.
In device_set_realized:
- Move "if (local_err != NULL)" closer to error setters.
- Drop 'Error **local_errp': it doesn't save any LoCs, but it's very
unusual.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/core/qdev.c | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index cf1ba28fe3..82d3ee590a 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -820,12 +820,12 @@ static bool device_get_realized(Object *obj, Error **errp)
return dev->realized;
}
-static bool check_only_migratable(Object *obj, Error **err)
+static bool check_only_migratable(Object *obj, Error **errp)
{
DeviceClass *dc = DEVICE_GET_CLASS(obj);
if (!vmstate_check_only_migratable(dc->vmsd)) {
- error_setg(err, "Device %s is not migratable, but "
+ error_setg(errp, "Device %s is not migratable, but "
"--only-migratable was specified",
object_get_typename(obj));
return false;
@@ -874,10 +874,9 @@ static void device_set_realized(Object *obj, bool value,
Error **errp)
if (dc->realize) {
dc->realize(dev, &local_err);
- }
-
- if (local_err != NULL) {
- goto fail;
+ if (local_err != NULL) {
+ goto fail;
+ }
}
DEVICE_LISTENER_CALL(realize, Forward, dev);
@@ -918,27 +917,26 @@ static void device_set_realized(Object *obj, bool value,
Error **errp)
}
} else if (!value && dev->realized) {
- Error **local_errp = NULL;
+ /* We want local_err to track only the first error */
QLIST_FOREACH(bus, &dev->child_bus, sibling) {
- local_errp = local_err ? NULL : &local_err;
object_property_set_bool(OBJECT(bus), false, "realized",
- local_errp);
+ local_err ? NULL : &local_err);
}
if (qdev_get_vmsd(dev)) {
vmstate_unregister(dev, qdev_get_vmsd(dev), dev);
}
if (dc->unrealize) {
- local_errp = local_err ? NULL : &local_err;
- dc->unrealize(dev, local_errp);
+ dc->unrealize(dev, local_err ? NULL : &local_err);
}
dev->pending_deleted_event = true;
DEVICE_LISTENER_CALL(unrealize, Reverse, dev);
- }
- if (local_err != NULL) {
- goto fail;
+ if (local_err != NULL) {
+ goto fail;
+ }
}
+ assert(local_err == NULL);
dev->realized = value;
return;
@@ -976,7 +974,7 @@ static bool device_get_hotpluggable(Object *obj, Error
**errp)
qbus_is_hotpluggable(dev->parent_bus));
}
-static bool device_get_hotplugged(Object *obj, Error **err)
+static bool device_get_hotplugged(Object *obj, Error **errp)
{
DeviceState *dev = DEVICE(obj);
--
2.21.0
- [PULL v2 21/35] ppc: make Error **errp const where it is appropriate, (continued)
- [PULL v2 21/35] ppc: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18
- [PULL v2 11/35] memory-device: Fix memory pre-plug error API violations, Markus Armbruster, 2019/12/18
- [PULL v2 25/35] hw/i386/amd_iommu: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 19/35] qdev-monitor: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18
- [PULL v2 22/35] 9pfs: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18
- [PULL v2 13/35] hw/intc/s390: Simplify error handling in kvm_s390_flic_realize(), Markus Armbruster, 2019/12/18
- [PULL v2 30/35] hw/tpm: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 27/35] monitor/qmp-cmds: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 26/35] qga: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 16/35] error: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18
- [PULL v2 23/35] hw/core/qdev: cleanup Error ** variables,
Markus Armbruster <=
- [PULL v2 15/35] net/net: Clean up variable shadowing in net_client_init(), Markus Armbruster, 2019/12/18
- [PULL v2 31/35] hw/usb: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 24/35] block/snapshot: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 35/35] nbd: assert that Error** is not NULL in nbd_iter_channel_error, Markus Armbruster, 2019/12/18
- [PULL v2 29/35] hw/sd: drop extra whitespace in sdhci_sysbus_realize() header, Markus Armbruster, 2019/12/18
- [PULL v2 32/35] include/qom/object.h: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 04/35] io: Fix Error usage in a comment <example>, Markus Armbruster, 2019/12/18
- [PULL v2 28/35] hw/s390x: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 33/35] backends/cryptodev: drop local_err from cryptodev_backend_complete(), Markus Armbruster, 2019/12/18
- [PULL v2 03/35] crypto: Fix typo in QCryptoTLSSession's <example> comment, Markus Armbruster, 2019/12/18