Message ID | 1409797106-9076-3-git-send-email-arei.gonglei@huawei.com |
---|---|
State | New |
Headers | show |
Am 04.09.2014 04:18, schrieb arei.gonglei@huawei.com: > From: Gonglei <arei.gonglei@huawei.com> > > Forcefully unrealize all children regardless of early-iteration > errors(if happened). We should keep going with cleanup operation > rather than report a error immediately, meanwhile store the first > child unrealize failure and propagate it at the end. We also > forcefully un-vmsding and unrealizing actual object too. > > Signed-off-by: Gonglei <arei.gonglei@huawei.com> > Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> > --- > 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; > } This looks much cleaner now, thanks, applied. Andreas
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; }