[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH for-6.0 1/8] spapr/xive: Turn some sanity checks into asserti
From: |
David Gibson |
Subject: |
Re: [PATCH for-6.0 1/8] spapr/xive: Turn some sanity checks into assertions |
Date: |
Mon, 23 Nov 2020 14:33:08 +1100 |
On Fri, Nov 20, 2020 at 06:46:39PM +0100, Greg Kurz wrote:
> The sPAPR XIVE device is created by the machine in spapr_irq_init().
> The latter overrides any value provided by the user with -global for
> the "nr-irqs" and "nr-ends" properties with strictly positive values.
>
> It seems reasonable to assume these properties should never be 0,
> which wouldn't make much sense by the way.
>
> Signed-off-by: Greg Kurz <groug@kaod.org>
Applied to ppc-for-6.0.
> ---
> hw/intc/spapr_xive.c | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
> index 1fa09f287ac0..60e0d5769dcc 100644
> --- a/hw/intc/spapr_xive.c
> +++ b/hw/intc/spapr_xive.c
> @@ -296,22 +296,16 @@ static void spapr_xive_realize(DeviceState *dev, Error
> **errp)
> XiveENDSource *end_xsrc = &xive->end_source;
> Error *local_err = NULL;
>
> + /* Set by spapr_irq_init() */
> + g_assert(xive->nr_irqs);
> + g_assert(xive->nr_ends);
> +
> sxc->parent_realize(dev, &local_err);
> if (local_err) {
> error_propagate(errp, local_err);
> return;
> }
>
> - if (!xive->nr_irqs) {
> - error_setg(errp, "Number of interrupt needs to be greater 0");
> - return;
> - }
> -
> - if (!xive->nr_ends) {
> - error_setg(errp, "Number of interrupt needs to be greater 0");
> - return;
> - }
> -
> /*
> * Initialize the internal sources, for IPIs and virtual devices.
> */
--
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
- [PATCH for-6.0 0/8] spapr: Address the confusion between IPI numbers and vCPU ids, Greg Kurz, 2020/11/20
- [PATCH for-6.0 4/8] spapr/xive: Add "nr-ipis" property, Greg Kurz, 2020/11/20
- [PATCH for-6.0 1/8] spapr/xive: Turn some sanity checks into assertions, Greg Kurz, 2020/11/20
- [PATCH for-6.0 5/8] spapr/xics: Drop unused argument to xics_kvm_has_broken_disconnect(), Greg Kurz, 2020/11/20
- [PATCH for-6.0 6/8] spapr/xics: Add "nr-servers" property, Greg Kurz, 2020/11/20
- [PATCH for-6.0 7/8] spapr: Drop "nr_servers" argument of the sPAPR IC activate() operation, Greg Kurz, 2020/11/20