From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tk1rr-00011k-VF for qemu-devel@nongnu.org; Sat, 15 Dec 2012 19:14:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tk1rq-0004ub-Kn for qemu-devel@nongnu.org; Sat, 15 Dec 2012 19:14:07 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 16 Dec 2012 01:13:34 +0100 Message-Id: <1355616817-1260-9-git-send-email-afaerber@suse.de> In-Reply-To: <1355616817-1260-1-git-send-email-afaerber@suse.de> References: <1355616817-1260-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 08/11] ppc4xx_devs: Return PowerPCCPU from ppc4xx_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti , "open list:ppc4xx" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , kvm@vger.kernel.org, Alexander Graf Prepares for passing PowerPCCPU to ppc_booke_timers_init(). Signed-off-by: Andreas F=C3=A4rber --- hw/ppc405_uc.c | 8 ++++++-- hw/ppc4xx.h | 6 +++--- hw/ppc4xx_devs.c | 8 ++++---- 3 Dateien ge=C3=A4ndert, 13 Zeilen hinzugef=C3=BCgt(+), 9 Zeilen entfern= t(-) diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c index 0f458ef..373b8f3 100644 --- a/hw/ppc405_uc.c +++ b/hw/ppc405_uc.c @@ -2111,12 +2111,14 @@ CPUPPCState *ppc405cr_init(MemoryRegion *address_= space_mem, { clk_setup_t clk_setup[PPC405CR_CLK_NB]; qemu_irq dma_irqs[4]; + PowerPCCPU *cpu; CPUPPCState *env; qemu_irq *pic, *irqs; =20 memset(clk_setup, 0, sizeof(clk_setup)); - env =3D ppc4xx_init("405cr", &clk_setup[PPC405CR_CPU_CLK], + cpu =3D ppc4xx_init("405cr", &clk_setup[PPC405CR_CPU_CLK], &clk_setup[PPC405CR_TMR_CLK], sysclk); + env =3D &cpu->env; /* Memory mapped devices registers */ /* PLB arbitrer */ ppc4xx_plb_init(env); @@ -2460,13 +2462,15 @@ CPUPPCState *ppc405ep_init(MemoryRegion *address_= space_mem, { clk_setup_t clk_setup[PPC405EP_CLK_NB], tlb_clk_setup; qemu_irq dma_irqs[4], gpt_irqs[5], mal_irqs[4]; + PowerPCCPU *cpu; CPUPPCState *env; qemu_irq *pic, *irqs; =20 memset(clk_setup, 0, sizeof(clk_setup)); /* init CPUs */ - env =3D ppc4xx_init("405ep", &clk_setup[PPC405EP_CPU_CLK], + cpu =3D ppc4xx_init("405ep", &clk_setup[PPC405EP_CPU_CLK], &tlb_clk_setup, sysclk); + env =3D &cpu->env; clk_setup[PPC405EP_CPU_CLK].cb =3D tlb_clk_setup.cb; clk_setup[PPC405EP_CPU_CLK].opaque =3D tlb_clk_setup.opaque; /* Internal devices init */ diff --git a/hw/ppc4xx.h b/hw/ppc4xx.h index d795ced..5d891ae 100644 --- a/hw/ppc4xx.h +++ b/hw/ppc4xx.h @@ -28,9 +28,9 @@ #include "pci.h" =20 /* PowerPC 4xx core initialization */ -CPUPPCState *ppc4xx_init (const char *cpu_model, - clk_setup_t *cpu_clk, clk_setup_t *tb_clk, - uint32_t sysclk); +PowerPCCPU *ppc4xx_init(const char *cpu_model, + clk_setup_t *cpu_clk, clk_setup_t *tb_clk, + uint32_t sysclk); =20 /* PowerPC 4xx universal interrupt controller */ enum { diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c index bac8d87..761cb59 100644 --- a/hw/ppc4xx_devs.c +++ b/hw/ppc4xx_devs.c @@ -47,9 +47,9 @@ static void ppc4xx_reset(void *opaque) =20 /***********************************************************************= ******/ /* Generic PowerPC 4xx processor instantiation */ -CPUPPCState *ppc4xx_init (const char *cpu_model, - clk_setup_t *cpu_clk, clk_setup_t *tb_clk, - uint32_t sysclk) +PowerPCCPU *ppc4xx_init(const char *cpu_model, + clk_setup_t *cpu_clk, clk_setup_t *tb_clk, + uint32_t sysclk) { PowerPCCPU *cpu; CPUPPCState *env; @@ -72,7 +72,7 @@ CPUPPCState *ppc4xx_init (const char *cpu_model, /* Register qemu callbacks */ qemu_register_reset(ppc4xx_reset, cpu); =20 - return env; + return cpu; } =20 /***********************************************************************= ******/ --=20 1.7.10.4