[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v1 08/11] ppc/xics: Use a helper to add a new ICS
From: |
Nikunj A Dadhania |
Subject: |
[Qemu-ppc] [PATCH v1 08/11] ppc/xics: Use a helper to add a new ICS |
Date: |
Thu, 23 Jun 2016 23:17:27 +0530 |
From: Benjamin Herrenschmidt <address@hidden>
Signed-off-by: Benjamin Herrenschmidt <address@hidden>
[Move object allocation and adding child to the helper]
Signed-off-by: Nikunj A Dadhania <address@hidden>
---
hw/intc/xics.c | 10 ++++++++++
hw/intc/xics_spapr.c | 7 +------
include/hw/ppc/xics.h | 1 +
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index ef2a1e4..326d21f 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -108,6 +108,16 @@ static void xics_common_reset(DeviceState *d)
}
}
+void xics_add_ics(XICSState *xics)
+{
+ ICSState *ics;
+
+ ics = ICS(object_new(TYPE_ICS));
+ object_property_add_child(OBJECT(xics), "ics", OBJECT(ics), NULL);
+ ics->xics = xics;
+ QLIST_INSERT_HEAD(&xics->ics, ics, list);
+}
+
static void xics_prop_get_nr_irqs(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
index b03dd0d..8acafd9 100644
--- a/hw/intc/xics_spapr.c
+++ b/hw/intc/xics_spapr.c
@@ -289,14 +289,9 @@ static void xics_spapr_realize(DeviceState *dev, Error
**errp)
static void xics_spapr_initfn(Object *obj)
{
XICSState *xics = XICS(obj);
- ICSState *ics;
QLIST_INIT(&xics->ics);
-
- ics = ICS(object_new(TYPE_ICS));
- object_property_add_child(obj, "ics", OBJECT(ics), NULL);
- ics->xics = xics;
- QLIST_INSERT_HEAD(&xics->ics, ics, list);
+ xics_add_ics(xics);
}
static void xics_spapr_class_init(ObjectClass *oc, void *data)
diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index 3c63c36..ee0fce2 100644
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@@ -195,5 +195,6 @@ void ics_write_xive(ICSState *ics, int nr, int server,
void ics_set_irq_type(ICSState *ics, int srcno, bool lsi);
ICSState *xics_find_source(XICSState *icp, int irq);
+void xics_add_ics(XICSState *xics);
#endif /* __XICS_H__ */
--
2.7.4
- Re: [Qemu-ppc] [PATCH v1 04/11] ppc/xics: Remove unused xics_set_irq_type(), (continued)
[Qemu-ppc] [PATCH v1 07/11] ppc/xics: An ICS with offset 0 is assumed to be uninitialized, Nikunj A Dadhania, 2016/06/23
[Qemu-ppc] [PATCH v1 08/11] ppc/xics: Use a helper to add a new ICS,
Nikunj A Dadhania <=
[Qemu-ppc] [PATCH v1 11/11] ppc/xics: Add xics to the monitor "info pic" command, Nikunj A Dadhania, 2016/06/23
[Qemu-ppc] [PATCH v1 10/11] ppc/xics: Add "native" XICS subclass, Nikunj A Dadhania, 2016/06/23
[Qemu-ppc] [PATCH v1 09/11] ppc/xics: Split ICS into ics-base and ics class, Nikunj A Dadhania, 2016/06/23