From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59880) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3V7-0000EC-9a for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3V5-0000f1-HR for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:56 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55265 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3V5-0000eU-CC for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:55 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:19 +0200 Message-Id: <1336318514-30906-20-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 19/74] ppc440_bamboo: Use cpu_ppc_init() to obtain 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/ppc440_bamboo.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index f0a3ae4..1a4e66a 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -172,6 +172,7 @@ static void bamboo_init(ram_addr_t ram_size, qemu_irq *pic; qemu_irq *irqs; PCIBus *pcibus; + PowerPCCPU *cpu; CPUPPCState *env; uint64_t elf_entry; uint64_t elf_lowaddr; @@ -185,11 +186,12 @@ static void bamboo_init(ram_addr_t ram_size, if (cpu_model =3D=3D NULL) { cpu_model =3D "440EP"; } - env =3D cpu_init(cpu_model); - if (!env) { + cpu =3D cpu_ppc_init(cpu_model); + if (cpu =3D=3D NULL) { fprintf(stderr, "Unable to initialize CPU!\n"); exit(1); } + env =3D &cpu->env; =20 qemu_register_reset(main_cpu_reset, env); ppc_booke_timers_init(env, 400000000, 0); --=20 1.7.7