diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-02-08 03:03:33 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-03-14 22:20:24 +0100 |
| commit | 1bba0dc932e8826a7d030df3767daf0bc339f9a2 (patch) | |
| tree | 57310a53f8f3458b2c3b1f1510d489a8c26fe8d5 /hw/ppc_newworld.c | |
| parent | fc0b2c0f1a8eb679d28763832f3223259bf37b34 (diff) | |
Rename cpu_reset() to cpu_state_reset()
Frees the identifier cpu_reset for QOM CPUs (manual rename).
Don't hide the parameter type behind explicit casts, use static
functions with strongly typed argument to indirect.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/ppc_newworld.c')
| -rw-r--r-- | hw/ppc_newworld.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index 2fec5b4d67..ee50652372 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -121,6 +121,13 @@ static target_phys_addr_t round_page(target_phys_addr_t addr) return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK; } +static void ppc_core99_reset(void *opaque) +{ + CPUState *env = opaque; + + cpu_state_reset(env); +} + /* PowerPC Mac99 hardware initialisation */ static void ppc_core99_init (ram_addr_t ram_size, const char *boot_device, @@ -166,7 +173,7 @@ static void ppc_core99_init (ram_addr_t ram_size, } /* Set time-base frequency to 100 Mhz */ cpu_ppc_tb_init(env, 100UL * 1000UL * 1000UL); - qemu_register_reset((QEMUResetHandler*)&cpu_reset, env); + qemu_register_reset(ppc_core99_reset, env); } /* allocate RAM */ |