From nobody Mon Nov 17 01:31:06 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1602239304; cv=none; d=zohomail.com; s=zohoarc; b=E+4EVvfUdhdCWBDWaFLdHwshOTO9qXoG1Pyg6lNUEJi48OEYHO3c3M0BhB6+IMsAH3RUxbWycwzOw8Xi+jo1nK8fQcBvPzSwZlBl3rMxzNQKIBR38ulLpdxQZw4mzXu6kmGHswOK0ZErkBIrmBDjsOG+dpvGyy+FDNx2jH8pyD8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602239304; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Dq1K8TBo/ihwAQ81vY+sPiIx75VL4Y4k8rYdwAk22zg=; b=hsEpcE/qHf2mtyMsvmyODasXgThstnvhq/2Gh+BdOYqSP5mOeqJZG5n3C3ruCki31ARzCRMkGRXKo4FPZYIWzyzC4jfzhAtS0PGRMXEyDRnsVX4QjB4DlF4V4NzR2tdyjP/QVmVZ3MqCt4bJXy0Xnj/OuTjai5Uol/ui9Q9HCKc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602239304489119.10330121268714; Fri, 9 Oct 2020 03:28:24 -0700 (PDT) Received: from localhost ([::1]:34950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQpdP-0005NA-8j for importer@patchew.org; Fri, 09 Oct 2020 06:28:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQpVV-0005FQ-AB for qemu-devel@nongnu.org; Fri, 09 Oct 2020 06:20:13 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:44509 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQpVS-0001n0-6Q for qemu-devel@nongnu.org; Fri, 09 Oct 2020 06:20:12 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4C73wX3tPcz9sVx; Fri, 9 Oct 2020 21:19:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1602238796; bh=jYLGZktOinVgDUl+krzeyhCVcCQ603d/QSk/hmkhAlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CgFabBfxFyVgG/eQ97W0t9GVDfCepQVeZ1b5+c6cgsoqpfoMECRpmwjcGo+apRmqI Ubn7hQtr0x1SG6VaTkyAl2sPi0fC8/GaAu+2N5JC2Q9rzrP5VAPQA9eG/gicLAXElG 1yae12ENI/liVUdEQ02GLwJ9NqqFUhZ6spHmXACA= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 08/20] spapr: Simplify error handling in spapr_vio_busdev_realize() Date: Fri, 9 Oct 2020 21:19:39 +1100 Message-Id: <20201009101951.1569252-9-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201009101951.1569252-1-david@gibson.dropbear.id.au> References: <20201009101951.1569252-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/09 06:19:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Vladimir Sementsov-Ogievskiy , dbarboza@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nonngu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Greg Kurz Use the return value of spapr_irq_findone() and spapr_irq_claim() to detect failures. This allows to reduce the error propagation overhead. Signed-off-by: Greg Kurz Message-Id: <20200914123505.612812-8-groug@kaod.org> Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: David Gibson --- hw/ppc/spapr_vio.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 731080d989..44fdd64b88 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -474,7 +474,6 @@ static void spapr_vio_busdev_realize(DeviceState *qdev,= Error **errp) SpaprVioDevice *dev =3D (SpaprVioDevice *)qdev; SpaprVioDeviceClass *pc =3D VIO_SPAPR_DEVICE_GET_CLASS(dev); char *id; - Error *local_err =3D NULL; =20 if (dev->reg !=3D -1) { /* @@ -510,16 +509,15 @@ static void spapr_vio_busdev_realize(DeviceState *qde= v, Error **errp) dev->irq =3D spapr_vio_reg_to_irq(dev->reg); =20 if (SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { - dev->irq =3D spapr_irq_findone(spapr, &local_err); - if (local_err) { - error_propagate(errp, local_err); + int irq =3D spapr_irq_findone(spapr, errp); + + if (irq < 0) { return; } + dev->irq =3D irq; } =20 - spapr_irq_claim(spapr, dev->irq, false, &local_err); - if (local_err) { - error_propagate(errp, local_err); + if (spapr_irq_claim(spapr, dev->irq, false, errp) < 0) { return; } =20 --=20 2.26.2