From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bls5X-0002xZ-O8 for qemu-devel@nongnu.org; Mon, 19 Sep 2016 02:30:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bls5T-00085Q-Cg for qemu-devel@nongnu.org; Mon, 19 Sep 2016 02:29:58 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:46073) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bls5T-00084x-3c for qemu-devel@nongnu.org; Mon, 19 Sep 2016 02:29:55 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8J6Si7U071214 for ; Mon, 19 Sep 2016 02:29:54 -0400 Received: from e23smtp01.au.ibm.com (e23smtp01.au.ibm.com [202.81.31.143]) by mx0a-001b2d01.pphosted.com with ESMTP id 25h059w2x2-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 19 Sep 2016 02:29:54 -0400 Received: from localhost by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 19 Sep 2016 16:29:52 +1000 From: Nikunj A Dadhania Date: Mon, 19 Sep 2016 11:59:33 +0530 In-Reply-To: <1474266577-11704-1-git-send-email-nikunj@linux.vnet.ibm.com> References: <1474266577-11704-1-git-send-email-nikunj@linux.vnet.ibm.com> Message-Id: <1474266577-11704-6-git-send-email-nikunj@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v4 5/9] ppc/xics: Use a helper to add a new ICS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Cc: qemu-devel@nongnu.org, nikunj@linux.vnet.ibm.com, benh@kernel.crashing.org, clg@kaod.org From: Benjamin Herrenschmidt Signed-off-by: Benjamin Herrenschmidt [Move object allocation and adding child to the helper] Signed-off-by: Nikunj A Dadhania Reviewed-by: David Gibson --- hw/intc/xics.c | 10 ++++++++++ hw/intc/xics_spapr.c | 6 +----- include/hw/ppc/xics.h | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 05e938f..c7901c4 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -109,6 +109,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 0b0845d..270f20e 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -305,12 +305,8 @@ static void xics_spapr_realize(DeviceState *dev, Error **errp) static void xics_spapr_initfn(Object *obj) { XICSState *xics = XICS_SPAPR(obj); - ICSState *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 e49a2da..a7a1e54 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -197,5 +197,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