From patchwork Thu Feb 16 13:47:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 728684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vPHqm2Xhfz9s8D for ; Fri, 17 Feb 2017 01:00:52 +1100 (AEDT) Received: from localhost ([::1]:46805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ceMc5-0005EP-Lm for incoming@patchwork.ozlabs.org; Thu, 16 Feb 2017 09:00:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ceMQw-00023X-KN for qemu-devel@nongnu.org; Thu, 16 Feb 2017 08:49:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ceMQs-0005Vw-7M for qemu-devel@nongnu.org; Thu, 16 Feb 2017 08:49:18 -0500 Received: from 8.mo173.mail-out.ovh.net ([46.105.46.122]:46966) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ceMQs-0005UZ-1e for qemu-devel@nongnu.org; Thu, 16 Feb 2017 08:49:14 -0500 Received: from player791.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo173.mail-out.ovh.net (Postfix) with ESMTP id EF4772403D for ; Thu, 16 Feb 2017 14:49:12 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player791.ha.ovh.net (Postfix) with ESMTPSA id B921542008D; Thu, 16 Feb 2017 14:49:05 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Thu, 16 Feb 2017 14:47:33 +0100 Message-Id: <1487252865-12064-11-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487252865-12064-1-git-send-email-clg@kaod.org> References: <1487252865-12064-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12526480891207715814 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrtdeggdehgecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.46.122 Subject: [Qemu-devel] [PATCH v2 10/22] ppc/xics: register the reset handler of ICS objects 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-ppc@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The reset of the ICS objects is currently handled by XICS but this can be done for each individual ICS. This also reduces the use of the XICS list of ICS. Signed-off-by: Cédric Le Goater Reviewed-by: David Gibson --- hw/intc/xics.c | 5 ----- hw/ppc/spapr.c | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index bfd3a539561a..d679313cd49f 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -139,16 +139,11 @@ static void ics_simple_pic_print_info(InterruptStatsProvider *obj, static void xics_common_reset(DeviceState *d) { XICSState *xics = XICS_COMMON(d); - ICSState *ics; int i; for (i = 0; i < xics->nr_servers; i++) { device_reset(DEVICE(&xics->ss[i])); } - - QLIST_FOREACH(ics, &xics->ics, list) { - device_reset(DEVICE(ics)); - } } static void xics_common_initfn(Object *obj) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 85a973cce7ae..a2a64d7de41d 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -112,6 +112,7 @@ static XICSState *try_create_xics(sPAPRMachineState *spapr, } spapr->ics = ICS_SIMPLE(object_new(type_ics)); + qdev_set_parent_bus(DEVICE(spapr->ics), sysbus_get_default()); object_property_add_child(OBJECT(spapr), "ics", OBJECT(spapr->ics), NULL); object_property_set_int(OBJECT(spapr->ics), nr_irqs, "nr-irqs", &err); object_property_add_const_link(OBJECT(spapr->ics), "xics", OBJECT(xics),