From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBIRY-00039D-7m for qemu-devel@nongnu.org; Mon, 19 Aug 2013 01:56:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VBIRS-0005r5-R8 for qemu-devel@nongnu.org; Mon, 19 Aug 2013 01:55:56 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:52050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBIRS-0005qw-KU for qemu-devel@nongnu.org; Mon, 19 Aug 2013 01:55:50 -0400 Received: by mail-pa0-f48.google.com with SMTP id kp13so4181739pab.21 for ; Sun, 18 Aug 2013 22:55:49 -0700 (PDT) From: Alexey Kardashevskiy Date: Mon, 19 Aug 2013 15:55:21 +1000 Message-Id: <1376891726-26122-4-git-send-email-aik@ozlabs.ru> In-Reply-To: <1376891726-26122-1-git-send-email-aik@ozlabs.ru> References: <1376891726-26122-1-git-send-email-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v3 3/8] xics: move registration of global state to realize() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Alexey Kardashevskiy , Alexander Graf , qemu-ppc@nongnu.org, Paul Mackerras , =?UTF-8?q?Andreas=20F=C3=A4rber?= , David Gibson Registration of global state belongs into realize so move it there. Signed-off-by: Alexey Kardashevskiy Reviewed-by: Andreas Färber --- 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 e3a957d..c80fa80 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -692,6 +692,17 @@ static void xics_realize(DeviceState *dev, Error **errp) ICSState *ics = icp->ics; int i; + /* 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 = icp->nr_irqs; ics->offset = XICS_IRQ_BASE; ics->icp = icp; @@ -730,16 +741,6 @@ static void xics_class_init(ObjectClass *oc, void *data) dc->props = xics_properties; dc->reset = xics_reset; k->cpu_setup = xics_cpu_setup; - - 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); } static const TypeInfo xics_info = { -- 1.8.3.2