diff options
| author | Greg Kurz | 2020-11-20 18:46:39 +0100 |
|---|---|---|
| committer | David Gibson | 2020-12-14 05:50:55 +0100 |
| commit | 484d774c3a5cefd7991ff2bee9bd70977bcb9a67 (patch) | |
| tree | 80c41d75d3f07f9b3451661008a122038f667087 /hw/intc | |
| parent | Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-6.0-pull-request' ... (diff) | |
| download | qemu-484d774c3a5cefd7991ff2bee9bd70977bcb9a67.tar.gz qemu-484d774c3a5cefd7991ff2bee9bd70977bcb9a67.tar.xz qemu-484d774c3a5cefd7991ff2bee9bd70977bcb9a67.zip | |
spapr/xive: Turn some sanity checks into assertions
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>
Message-Id: <20201120174646.619395-2-groug@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/intc')
| -rw-r--r-- | hw/intc/spapr_xive.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 1fa09f287a..60e0d5769d 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. */ |