From nobody Tue Feb 10 01:30:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553180886099205.29364492604043; Thu, 21 Mar 2019 08:08:06 -0700 (PDT) Received: from localhost ([127.0.0.1]:39172 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6zIZ-0000vV-2C for importer@patchew.org; Thu, 21 Mar 2019 11:08:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6z1p-000484-2K for qemu-devel@nongnu.org; Thu, 21 Mar 2019 10:50:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6z1n-0001Qn-6y for qemu-devel@nongnu.org; Thu, 21 Mar 2019 10:50:44 -0400 Received: from 4.mo4.mail-out.ovh.net ([178.32.98.131]:48814) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6z1j-0001Fc-4u for qemu-devel@nongnu.org; Thu, 21 Mar 2019 10:50:41 -0400 Received: from player788.ha.ovh.net (unknown [10.109.146.143]) by mo4.mail-out.ovh.net (Postfix) with ESMTP id 059881DFCD6 for ; Thu, 21 Mar 2019 15:50:35 +0100 (CET) Received: from kaod.org (deibp9eh1--blueice1n0.emea.ibm.com [195.212.29.162]) (Authenticated sender: clg@kaod.org) by player788.ha.ovh.net (Postfix) with ESMTPSA id 717723E6B757; Thu, 21 Mar 2019 14:50:30 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Thu, 21 Mar 2019 15:49:11 +0100 Message-Id: <20190321144914.19934-13-clg@kaod.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190321144914.19934-1-clg@kaod.org> References: <20190321144914.19934-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 11870081243285523430 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedutddrieelgdehhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 178.32.98.131 Subject: [Qemu-devel] [PATCH v3 12/15] spapr/irq: remove 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: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-ppc@nongnu.org, Greg Kurz , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" spapr_ics_create() is only called once. Merge it in spapr_irq_init_xics() and simplify a bit the error handling by using 'error_fatal' . Signed-off-by: C=C3=A9dric Le Goater --- hw/ppc/spapr_irq.c | 44 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index b4e3128b7f06..d7130f66dbaa 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -66,36 +66,11 @@ void spapr_irq_msi_reset(SpaprMachineState *spapr) * XICS IRQ backend. */ =20 -static ICSState *spapr_ics_create(SpaprMachineState *spapr, - int nr_irqs, Error **errp) -{ - Error *local_err =3D NULL; - Object *obj; - - obj =3D object_new(TYPE_ICS_SIMPLE); - object_property_add_child(OBJECT(spapr), "ics", obj, &error_abort); - object_property_add_const_link(obj, ICS_PROP_XICS, OBJECT(spapr), - &error_abort); - 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); - if (local_err) { - goto error; - } - - return ICS_BASE(obj); - -error: - error_propagate(errp, local_err); - return NULL; -} - static void spapr_irq_init_xics(SpaprMachineState *spapr, int nr_irqs, Error **errp) { MachineState *machine =3D MACHINE(spapr); + Object *obj; Error *local_err =3D NULL; bool xics_kvm =3D false; =20 @@ -107,7 +82,8 @@ static void spapr_irq_init_xics(SpaprMachineState *spapr= , int nr_irqs, if (machine_kernel_irqchip_required(machine) && !xics_kvm) { error_prepend(&local_err, "kernel_irqchip requested but unavailable: "); - goto error; + error_propagate(errp, local_err); + return; } error_free(local_err); local_err =3D NULL; @@ -117,10 +93,18 @@ static void spapr_irq_init_xics(SpaprMachineState *spa= pr, int nr_irqs, xics_spapr_init(spapr); } =20 - spapr->ics =3D spapr_ics_create(spapr, nr_irqs, &local_err); + obj =3D object_new(TYPE_ICS_SIMPLE); + object_property_add_child(OBJECT(spapr), "ics", obj, &error_abort); + object_property_add_const_link(obj, ICS_PROP_XICS, OBJECT(spapr), + &error_fatal); + object_property_set_int(obj, nr_irqs, "nr-irqs", &error_fatal); + object_property_set_bool(obj, true, "realized", &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } =20 -error: - error_propagate(errp, local_err); + spapr->ics =3D ICS_BASE(obj); } =20 #define ICS_IRQ_FREE(ics, srcno) \ --=20 2.20.1