diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-04 16:35:51 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:44 +0200 |
| commit | 322164e0dba9eeb1264a923c9bfafd7663fba8aa (patch) | |
| tree | 91aa5cc904c7fae88bcef1e29f09caf03ff81062 /hw/ppc440_bamboo.c | |
| parent | 5b2038e04965a4126a31b7b71cc315efe50a9c8e (diff) | |
| download | qemu-322164e0dba9eeb1264a923c9bfafd7663fba8aa.tar.gz | |
ppc440_bamboo: Use cpu_ppc_init() to obtain PowerPCCPU
Needed for main_cpu_reset().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/ppc440_bamboo.c')
| -rw-r--r-- | 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 f0a3ae49e6..1a4e66ac59 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); |