diff options
author | David Gibson | 2019-09-25 05:24:14 +0200 |
---|---|---|
committer | David Gibson | 2019-10-04 11:08:23 +0200 |
commit | e594c2ad1c3207ff308449203fd5abc002ac89c9 (patch) | |
tree | 2850a4d939536591e6c90eea10a49088cefa81b2 /include/hw/ppc/spapr_xive.h | |
parent | spapr, xics, xive: Better use of assert()s on irq claim/free paths (diff) | |
download | qemu-e594c2ad1c3207ff308449203fd5abc002ac89c9.tar.gz qemu-e594c2ad1c3207ff308449203fd5abc002ac89c9.tar.xz qemu-e594c2ad1c3207ff308449203fd5abc002ac89c9.zip |
xive: Improve irq claim/free path
spapr_xive_irq_claim() returns a bool to indicate if it succeeded.
But most of the callers and one callee use int return values and/or an
Error * with more information instead. In any case, ints are a more
common idiom for success/failure states than bools (one never knows
what sense they'll be in).
So instead change to an int return value to indicate presence of error
+ an Error * to describe the details through that call chain.
It also didn't actually check if the irq was already claimed, which is
one of the primary purposes of the claim path, so do that.
spapr_xive_irq_free() also returned a bool... which no callers checked
and was always true, so just drop it.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Greg Kurz <groug@kaod.org>
Diffstat (limited to 'include/hw/ppc/spapr_xive.h')
-rw-r--r-- | include/hw/ppc/spapr_xive.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h index bfd40f01d8..0df20a6590 100644 --- a/include/hw/ppc/spapr_xive.h +++ b/include/hw/ppc/spapr_xive.h @@ -54,8 +54,8 @@ typedef struct SpaprXive { */ #define SPAPR_XIVE_BLOCK_ID 0x0 -bool spapr_xive_irq_claim(SpaprXive *xive, uint32_t lisn, bool lsi); -bool spapr_xive_irq_free(SpaprXive *xive, uint32_t lisn); +int spapr_xive_irq_claim(SpaprXive *xive, int lisn, bool lsi, Error **errp); +void spapr_xive_irq_free(SpaprXive *xive, int lisn); void spapr_xive_pic_print_info(SpaprXive *xive, Monitor *mon); int spapr_xive_post_load(SpaprXive *xive, int version_id); |