diff options
| author | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-03 01:06:57 +0000 |
|---|---|---|
| committer | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-03 01:06:57 +0000 |
| commit | fe33cc710327455a55bd4f44bc7aa69661cc7878 (patch) | |
| tree | 5161385f847ff660c479eac5dfbbce8e6a6d0eca /hw/ppc_chrp.c | |
| parent | 00af685fc974e4941ef2d309a2e8818d311a370c (diff) | |
| download | qemu-fe33cc710327455a55bd4f44bc7aa69661cc7878.zip qemu-fe33cc710327455a55bd4f44bc7aa69661cc7878.tar.gz qemu-fe33cc710327455a55bd4f44bc7aa69661cc7878.tar.bz2 | |
Fix PowerPC initialisation and first reset:
reset must occur after we defined the CPU features.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3317 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/ppc_chrp.c')
| -rw-r--r-- | hw/ppc_chrp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c index 9c6ac84..653f7c3 100644 --- a/hw/ppc_chrp.c +++ b/hw/ppc_chrp.c @@ -327,9 +327,6 @@ static void ppc_chrp_init (int ram_size, int vga_ram_size, int boot_device, /* init CPUs */ env = cpu_init(); - qemu_register_reset(&cpu_ppc_reset, env); - register_savevm("cpu", 0, 3, cpu_save, cpu_load, env); - if (cpu_model == NULL) cpu_model = "default"; ppc_find_by_name(cpu_model, &def); @@ -338,9 +335,12 @@ static void ppc_chrp_init (int ram_size, int vga_ram_size, int boot_device, } for (i = 0; i < smp_cpus; i++) { cpu_ppc_register(env, def); + cpu_ppc_reset(env); /* Set time-base frequency to 100 Mhz */ cpu_ppc_tb_init(env, 100UL * 1000UL * 1000UL); env->osi_call = vga_osi_call; + qemu_register_reset(&cpu_ppc_reset, env); + register_savevm("cpu", 0, 3, cpu_save, cpu_load, env); envs[i] = env; } |