aboutsummaryrefslogtreecommitdiff
path: root/hw/ppc_prep.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-02-08 03:03:33 +0100
committerAndreas Färber <afaerber@suse.de>2012-03-14 22:20:24 +0100
commit1bba0dc932e8826a7d030df3767daf0bc339f9a2 (patch)
tree57310a53f8f3458b2c3b1f1510d489a8c26fe8d5 /hw/ppc_prep.c
parentfc0b2c0f1a8eb679d28763832f3223259bf37b34 (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_prep.c')
-rw-r--r--hw/ppc_prep.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index dc9edd7bf5..6ccd6faede 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -470,6 +470,13 @@ static void cpu_request_exit(void *opaque, int irq, int level)
}
}
+static void ppc_prep_reset(void *opaque)
+{
+ CPUState *env = opaque;
+
+ cpu_state_reset(env);
+}
+
/* PowerPC PREP hardware initialisation */
static void ppc_prep_init (ram_addr_t ram_size,
const char *boot_device,
@@ -524,7 +531,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((QEMUResetHandler*)&cpu_reset, env);
+ qemu_register_reset(ppc_prep_reset, env);
}
/* allocate RAM */