diff options
| author | Greg Kurz <groug@kaod.org> | 2020-08-10 18:54:40 +0200 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2020-08-13 21:00:52 +1000 |
| commit | d53482a73bba983f521d6b9652e6f68e856ab794 (patch) | |
| tree | 498af713537d603134754dd14a83949374ddeafb /hw/intc | |
| parent | f9a548edf2a54f59c37032dee3763f532e968fee (diff) | |
| download | qemu-d53482a73bba983f521d6b9652e6f68e856ab794.zip qemu-d53482a73bba983f521d6b9652e6f68e856ab794.tar.gz qemu-d53482a73bba983f521d6b9652e6f68e856ab794.tar.bz2 | |
spapr/xive: Rework error handling in kvmppc_xive_get_queues()
Since kvmppc_xive_get_queue_config() has a return value, convert
kvmppc_xive_get_queues() to use it for error checking. This allows
to get rid of the local_err boiler plate.
Propagate the return value so that callers may use it as well to check
failures.
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <159707848069.1489912.14879208798696134531.stgit@bahia.lan>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/intc')
| -rw-r--r-- | hw/intc/spapr_xive_kvm.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c index 696623f..4142aaf 100644 --- a/hw/intc/spapr_xive_kvm.c +++ b/hw/intc/spapr_xive_kvm.c @@ -467,23 +467,24 @@ void kvmppc_xive_reset(SpaprXive *xive, Error **errp) NULL, true, errp); } -static void kvmppc_xive_get_queues(SpaprXive *xive, Error **errp) +static int kvmppc_xive_get_queues(SpaprXive *xive, Error **errp) { - Error *local_err = NULL; int i; + int ret; for (i = 0; i < xive->nr_ends; i++) { if (!xive_end_is_valid(&xive->endt[i])) { continue; } - kvmppc_xive_get_queue_config(xive, SPAPR_XIVE_BLOCK_ID, i, - &xive->endt[i], &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; + ret = kvmppc_xive_get_queue_config(xive, SPAPR_XIVE_BLOCK_ID, i, + &xive->endt[i], errp); + if (ret < 0) { + return ret; } } + + return 0; } /* |