From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VE-0000a4-6F for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3VB-0000iJ-NG for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:03 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55308 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VB-0000hT-EV for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:01 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:30 +0200 Message-Id: <1336318514-30906-31-git-send-email-afaerber@suse.de> In-Reply-To: <1336318514-30906-1-git-send-email-afaerber@suse.de> References: <1336318514-30906-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 for-next 30/74] virtex_ml507: Let ppc440_init_xilinx() return PowerPCCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Needed for main_cpu_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/virtex_ml507.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c index 3013016..0e223bd 100644 --- a/hw/virtex_ml507.c +++ b/hw/virtex_ml507.c @@ -78,10 +78,10 @@ static void mmubooke_create_initial_mapping(CPUPPCSta= te *env, tlb->PID =3D 0; } =20 -static CPUPPCState *ppc440_init_xilinx(ram_addr_t *ram_size, - int do_init, - const char *cpu_model, - uint32_t sysclk) +static PowerPCCPU *ppc440_init_xilinx(ram_addr_t *ram_size, + int do_init, + const char *cpu_model, + uint32_t sysclk) { PowerPCCPU *cpu; CPUPPCState *env; @@ -103,7 +103,7 @@ static CPUPPCState *ppc440_init_xilinx(ram_addr_t *ra= m_size, irqs[PPCUIC_OUTPUT_INT] =3D ((qemu_irq *)env->irq_inputs)[PPC40x_INP= UT_INT]; irqs[PPCUIC_OUTPUT_CINT] =3D ((qemu_irq *)env->irq_inputs)[PPC40x_IN= PUT_CINT]; ppcuic_init(env, irqs, 0x0C0, 0, 1); - return env; + return cpu; } =20 static void main_cpu_reset(void *opaque) @@ -190,6 +190,7 @@ static void virtex_init(ram_addr_t ram_size, { MemoryRegion *address_space_mem =3D get_system_memory(); DeviceState *dev; + PowerPCCPU *cpu; CPUPPCState *env; target_phys_addr_t ram_base =3D 0; DriveInfo *dinfo; @@ -203,7 +204,8 @@ static void virtex_init(ram_addr_t ram_size, cpu_model =3D "440-Xilinx"; } =20 - env =3D ppc440_init_xilinx(&ram_size, 1, cpu_model, 400000000); + cpu =3D ppc440_init_xilinx(&ram_size, 1, cpu_model, 400000000); + env =3D &cpu->env; qemu_register_reset(main_cpu_reset, env); =20 memory_region_init_ram(phys_ram, "ram", ram_size); --=20 1.7.7