From 1bba0dc932e8826a7d030df3767daf0bc339f9a2 Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Wed, 8 Feb 2012 03:03:33 +0100 Subject: 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 Reviewed-by: Anthony Liguori --- hw/arm_boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/arm_boot.c') diff --git a/hw/arm_boot.c b/hw/arm_boot.c index fc669100c5..23b3f0aad4 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -277,7 +277,7 @@ static void do_cpu_reset(void *opaque) CPUState *env = opaque; const struct arm_boot_info *info = env->boot_info; - cpu_reset(env); + cpu_state_reset(env); if (info) { if (!info->is_linux) { /* Jump to the entry point. */ -- cgit v1.2.3-55-g7522