From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D596BC4360C for ; Fri, 4 Oct 2019 10:39:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A13722133F for ; Fri, 4 Oct 2019 10:39:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="dak6aK7/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A13722133F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGL09-0003fU-6E for qemu-devel@archiver.kernel.org; Fri, 04 Oct 2019 06:39:57 -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-Type: text/plain; charset=UTF-8 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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,= Error **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,= Error **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,kerne= l-irqchip=3Don"); - return; + return -1; } + + return 0; } =20 /* @@ -589,7 +591,6 @@ static void spapr_irq_check(SpaprMachineState *spapr,= Error **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 pse= ries"); @@ -602,9 +603,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error *= *errp) 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