From: Andreas Färber <afaerber@suse.de>
Date: Fri, 4 May 2012 15:57:13 +0000 (+0200)
Subject: virtex_ml507: Use cpu_ppc_init() to obtain PowerPCCPU
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d1d4938ba88e876cb9e46885f10f38d63eb1581c;p=qemu.git

virtex_ml507: Use cpu_ppc_init() to obtain PowerPCCPU

Needed to change ppc440_init_xilinx() return type.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
---

diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index 4a133b5d1e..3013016332 100644
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -83,14 +83,16 @@ static CPUPPCState *ppc440_init_xilinx(ram_addr_t *ram_size,
                                     const char *cpu_model,
                                     uint32_t sysclk)
 {
+    PowerPCCPU *cpu;
     CPUPPCState *env;
     qemu_irq *irqs;
 
-    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;
 
     ppc_booke_timers_init(env, sysclk, 0/* no flags */);