From nobody Sun May 5 19:52:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1574882663; cv=none; d=zohomail.com; s=zohoarc; b=UfB9pOLZqr0k+DQ76OC8DkjJ0IEWkz2WuCPDT55bEUlmol6bSYNWqwMgkAK0BPqL+pR2hJkBmOCmBqk6gikkBbEI5kah4Knrw92GUG95V21hfh1ZfOqVgCg+rSlnqOzCQ/EIV+KmcS6XcJM4KKECefpDnPM6eOqKacCBPMxieJM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574882663; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=dnJOjtEwekZMliKupLeXJvKXfl/0fEs5Swt+awaH1cs=; b=NNJEN61jeMWQ3OvFGm8x4/wdFgk8xvwOOhssAjG/lp4GQaY0fECylTZma2BV7GARJqbYi16hfeyYaX0mbcdjbjlEDkzSb2wEf2iCzcaA5t6SV6cZ6RboXpEnr/O/fU0jgNLvuHcjDml1iWdZnPiynWFcsTmGZeSNRUZQeE+CgOg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574882662940866.0986692793265; Wed, 27 Nov 2019 11:24:22 -0800 (PST) Received: from localhost ([::1]:42144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2vE-00055L-R0 for importer@patchew.org; Wed, 27 Nov 2019 14:24:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35783) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2rW-0003jK-BS for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:20:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ia2rU-0000TX-Rg for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:20:29 -0500 Received: from relay.sw.ru ([185.231.240.75]:53452) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ia2rU-0000Px-K4 for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:20:28 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ia2rR-0003hu-HJ; Wed, 27 Nov 2019 22:20:25 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [PATCH v6] hw/core/qdev: cleanup Error ** variables Date: Wed, 27 Nov 2019 22:20:25 +0300 Message-Id: <20191127192025.21594-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vsementsov@virtuozzo.com, berrange@redhat.com, ehabkost@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Rename Error ** parameter in check_only_migratable to common errp. In device_set_realized: - Move "if (local_err !=3D 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 Reviewed-by: Eric Blake Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Markus Armbruster --- v6: enhance grammar in comment [Eric] add r-b by Eric and Marc-Andr=C3=A9 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; } =20 -static bool check_only_migratable(Object *obj, Error **err) +static bool check_only_migratable(Object *obj, Error **errp) { DeviceClass *dc =3D DEVICE_GET_CLASS(obj); =20 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 valu= e, Error **errp) =20 if (dc->realize) { dc->realize(dev, &local_err); - } - - if (local_err !=3D NULL) { - goto fail; + if (local_err !=3D NULL) { + goto fail; + } } =20 DEVICE_LISTENER_CALL(realize, Forward, dev); @@ -918,27 +917,26 @@ static void device_set_realized(Object *obj, bool val= ue, Error **errp) } =20 } else if (!value && dev->realized) { - Error **local_errp =3D NULL; + /* We want local_err to track only the first error */ QLIST_FOREACH(bus, &dev->child_bus, sibling) { - local_errp =3D 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 =3D local_err ? NULL : &local_err; - dc->unrealize(dev, local_errp); + dc->unrealize(dev, local_err ? NULL : &local_err); } dev->pending_deleted_event =3D true; DEVICE_LISTENER_CALL(unrealize, Reverse, dev); - } =20 - if (local_err !=3D NULL) { - goto fail; + if (local_err !=3D NULL) { + goto fail; + } } =20 + assert(local_err =3D=3D NULL); dev->realized =3D value; return; =20 @@ -976,7 +974,7 @@ static bool device_get_hotpluggable(Object *obj, Error = **errp) qbus_is_hotpluggable(dev->parent_bus)); } =20 -static bool device_get_hotplugged(Object *obj, Error **err) +static bool device_get_hotplugged(Object *obj, Error **errp) { DeviceState *dev =3D DEVICE(obj); =20 --=20 2.21.0