[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/7] qdev: Use NULL instead of local_err for qbus_chi
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 6/7] qdev: Use NULL instead of local_err for qbus_child unrealize |
Date: |
Thu, 4 Sep 2014 19:21:14 +0200 |
From: Gonglei <address@hidden>
Forcefully unrealize all children regardless of errors in earlier
iterations (if any). We should keep going with cleanup operation
rather than report an error immediately. Therefore store the first
child unrealization failure and propagate it at the end. We also
forcefully unregister vmsd and unrealize actual object, too.
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Cc: address@hidden
Signed-off-by: Andreas Färber <address@hidden>
---
hw/core/qdev.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 4a1ac5b..6f37cd3 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -871,18 +871,18 @@ static void device_set_realized(Object *obj, bool value,
Error **errp)
}
dev->pending_deleted_event = false;
} else if (!value && dev->realized) {
+ Error **local_errp = NULL;
QLIST_FOREACH(bus, &dev->child_bus, sibling) {
+ local_errp = local_err ? NULL : &local_err;
object_property_set_bool(OBJECT(bus), false, "realized",
- &local_err);
- if (local_err != NULL) {
- break;
- }
+ local_errp);
}
- if (qdev_get_vmsd(dev) && local_err == NULL) {
+ if (qdev_get_vmsd(dev)) {
vmstate_unregister(dev, qdev_get_vmsd(dev), dev);
}
- if (dc->unrealize && local_err == NULL) {
- dc->unrealize(dev, &local_err);
+ if (dc->unrealize) {
+ local_errp = local_err ? NULL : &local_err;
+ dc->unrealize(dev, local_errp);
}
dev->pending_deleted_event = true;
}
--
1.8.4.5
- [Qemu-devel] [PULL for-2.1 0/7] QOM devices patch queue 2014-09-04, Andreas Färber, 2014/09/04
- [Qemu-devel] [PULL 1/7] qom: Make object_child_foreach() safe for objects removal, Andreas Färber, 2014/09/04
- [Qemu-devel] [PULL 2/7] machine: Clean up -machine handling, Andreas Färber, 2014/09/04
- [Qemu-devel] [PULL 6/7] qdev: Use NULL instead of local_err for qbus_child unrealize,
Andreas Färber <=
- [Qemu-devel] [PULL 5/7] qdev: Use error_abort instead of using local_err, Andreas Färber, 2014/09/04
- [Qemu-devel] [PULL 3/7] qom: Add automatic arrayification to object_property_add(), Andreas Färber, 2014/09/04
- [Qemu-devel] [PULL 4/7] memory: Remove object_property_add_child_array(), Andreas Färber, 2014/09/04
- [Qemu-devel] [PULL 7/7] qdev: Add cleanup logic in device_set_realized() to avoid resource leak, Andreas Färber, 2014/09/04
- Re: [Qemu-devel] [PULL for-2.1 0/7] QOM devices patch queue 2014-09-04, Peter Maydell, 2014/09/05