From: David Gibson <david@gibson.dropbear.id.au>
To: Greg Kurz <groug@kaod.org>
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
qemu-devel@nongnu.org, "Laurent Vivier" <laurent@vivier.eu>,
qemu-ppc@nongnu.org, clg@kaod.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
philmd@redhat.com
Subject: Re: [PATCH 17/20] spapr: Remove unused return value in claim path
Date: Fri, 27 Sep 2019 11:47:49 +1000 [thread overview]
Message-ID: <20190927014749.GF17405@umbus> (raw)
In-Reply-To: <20190926103602.0c948b6f@bahia.lan>
[-- Attachment #1: Type: text/plain, Size: 6376 bytes --]
On Thu, Sep 26, 2019 at 10:36:02AM +0200, Greg Kurz wrote:
> On Wed, 25 Sep 2019 16:45:31 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
>
> > spapr_irq_claim() and the hooks it is based on return an integer error code
> > as well as taking an Error ** parameter. But none of the callers check the
> > integer, so we can remove it and just use the richer Error **.
> >
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > ---
>
> FYI, the very same topic of using the return value versus Error ** to
> check errors was discussed recently in this thread:
>
> https://lists.gnu.org/archive/html/qemu-devel/2019-09/msg04197.html
>
> I tend to agree with Daniel (Cc'd) at first thought, but I don't have a strong
> opinion about this yet. It is mostly to inform you that people are currently
> discussing/working on it.
So, I made this change mostly because redundant encodings give me an
itch. But having read that post and then experimented a bit, I found
the approach he proposes does cut down a noticeable amount of
boilerplate.
So I think I'll move towards that approach and drop this patch.
>
> > hw/ppc/spapr_irq.c | 32 +++++++++++++-------------------
> > include/hw/ppc/spapr_irq.h | 4 ++--
> > 2 files changed, 15 insertions(+), 21 deletions(-)
> >
> > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> > index 261d66ba17..2673a90604 100644
> > --- a/hw/ppc/spapr_irq.c
> > +++ b/hw/ppc/spapr_irq.c
> > @@ -112,8 +112,8 @@ static void spapr_irq_init_xics(SpaprMachineState *spapr, Error **errp)
> > spapr->ics = ICS_SPAPR(obj);
> > }
> >
> > -static int spapr_irq_claim_xics(SpaprMachineState *spapr, int irq, bool lsi,
> > - Error **errp)
> > +static void spapr_irq_claim_xics(SpaprMachineState *spapr, int irq, bool lsi,
> > + Error **errp)
> > {
> > ICSState *ics = spapr->ics;
> >
> > @@ -122,11 +122,10 @@ static int spapr_irq_claim_xics(SpaprMachineState *spapr, int irq, bool lsi,
> >
> > if (!ics_irq_free(ics, irq - ics->offset)) {
> > error_setg(errp, "IRQ %d is not free", irq);
> > - return -1;
> > + return;
> > }
> >
> > ics_set_irq_type(ics, irq - ics->offset, lsi);
> > - return 0;
> > }
> >
> > static void spapr_irq_free_xics(SpaprMachineState *spapr, int irq)
> > @@ -252,14 +251,12 @@ static void spapr_irq_init_xive(SpaprMachineState *spapr, Error **errp)
> > spapr_xive_hcall_init(spapr);
> > }
> >
> > -static int spapr_irq_claim_xive(SpaprMachineState *spapr, int irq, bool lsi,
> > - Error **errp)
> > +static void spapr_irq_claim_xive(SpaprMachineState *spapr, int irq, bool lsi,
> > + Error **errp)
> > {
> > if (!spapr_xive_irq_claim(spapr->xive, irq, lsi)) {
> > error_setg(errp, "IRQ %d is invalid", irq);
> > - return -1;
> > }
> > - return 0;
> > }
> >
> > static void spapr_irq_free_xive(SpaprMachineState *spapr, int irq)
> > @@ -406,25 +403,22 @@ static void spapr_irq_init_dual(SpaprMachineState *spapr, Error **errp)
> > }
> > }
> >
> > -static int spapr_irq_claim_dual(SpaprMachineState *spapr, int irq, bool lsi,
> > - Error **errp)
> > +static void spapr_irq_claim_dual(SpaprMachineState *spapr, int irq, bool lsi,
> > + Error **errp)
> > {
> > Error *local_err = NULL;
> > - int ret;
> >
> > - ret = spapr_irq_xics.claim(spapr, irq, lsi, &local_err);
> > + spapr_irq_xics.claim(spapr, irq, lsi, &local_err);
> > if (local_err) {
> > error_propagate(errp, local_err);
> > - return ret;
> > + return;
> > }
> >
> > - ret = spapr_irq_xive.claim(spapr, irq, lsi, &local_err);
> > + spapr_irq_xive.claim(spapr, irq, lsi, &local_err);
> > if (local_err) {
> > error_propagate(errp, local_err);
> > - return ret;
> > + return;
> > }
> > -
> > - return ret;
> > }
> >
> > static void spapr_irq_free_dual(SpaprMachineState *spapr, int irq)
> > @@ -622,12 +616,12 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> > spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE);
> > }
> >
> > -int spapr_irq_claim(SpaprMachineState *spapr, int irq, bool lsi, Error **errp)
> > +void spapr_irq_claim(SpaprMachineState *spapr, int irq, bool lsi, Error **errp)
> > {
> > assert(irq >= SPAPR_XIRQ_BASE);
> > assert(irq < (spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE));
> >
> > - return spapr->irq->claim(spapr, irq, lsi, errp);
> > + spapr->irq->claim(spapr, irq, lsi, errp);
> > }
> >
> > void spapr_irq_free(SpaprMachineState *spapr, int irq, int num)
> > diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
> > index ed88b4599a..75279ca137 100644
> > --- a/include/hw/ppc/spapr_irq.h
> > +++ b/include/hw/ppc/spapr_irq.h
> > @@ -42,7 +42,7 @@ typedef struct SpaprIrq {
> > uint8_t ov5;
> >
> > void (*init)(SpaprMachineState *spapr, Error **errp);
> > - int (*claim)(SpaprMachineState *spapr, int irq, bool lsi, Error **errp);
> > + void (*claim)(SpaprMachineState *spapr, int irq, bool lsi, Error **errp);
> > void (*free)(SpaprMachineState *spapr, int irq);
> > void (*print_info)(SpaprMachineState *spapr, Monitor *mon);
> > void (*dt_populate)(SpaprMachineState *spapr, uint32_t nr_servers,
> > @@ -61,7 +61,7 @@ extern SpaprIrq spapr_irq_xive;
> > extern SpaprIrq spapr_irq_dual;
> >
> > void spapr_irq_init(SpaprMachineState *spapr, Error **errp);
> > -int spapr_irq_claim(SpaprMachineState *spapr, int irq, bool lsi, Error **errp);
> > +void spapr_irq_claim(SpaprMachineState *spapr, int irq, bool lsi, Error **errp);
> > void spapr_irq_free(SpaprMachineState *spapr, int irq, int num);
> > qemu_irq spapr_qirq(SpaprMachineState *spapr, int irq);
> > int spapr_irq_post_load(SpaprMachineState *spapr, int version_id);
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-09-27 2:35 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 6:45 [PATCH 00/20] spapr: IRQ subsystem cleanups David Gibson
2019-09-25 6:45 ` [PATCH 01/20] xics: Use incomplete type for XICSFabric David Gibson
2019-09-25 6:55 ` Cédric Le Goater
2019-09-25 7:48 ` Greg Kurz
2019-09-25 7:45 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 02/20] xics: Eliminate 'reject', 'resend' and 'eoi' class hooks David Gibson
2019-09-25 6:45 ` [PATCH 03/20] xics: Rename misleading ics_simple_*() functions David Gibson
2019-09-25 6:45 ` [PATCH 04/20] xics: Eliminate reset hook David Gibson
2019-09-25 7:33 ` Cédric Le Goater
2019-09-25 7:59 ` Greg Kurz
2019-09-26 2:54 ` David Gibson
2019-09-25 6:45 ` [PATCH 05/20] xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes David Gibson
2019-09-25 8:16 ` Greg Kurz
2019-09-25 8:31 ` Greg Kurz
2019-09-26 0:55 ` David Gibson
2019-09-26 0:52 ` David Gibson
2019-09-25 12:47 ` Cédric Le Goater
2019-09-25 6:45 ` [PATCH 06/20] xics: Create sPAPR specific ICS subtype David Gibson
2019-09-25 7:34 ` Cédric Le Goater
2019-09-25 8:40 ` Greg Kurz
2019-09-25 8:55 ` Cédric Le Goater
2019-09-25 9:07 ` Greg Kurz
2019-09-26 0:56 ` David Gibson
2019-09-26 7:09 ` Cédric Le Goater
2019-09-27 16:05 ` Greg Kurz
2019-09-30 8:45 ` David Gibson
2019-09-30 17:00 ` Greg Kurz
2019-10-01 1:45 ` David Gibson
2019-09-25 6:45 ` [PATCH 07/20] spapr: Fold spapr_phb_lsi_qirq() into its single caller David Gibson
2019-09-25 6:58 ` Cédric Le Goater
2019-09-25 8:56 ` Greg Kurz
2019-09-26 7:08 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 08/20] spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper David Gibson
2019-09-25 6:58 ` Cédric Le Goater
2019-09-25 8:57 ` Greg Kurz
2019-09-26 7:08 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 09/20] spapr: Clarify and fix handling of nr_irqs David Gibson
2019-09-25 7:05 ` Cédric Le Goater
2019-09-26 1:03 ` David Gibson
2019-09-26 7:02 ` Cédric Le Goater
2019-09-25 17:13 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 10/20] spapr: Eliminate nr_irqs parameter to SpaprIrq::init David Gibson
2019-09-25 7:06 ` Cédric Le Goater
2019-09-25 17:16 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 11/20] spapr: Fix indexing of XICS irqs David Gibson
2019-09-25 7:11 ` Cédric Le Goater
2019-09-25 20:17 ` Greg Kurz
2019-09-26 1:31 ` David Gibson
2019-09-26 7:21 ` Greg Kurz
2019-09-26 11:32 ` David Gibson
2019-09-26 14:44 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 12/20] spapr: Simplify spapr_qirq() handling David Gibson
2019-09-25 7:16 ` Cédric Le Goater
2019-09-25 20:30 ` Greg Kurz
2019-09-26 7:10 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 13/20] spapr: Eliminate SpaprIrq:get_nodename method David Gibson
2019-09-25 7:19 ` Cédric Le Goater
2019-09-26 7:11 ` Philippe Mathieu-Daudé
2019-09-26 7:48 ` Greg Kurz
2019-09-26 11:36 ` David Gibson
2019-09-25 6:45 ` [PATCH 14/20] spapr: Remove unhelpful tracepoints from spapr_irq_free_xics() David Gibson
2019-09-25 7:20 ` Cédric Le Goater
2019-09-26 7:11 ` Philippe Mathieu-Daudé
2019-09-26 7:50 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 15/20] spapr: Handle freeing of multiple irqs in frontend only David Gibson
2019-09-25 7:21 ` Cédric Le Goater
2019-09-26 7:52 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 16/20] spapr, xics, xive: Better use of assert()s on irq claim/free paths David Gibson
2019-09-25 7:22 ` Cédric Le Goater
2019-09-26 8:08 ` Greg Kurz
2019-09-26 11:39 ` David Gibson
2019-09-25 6:45 ` [PATCH 17/20] spapr: Remove unused return value in claim path David Gibson
2019-09-25 7:23 ` Cédric Le Goater
2019-09-26 7:13 ` Philippe Mathieu-Daudé
2019-09-26 8:36 ` Greg Kurz
2019-09-27 1:47 ` David Gibson [this message]
2019-09-25 6:45 ` [PATCH 18/20] xive: Improve irq claim/free path David Gibson
2019-09-25 7:25 ` Cédric Le Goater
2019-09-26 1:05 ` David Gibson
2019-09-25 6:45 ` [PATCH 19/20] spapr: Use less cryptic representation of which irq backends are supported David Gibson
2019-09-25 7:28 ` Cédric Le Goater
2019-09-26 9:16 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 20/20] spapr: Eliminate SpaprIrq::init hook David Gibson
2019-09-25 7:31 ` Cédric Le Goater
2019-09-26 1:13 ` David Gibson
2019-09-26 7:05 ` Cédric Le Goater
2019-09-26 11:29 ` David Gibson
2019-09-26 15:35 ` Greg Kurz
2019-09-27 5:51 ` David Gibson
2019-09-27 6:23 ` Greg Kurz
2019-09-26 15:39 ` Greg Kurz
2019-09-27 14:12 ` Greg Kurz
2019-09-29 9:34 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190927014749.GF17405@umbus \
--to=david@gibson.dropbear.id.au \
--cc=berrange@redhat.com \
--cc=clg@kaod.org \
--cc=groug@kaod.org \
--cc=jasowang@redhat.com \
--cc=laurent@vivier.eu \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=riku.voipio@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).