On Mon, Aug 10, 2020 at 06:54:47PM +0200, Greg Kurz wrote: > Since kvm_device_access() returns a negative errno on failure, convert > kvmppc_xive_set_source_config() to use it for error checking. This allows > to get rid of the local_err boilerplate. > > Propagate the return value so that callers may use it as well to check > failures. > > Signed-off-by: Greg Kurz <gr...@kaod.org>
Applied to ppc-for-5.2.
> ---
> hw/intc/spapr_xive_kvm.c | 13 ++++---------
> include/hw/ppc/spapr_xive.h | 4 ++--
> 2 files changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c
> index 4142aaffff47..f2dda692183b 100644
> --- a/hw/intc/spapr_xive_kvm.c
> +++ b/hw/intc/spapr_xive_kvm.c
> @@ -186,8 +186,8 @@ int kvmppc_xive_cpu_connect(XiveTCTX *tctx, Error **errp)
> * XIVE Interrupt Source (KVM)
> */
>
> -void kvmppc_xive_set_source_config(SpaprXive *xive, uint32_t lisn, XiveEAS
> *eas,
> - Error **errp)
> +int kvmppc_xive_set_source_config(SpaprXive *xive, uint32_t lisn, XiveEAS
> *eas,
> + Error **errp)
> {
> uint32_t end_idx;
> uint32_t end_blk;
> @@ -196,7 +196,6 @@ void kvmppc_xive_set_source_config(SpaprXive *xive,
> uint32_t lisn, XiveEAS *eas,
> bool masked;
> uint32_t eisn;
> uint64_t kvm_src;
> - Error *local_err = NULL;
>
> assert(xive_eas_is_valid(eas));
>
> @@ -216,12 +215,8 @@ void kvmppc_xive_set_source_config(SpaprXive *xive,
> uint32_t lisn, XiveEAS *eas,
> kvm_src |= ((uint64_t)eisn << KVM_XIVE_SOURCE_EISN_SHIFT) &
> KVM_XIVE_SOURCE_EISN_MASK;
>
> - kvm_device_access(xive->fd, KVM_DEV_XIVE_GRP_SOURCE_CONFIG, lisn,
> - &kvm_src, true, &local_err);
> - if (local_err) {
> - error_propagate(errp, local_err);
> - return;
> - }
> + return kvm_device_access(xive->fd, KVM_DEV_XIVE_GRP_SOURCE_CONFIG, lisn,
> + &kvm_src, true, errp);
> }
>
> void kvmppc_xive_sync_source(SpaprXive *xive, uint32_t lisn, Error **errp)
> diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h
> index d0a08b618f79..0ffbe0be0280 100644
> --- a/include/hw/ppc/spapr_xive.h
> +++ b/include/hw/ppc/spapr_xive.h
> @@ -80,8 +80,8 @@ int kvmppc_xive_connect(SpaprInterruptController *intc,
> uint32_t nr_servers,
> Error **errp);
> void kvmppc_xive_disconnect(SpaprInterruptController *intc);
> void kvmppc_xive_reset(SpaprXive *xive, Error **errp);
> -void kvmppc_xive_set_source_config(SpaprXive *xive, uint32_t lisn, XiveEAS
> *eas,
> - Error **errp);
> +int kvmppc_xive_set_source_config(SpaprXive *xive, uint32_t lisn, XiveEAS
> *eas,
> + Error **errp);
> void kvmppc_xive_sync_source(SpaprXive *xive, uint32_t lisn, Error **errp);
> uint64_t kvmppc_xive_esb_rw(XiveSource *xsrc, int srcno, uint32_t offset,
> uint64_t data, bool write);
>
>
--
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
signature.asc
Description: PGP signature
