[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 10/34] spapr: Eliminate nr_irqs parameter to SpaprIrq::init
From: |
David Gibson |
Subject: |
[PATCH v3 10/34] spapr: Eliminate nr_irqs parameter to SpaprIrq::init |
Date: |
Wed, 2 Oct 2019 12:51:44 +1000 |
The only reason this parameter was needed was to work around the
inconsistent meaning of nr_irqs between xics and xive. Now that we've
fixed that, we can consistently use the number directly in the SpaprIrq
configuration.
Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Cédric Le Goater <address@hidden>
Reviewed-by: Greg Kurz <address@hidden>
---
hw/ppc/spapr_irq.c | 21 ++++++++++-----------
include/hw/ppc/spapr_irq.h | 2 +-
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
index 3207b6bd01..cded3a0154 100644
--- a/hw/ppc/spapr_irq.c
+++ b/hw/ppc/spapr_irq.c
@@ -92,8 +92,7 @@ static void spapr_irq_init_kvm(SpaprMachineState *spapr,
* XICS IRQ backend.
*/
-static void spapr_irq_init_xics(SpaprMachineState *spapr, int nr_xirqs,
- Error **errp)
+static void spapr_irq_init_xics(SpaprMachineState *spapr, Error **errp)
{
Object *obj;
Error *local_err = NULL;
@@ -102,7 +101,8 @@ static void spapr_irq_init_xics(SpaprMachineState *spapr,
int nr_xirqs,
object_property_add_child(OBJECT(spapr), "ics", obj, &error_abort);
object_property_add_const_link(obj, ICS_PROP_XICS, OBJECT(spapr),
&error_fatal);
- object_property_set_int(obj, nr_xirqs, "nr-irqs", &error_fatal);
+ object_property_set_int(obj, spapr->irq->nr_xirqs,
+ "nr-irqs", &error_fatal);
object_property_set_bool(obj, true, "realized", &local_err);
if (local_err) {
error_propagate(errp, local_err);
@@ -256,15 +256,15 @@ SpaprIrq spapr_irq_xics = {
/*
* XIVE IRQ backend.
*/
-static void spapr_irq_init_xive(SpaprMachineState *spapr, int nr_xirqs,
- Error **errp)
+static void spapr_irq_init_xive(SpaprMachineState *spapr, Error **errp)
{
uint32_t nr_servers = spapr_max_server_number(spapr);
DeviceState *dev;
int i;
dev = qdev_create(NULL, TYPE_SPAPR_XIVE);
- qdev_prop_set_uint32(dev, "nr-irqs", nr_xirqs + SPAPR_XIRQ_BASE);
+ qdev_prop_set_uint32(dev, "nr-irqs",
+ spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE);
/*
* 8 XIVE END structures per CPU. One for each available priority
*/
@@ -438,18 +438,17 @@ static SpaprIrq *spapr_irq_current(SpaprMachineState
*spapr)
&spapr_irq_xive : &spapr_irq_xics;
}
-static void spapr_irq_init_dual(SpaprMachineState *spapr, int nr_xirqs,
- Error **errp)
+static void spapr_irq_init_dual(SpaprMachineState *spapr, Error **errp)
{
Error *local_err = NULL;
- spapr_irq_xics.init(spapr, spapr_irq_xics.nr_xirqs, &local_err);
+ spapr_irq_xics.init(spapr, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
}
- spapr_irq_xive.init(spapr, spapr_irq_xive.nr_xirqs, &local_err);
+ spapr_irq_xive.init(spapr, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
@@ -678,7 +677,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
spapr_irq_msi_init(spapr, spapr->irq->nr_msis);
}
- spapr->irq->init(spapr, spapr->irq->nr_xirqs, errp);
+ spapr->irq->init(spapr, errp);
spapr->qirqs = qemu_allocate_irqs(spapr->irq->set_irq, spapr,
spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE);
diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
index a8f9a2ab11..7e26288fcd 100644
--- a/include/hw/ppc/spapr_irq.h
+++ b/include/hw/ppc/spapr_irq.h
@@ -41,7 +41,7 @@ typedef struct SpaprIrq {
uint32_t nr_msis;
uint8_t ov5;
- void (*init)(SpaprMachineState *spapr, int nr_irqs, Error **errp);
+ void (*init)(SpaprMachineState *spapr, Error **errp);
int (*claim)(SpaprMachineState *spapr, int irq, bool lsi, Error **errp);
void (*free)(SpaprMachineState *spapr, int irq, int num);
qemu_irq (*qirq)(SpaprMachineState *spapr, int irq);
--
2.21.0
- Re: [PATCH v3 23/34] spapr, xics, xive: Move irq claim and free from SpaprIrq to SpaprInterruptController, (continued)
- [PATCH v3 03/34] xics: Rename misleading ics_simple_*() functions, David Gibson, 2019/10/01
- [PATCH v3 08/34] spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper, David Gibson, 2019/10/01
- [PATCH v3 11/34] spapr: Fix indexing of XICS irqs, David Gibson, 2019/10/01
- [PATCH v3 15/34] spapr: Handle freeing of multiple irqs in frontend only, David Gibson, 2019/10/01
- [PATCH v3 05/34] xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes, David Gibson, 2019/10/01
- [PATCH v3 24/34] spapr: Formalize notion of active interrupt controller, David Gibson, 2019/10/01
- [PATCH v3 10/34] spapr: Eliminate nr_irqs parameter to SpaprIrq::init,
David Gibson <=
- [PATCH v3 19/34] spapr: Add return value to spapr_irq_check(), David Gibson, 2019/10/01
- [PATCH v3 12/34] spapr: Simplify spapr_qirq() handling, David Gibson, 2019/10/01
- [PATCH v3 16/34] spapr, xics, xive: Better use of assert()s on irq claim/free paths, David Gibson, 2019/10/01
- [PATCH v3 09/34] spapr: Clarify and fix handling of nr_irqs, David Gibson, 2019/10/01
- [PATCH v3 17/34] xive: Improve irq claim/free path, David Gibson, 2019/10/01
- [PATCH v3 20/34] spapr: Eliminate SpaprIrq::init hook, David Gibson, 2019/10/01
- [PATCH v3 13/34] spapr: Eliminate SpaprIrq:get_nodename method, David Gibson, 2019/10/01