From 322164e0dba9eeb1264a923c9bfafd7663fba8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 4 May 2012 16:35:51 +0200 Subject: ppc440_bamboo: Use cpu_ppc_init() to obtain PowerPCCPU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed for main_cpu_reset(). Signed-off-by: Andreas Färber Acked-by: Alexander Graf --- hw/ppc440_bamboo.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'hw') 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 == NULL) { cpu_model = "440EP"; } - env = cpu_init(cpu_model); - if (!env) { + cpu = cpu_ppc_init(cpu_model); + if (cpu == NULL) { fprintf(stderr, "Unable to initialize CPU!\n"); exit(1); } + env = &cpu->env; qemu_register_reset(main_cpu_reset, env); ppc_booke_timers_init(env, 400000000, 0); -- cgit v1.1