From patchwork Thu Jul 7 17:54:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nikunj A. Dadhania" X-Patchwork-Id: 9219327 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9073560467 for ; Thu, 7 Jul 2016 17:57:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86AEE28449 for ; Thu, 7 Jul 2016 17:57:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B7992844B; Thu, 7 Jul 2016 17:57:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 71C3728449 for ; Thu, 7 Jul 2016 17:57:10 +0000 (UTC) Received: from localhost ([::1]:41561 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLDXx-0004B5-LE for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Jul 2016 13:57:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLDVh-0008I2-AX for qemu-devel@nongnu.org; Thu, 07 Jul 2016 13:54:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLDVd-0002NP-DW for qemu-devel@nongnu.org; Thu, 07 Jul 2016 13:54:49 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:13198 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLDVd-0002NG-9P for qemu-devel@nongnu.org; Thu, 07 Jul 2016 13:54:45 -0400 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u67Hhm3e124892 for ; Thu, 7 Jul 2016 13:54:44 -0400 Received: from e28smtp04.in.ibm.com (e28smtp04.in.ibm.com [125.16.236.4]) by mx0b-001b2d01.pphosted.com with ESMTP id 2415xnd8he-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 07 Jul 2016 13:54:44 -0400 Received: from localhost by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 Jul 2016 23:24:41 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp04.in.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 7 Jul 2016 23:24:39 +0530 X-IBM-Helo: d28dlp02.in.ibm.com X-IBM-MailFrom: nikunj@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org;qemu-ppc@nongnu.org Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 7873C394004E; Thu, 7 Jul 2016 23:24:38 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay02.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u67HsShq57671824; Thu, 7 Jul 2016 23:24:28 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u67HsWr4025934; Thu, 7 Jul 2016 23:24:35 +0530 Received: from abhimanyu.in.ibm.com ([9.79.221.111]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u67HsRHH025753; Thu, 7 Jul 2016 23:24:31 +0530 From: Nikunj A Dadhania To: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Date: Thu, 7 Jul 2016 23:24:17 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467914058-30551-1-git-send-email-nikunj@linux.vnet.ibm.com> References: <1467914058-30551-1-git-send-email-nikunj@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16070717-0012-0000-0000-000002B58DDD X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16070717-0013-0000-0000-00000D98B887 Message-Id: <1467914058-30551-4-git-send-email-nikunj@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-07-07_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1607070160 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH v3 3/4] ppc/xics: Use a helper to add a new ICS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, nikunj@linux.vnet.ibm.com, clg@kaod.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 0af05c9..7a658b2 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 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__ */