From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGPEg-0004Ts-DI for qemu-devel@nongnu.org; Mon, 02 Sep 2013 04:11:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGPEY-0000hR-3m for qemu-devel@nongnu.org; Mon, 02 Sep 2013 04:11:46 -0400 From: Alexander Graf Date: Mon, 2 Sep 2013 10:11:29 +0200 Message-Id: <1378109493-41076-15-git-send-email-agraf@suse.de> In-Reply-To: <1378109493-41076-1-git-send-email-agraf@suse.de> References: <1378109493-41076-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 14/18] xics: move registration of global state to realize() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "qemu-ppc@nongnu.org list:PowerPC" Cc: Blue Swirl , Alexey Kardashevskiy , Anthony Liguori , qemu-devel Developers , Aurelien Jarno From: Alexey Kardashevskiy Registration of global state belongs into realize so move it there. Signed-off-by: Alexey Kardashevskiy Reviewed-by: Andreas F=C3=A4rber Signed-off-by: Alexander Graf --- hw/intc/xics.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 6b3c071..31868c4 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -642,6 +642,17 @@ static void xics_realize(DeviceState *dev, Error **e= rrp) ICSState *ics =3D icp->ics; int i; =20 + /* Registration of global state belongs into realize */ + spapr_rtas_register("ibm,set-xive", rtas_set_xive); + spapr_rtas_register("ibm,get-xive", rtas_get_xive); + spapr_rtas_register("ibm,int-off", rtas_int_off); + spapr_rtas_register("ibm,int-on", rtas_int_on); + + spapr_register_hypercall(H_CPPR, h_cppr); + spapr_register_hypercall(H_IPI, h_ipi); + spapr_register_hypercall(H_XIRR, h_xirr); + spapr_register_hypercall(H_EOI, h_eoi); + ics->nr_irqs =3D icp->nr_irqs; ics->offset =3D XICS_IRQ_BASE; ics->icp =3D icp; @@ -678,16 +689,6 @@ static void xics_class_init(ObjectClass *oc, void *d= ata) dc->realize =3D xics_realize; dc->props =3D xics_properties; dc->reset =3D xics_reset; - - spapr_rtas_register("ibm,set-xive", rtas_set_xive); - spapr_rtas_register("ibm,get-xive", rtas_get_xive); - spapr_rtas_register("ibm,int-off", rtas_int_off); - spapr_rtas_register("ibm,int-on", rtas_int_on); - - spapr_register_hypercall(H_CPPR, h_cppr); - spapr_register_hypercall(H_IPI, h_ipi); - spapr_register_hypercall(H_XIRR, h_xirr); - spapr_register_hypercall(H_EOI, h_eoi); } =20 static const TypeInfo xics_info =3D { --=20 1.8.1.4