From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40489) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPaj1-0005K8-RO for qemu-devel@nongnu.org; Thu, 04 Sep 2014 13:21:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPaij-0006Dj-E9 for qemu-devel@nongnu.org; Thu, 04 Sep 2014 13:21:35 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 4 Sep 2014 19:21:14 +0200 Message-Id: <1409851275-14941-7-git-send-email-afaerber@suse.de> In-Reply-To: <1409851275-14941-1-git-send-email-afaerber@suse.de> References: <1409851275-14941-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 6/7] qdev: Use NULL instead of local_err for qbus_child unrealize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei , qemu-stable@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Gonglei 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 Reviewed-by: Peter Crosthwaite Cc: qemu-stable@nongnu.org Signed-off-by: Andreas F=C3=A4rber --- 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 v= alue, Error **errp) } dev->pending_deleted_event =3D false; } else if (!value && dev->realized) { + Error **local_errp =3D NULL; QLIST_FOREACH(bus, &dev->child_bus, sibling) { + local_errp =3D local_err ? NULL : &local_err; object_property_set_bool(OBJECT(bus), false, "realized", - &local_err); - if (local_err !=3D NULL) { - break; - } + local_errp); } - if (qdev_get_vmsd(dev) && local_err =3D=3D NULL) { + if (qdev_get_vmsd(dev)) { vmstate_unregister(dev, qdev_get_vmsd(dev), dev); } - if (dc->unrealize && local_err =3D=3D NULL) { - dc->unrealize(dev, &local_err); + if (dc->unrealize) { + local_errp =3D local_err ? NULL : &local_err; + dc->unrealize(dev, local_errp); } dev->pending_deleted_event =3D true; } --=20 1.8.4.5