From nobody Tue Feb 10 08:27:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495684416412972.3086106225757; Wed, 24 May 2017 20:53:36 -0700 (PDT) Received: from localhost ([::1]:57987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDjqA-0000E4-Uy for importer@patchew.org; Wed, 24 May 2017 23:53:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDjoO-0006Ua-SA for qemu-devel@nongnu.org; Wed, 24 May 2017 23:51:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDjoL-0007S9-Ow for qemu-devel@nongnu.org; Wed, 24 May 2017 23:51:44 -0400 Received: from ozlabs.org ([103.22.144.67]:38875) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dDjoK-0007R1-UO; Wed, 24 May 2017 23:51:41 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3wYFgX4VDWz9sD5; Thu, 25 May 2017 13:51:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1495684296; bh=SZI6KdO8fUNUi8xYaEtcxrbNwnFJFkGkIpk9em+eCcs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XH7gA2wTOGyYjrroeVGlMJb86hY7bTAh4D1a19eCGAQ/E4y7N317xejy/haeBdLEA m3OWFWYg05FnkhufQBTcfCmk96ab9WimEKpgk7bF8hmIVLa+yMs+EOS0fOStGWJdbL 5RARf8Ku/mGGLB6QRormpK041ZAB5T1kI4SHAEHc= From: David Gibson To: peter.maydell@linaro.org Date: Thu, 25 May 2017 13:51:17 +1000 Message-Id: <20170525035132.24268-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170525035132.24268-1-david@gibson.dropbear.id.au> References: <20170525035132.24268-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 03/18] spapr: sanitize error handling in spapr_ics_create() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, aik@ozlabs.ru, sursingh@redhat.com, agraf@suse.de, mdroth@linux.vnet.ibm.com, Greg Kurz , qemu-ppc@nongnu.org, sbobroff@redhat.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Greg Kurz The spapr_ics_create() function handles errors in a rather convoluted way, with two local Error * variables. Moreover, failing to parent the ICS object to the machine should be considered as a bug but it is currently ignored. This patch addresses both issues. Signed-off-by: Greg Kurz Signed-off-by: David Gibson --- hw/ppc/spapr.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 18709ad..a9471b9 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -101,21 +101,26 @@ static ICSState *spapr_ics_create(sPAPRMachineState *= spapr, const char *type_ics, int nr_irqs, Error **errp) { - Error *err =3D NULL, *local_err =3D NULL; + Error *local_err =3D NULL; Object *obj; =20 obj =3D object_new(type_ics); - object_property_add_child(OBJECT(spapr), "ics", obj, NULL); + object_property_add_child(OBJECT(spapr), "ics", obj, &error_abort); object_property_add_const_link(obj, "xics", OBJECT(spapr), &error_abor= t); - object_property_set_int(obj, nr_irqs, "nr-irqs", &err); + object_property_set_int(obj, nr_irqs, "nr-irqs", &local_err); + if (local_err) { + goto error; + } object_property_set_bool(obj, true, "realized", &local_err); - error_propagate(&err, local_err); - if (err) { - error_propagate(errp, err); - return NULL; + if (local_err) { + goto error; } =20 return ICS_SIMPLE(obj); + +error: + error_propagate(errp, local_err); + return NULL; } =20 static void xics_system_init(MachineState *machine, int nr_irqs, Error **e= rrp) --=20 2.9.4