From nobody Wed Nov 12 11:55:38 2025 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; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1570185607; cv=none; d=zoho.com; s=zohoarc; b=dWLTBsFvTtcbsI22OVS6GSTH9Zeck20RCfrwyKV2gBGxPL7OTLcnX/7oK353azbRpFmFTDeFWIfvUAnSyWgcH7v15dA5Dukrp7Zoyp0iEjmaT5HbAPIih80FUpRhE3uHFIY/hIO56zGyithOrTRJahXTRXSLK96uyE4CCi/yXNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570185607; h=Content-Type: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:ARC-Authentication-Results; bh=Gv0pGJZkVCB9STet5yE0TfySsACSPiXRlDelzF95C5M=; b=mL/Lpvn4qCH9mf1CywU+bmBSkayKXO+4dhSisHNL93OwH9DuwQWQkc8FjQPq+a9WtmsSMer1XYiEecninwMw2yrYlTmKg22qbxZoOxBVkn+ALVk8EfPAumuKPwDiliQfW5hATYYqgnONuv6JUWN7J9aTqE9hAiL1yn62Hyiic3Y= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 1570185607310749.2610795530081; Fri, 4 Oct 2019 03:40:07 -0700 (PDT) Received: from localhost ([::1]:45866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGL0H-0003fU-9O for importer@patchew.org; Fri, 04 Oct 2019 06:40:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53530) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGK3U-0006Gn-VS for qemu-devel@nongnu.org; Fri, 04 Oct 2019 05:39:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGK3T-0006LM-Lf for qemu-devel@nongnu.org; Fri, 04 Oct 2019 05:39:20 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:55085) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iGK3T-0006J5-9n; Fri, 04 Oct 2019 05:39:19 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 46l4YT3cYZz9sSd; Fri, 4 Oct 2019 19:38:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1570181885; bh=Hrt+neE3jUIVeh3i1+Ng8FI9VT/eHGjQlwvnQTX38yE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dak6aK7/yJG8VOVXNQwyfLdSp1SzCzpm7ONXYRkjP7ZfwZe1akjUcG/NY0yLzoDK1 k7s/Tf9Ge08skuV6fn/afh26w/ym8LHIAA5vuv8NCzERZrvu2rtJPFuifhZ60FacsN 02+88TOhivvBJtKU/sOZkNS+ta8QEhKAOtrugwm8= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 51/53] spapr: Add return value to spapr_irq_check() Date: Fri, 4 Oct 2019 19:37:45 +1000 Message-Id: <20191004093747.31350-52-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191004093747.31350-1-david@gibson.dropbear.id.au> References: <20191004093747.31350-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 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: lvivier@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.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" Explicitly return success or failure, rather than just relying on the Error ** parameter. This makes handling it less verbose in the caller. Signed-off-by: David Gibson Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Greg Kurz --- hw/ppc/spapr_irq.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 3ac67ba0c7..0413fbd0a3 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -529,7 +529,7 @@ SpaprIrq spapr_irq_dual =3D { }; =20 =20 -static void spapr_irq_check(SpaprMachineState *spapr, Error **errp) +static int spapr_irq_check(SpaprMachineState *spapr, Error **errp) { MachineState *machine =3D MACHINE(spapr); =20 @@ -545,7 +545,7 @@ static void spapr_irq_check(SpaprMachineState *spapr, E= rror **errp) */ if (spapr->irq =3D=3D &spapr_irq_dual) { spapr->irq =3D &spapr_irq_xics; - return; + return 0; } =20 /* @@ -565,7 +565,7 @@ static void spapr_irq_check(SpaprMachineState *spapr, E= rror **errp) */ if (spapr->irq =3D=3D &spapr_irq_xive) { error_setg(errp, "XIVE-only machines require a POWER9 CPU"); - return; + return -1; } } =20 @@ -579,8 +579,10 @@ static void spapr_irq_check(SpaprMachineState *spapr, = Error **errp) machine_kernel_irqchip_required(machine) && xics_kvm_has_broken_disconnect(spapr)) { error_setg(errp, "KVM is too old to support ic-mode=3Ddual,kernel-= irqchip=3Don"); - return; + return -1; } + + return 0; } =20 /* @@ -589,7 +591,6 @@ static void spapr_irq_check(SpaprMachineState *spapr, E= rror **errp) void spapr_irq_init(SpaprMachineState *spapr, Error **errp) { MachineState *machine =3D MACHINE(spapr); - Error *local_err =3D NULL; =20 if (machine_kernel_irqchip_split(machine)) { error_setg(errp, "kernel_irqchip split mode not supported on pseri= es"); @@ -602,9 +603,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **e= rrp) return; } =20 - spapr_irq_check(spapr, &local_err); - if (local_err) { - error_propagate(errp, local_err); + if (spapr_irq_check(spapr, errp) < 0) { return; } =20 --=20 2.21.0