From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHyL5-0000lX-6T for qemu-devel@nongnu.org; Tue, 28 Jun 2016 15:06:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHyL0-0005Bj-8c for qemu-devel@nongnu.org; Tue, 28 Jun 2016 15:06:26 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:63237 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHyL0-0005Bc-2A for qemu-devel@nongnu.org; Tue, 28 Jun 2016 15:06:22 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u5SIwpXU036851 for ; Tue, 28 Jun 2016 15:06:21 -0400 Received: from e23smtp08.au.ibm.com (e23smtp08.au.ibm.com [202.81.31.141]) by mx0b-001b2d01.pphosted.com with ESMTP id 23utc84fc0-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 28 Jun 2016 15:06:21 -0400 Received: from localhost by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 29 Jun 2016 05:06:18 +1000 From: Nikunj A Dadhania Date: Wed, 29 Jun 2016 00:35:18 +0530 In-Reply-To: <1467140719-4701-1-git-send-email-nikunj@linux.vnet.ibm.com> References: <1467140719-4701-1-git-send-email-nikunj@linux.vnet.ibm.com> Message-Id: <1467140719-4701-8-git-send-email-nikunj@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 7/8] 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, clg@kaod.org, benh@kernel.crashing.org, nikunj@linux.vnet.ibm.com 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 5148bdf..bbdba84 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 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 8c22daf..8433bf9 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -196,5 +196,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