diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-04 17:57:13 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:44 +0200 |
| commit | d1d4938ba88e876cb9e46885f10f38d63eb1581c (patch) | |
| tree | 343994a247fc42145ce6eedf2fcd649da8859307 /hw | |
| parent | 5c3e735f9b46582828d5d0606174ab1f487da4d0 (diff) | |
| download | qemu-d1d4938ba88e876cb9e46885f10f38d63eb1581c.tar.gz | |
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/virtex_ml507.c | 6 |
1 files changed, 4 insertions, 2 deletions
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 */); |