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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 35EEAC352AA for ; Wed, 2 Oct 2019 06:00:53 +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 05102215EA for ; Wed, 2 Oct 2019 06:00:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 05102215EA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFXgu-0003Fz-Pr for qemu-devel@archiver.kernel.org; Wed, 02 Oct 2019 02:00:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44901) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFXeh-0002G2-Tc for qemu-devel@nongnu.org; Wed, 02 Oct 2019 01:58:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFXef-0004ew-R3 for qemu-devel@nongnu.org; Wed, 02 Oct 2019 01:58:31 -0400 Received: from 16.mo1.mail-out.ovh.net ([178.33.104.224]:57014) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFXef-0004bF-Kz for qemu-devel@nongnu.org; Wed, 02 Oct 2019 01:58:29 -0400 Received: from player691.ha.ovh.net (unknown [10.108.54.74]) by mo1.mail-out.ovh.net (Postfix) with ESMTP id B4C8B191DE1 for ; Wed, 2 Oct 2019 07:58:26 +0200 (CEST) Received: from kaod.org (lfbn-1-2229-223.w90-76.abo.wanadoo.fr [90.76.50.223]) (Authenticated sender: clg@kaod.org) by player691.ha.ovh.net (Postfix) with ESMTPSA id 2235EA8D7127; Wed, 2 Oct 2019 05:58:16 +0000 (UTC) Subject: Re: [PATCH v3 19/34] spapr: Add return value to spapr_irq_check() To: David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org References: <20191002025208.3487-1-david@gibson.dropbear.id.au> <20191002025208.3487-20-david@gibson.dropbear.id.au> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: <15987e67-7362-7340-bf7f-471a1c81e46a@kaod.org> Date: Wed, 2 Oct 2019 07:58:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.0 MIME-Version: 1.0 In-Reply-To: <20191002025208.3487-20-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=utf-8 Content-Language: en-US X-Ovh-Tracer-Id: 4360047392791694233 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrgeehgddutdduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 178.33.104.224 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: Jason Wang , Riku Voipio , Laurent Vivier , groug@kaod.org, Paolo Bonzini , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 02/10/2019 04:51, David Gibson wrote: > Explicitly return success or failure, rather than just relying on the > Error ** parameter. This makes handling it less verbose in the caller. >=20 > Signed-off-by: David Gibson Reviewed-by: C=C3=A9dric Le Goater > --- > hw/ppc/spapr_irq.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) >=20 > 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 *spap= r, 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 *spap= r, 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 *spa= pr, 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,ker= nel-irqchip=3Don"); > - return; > + return -1; > } > + > + return 0; > } > =20 > /* > @@ -589,7 +591,6 @@ static void spapr_irq_check(SpaprMachineState *spap= r, 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 p= series"); > @@ -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