diff options
| -rw-r--r-- | cpu-exec.c | 2 | ||||
| -rw-r--r-- | hw/ppc.c | 4 | ||||
| -rw-r--r-- | hw/ppc405_uc.c | 4 | ||||
| -rw-r--r-- | hw/ppc4xx_devs.c | 2 | ||||
| -rw-r--r-- | hw/ppc_newworld.c | 2 | ||||
| -rw-r--r-- | hw/ppc_oldworld.c | 2 | ||||
| -rw-r--r-- | hw/ppc_prep.c | 2 | ||||
| -rw-r--r-- | target-ppc/cpu.h | 2 | ||||
| -rw-r--r-- | target-ppc/helper.c | 5 |
9 files changed, 11 insertions, 14 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 8fbc8f1159..2c0765c7d6 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -416,7 +416,7 @@ int cpu_exec(CPUState *env1) #elif defined(TARGET_PPC) #if 0 if ((interrupt_request & CPU_INTERRUPT_RESET)) { - cpu_ppc_reset(env); + cpu_reset(env); } #endif if (interrupt_request & CPU_INTERRUPT_HARD) { @@ -123,7 +123,7 @@ static void ppc6xx_set_irq (void *opaque, int pin, int level) env->interrupt_request |= CPU_INTERRUPT_EXITTB; /* XXX: TOFIX */ #if 0 - cpu_ppc_reset(env); + cpu_reset(env); #else qemu_system_reset_request(); #endif @@ -1088,7 +1088,7 @@ int ppc_dcr_init (CPUState *env, int (*read_error)(int dcrn), #if 0 /*****************************************************************************/ /* Handle system reset (for now, just stop emulation) */ -void cpu_ppc_reset (CPUState *env) +void cpu_reset(CPUState *env) { printf("Reset asked... Stop emulation\n"); abort(); diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c index 983eef30f3..052f9022f2 100644 --- a/hw/ppc405_uc.c +++ b/hw/ppc405_uc.c @@ -1805,7 +1805,7 @@ void ppc40x_core_reset (CPUState *env) env->interrupt_request |= CPU_INTERRUPT_EXITTB; /* XXX: TOFIX */ #if 0 - cpu_ppc_reset(env); + cpu_reset(env); #else qemu_system_reset_request(); #endif @@ -1823,7 +1823,7 @@ void ppc40x_chip_reset (CPUState *env) env->interrupt_request |= CPU_INTERRUPT_EXITTB; /* XXX: TOFIX */ #if 0 - cpu_ppc_reset(env); + cpu_reset(env); #else qemu_system_reset_request(); #endif diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c index 98d40d0096..7921ebfb4a 100644 --- a/hw/ppc4xx_devs.c +++ b/hw/ppc4xx_devs.c @@ -60,7 +60,7 @@ CPUState *ppc4xx_init (const char *cpu_model, tb_clk->opaque = env; ppc_dcr_init(env, NULL, NULL); /* Register qemu callbacks */ - qemu_register_reset(&cpu_ppc_reset, env); + qemu_register_reset((QEMUResetHandler*)&cpu_reset, env); return env; } diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index d9f45b5b45..da868d302b 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -130,7 +130,7 @@ static void ppc_core99_init (ram_addr_t ram_size, #if 0 env->osi_call = vga_osi_call; #endif - qemu_register_reset(&cpu_ppc_reset, env); + qemu_register_reset((QEMUResetHandler*)&cpu_reset, env); envs[i] = env; } diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index 3f237136ad..9b49a3dbdd 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -158,7 +158,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, /* Set time-base frequency to 16.6 Mhz */ cpu_ppc_tb_init(env, 16600000UL); env->osi_call = vga_osi_call; - qemu_register_reset(&cpu_ppc_reset, env); + qemu_register_reset((QEMUResetHandler*)&cpu_reset, env); envs[i] = env; } diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index e674e454bd..cd561e10c6 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -586,7 +586,7 @@ static void ppc_prep_init (ram_addr_t ram_size, /* Set time-base frequency to 100 Mhz */ cpu_ppc_tb_init(env, 100UL * 1000UL * 1000UL); } - qemu_register_reset(&cpu_ppc_reset, env); + qemu_register_reset((QEMUResetHandler*)&cpu_reset, env); envs[i] = env; } diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index f1d7d808f0..2535cbc0c5 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -734,8 +734,6 @@ void ppc_store_sr (CPUPPCState *env, int srnum, target_ulong value); #endif /* !defined(CONFIG_USER_ONLY) */ void ppc_store_msr (CPUPPCState *env, target_ulong value); -void cpu_ppc_reset (void *opaque); - void ppc_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...)); const ppc_def_t *cpu_ppc_find_by_name (const char *name); diff --git a/target-ppc/helper.c b/target-ppc/helper.c index 084d36f78b..8d383e0d5a 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -2748,9 +2748,8 @@ void cpu_dump_rfi (target_ulong RA, target_ulong msr) TARGET_FMT_lx "\n", RA, msr); } -void cpu_ppc_reset (void *opaque) +void cpu_reset(CPUPPCState *env) { - CPUPPCState *env = opaque; target_ulong msr; if (qemu_loglevel_mask(CPU_LOG_RESET)) { @@ -2812,7 +2811,7 @@ CPUPPCState *cpu_ppc_init (const char *cpu_model) env->cpu_model_str = cpu_model; cpu_ppc_register_internal(env, def); #if defined(CONFIG_USER_ONLY) - cpu_ppc_reset(env); + cpu_reset(env); #endif qemu_init_vcpu(env); |