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 <afaerber@suse.de>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
---
 hw/r2d.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hw/r2d.c')

diff --git a/hw/r2d.c b/hw/r2d.c
index c80f9e3a29..ae327a73f3 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -201,7 +201,7 @@ static void main_cpu_reset(void *opaque)
     ResetData *s = (ResetData *)opaque;
     CPUState *env = s->env;
 
-    cpu_reset(env);
+    cpu_state_reset(env);
     env->pc = s->vector;
 }
 
-- 
cgit v1.2.3-55-g7522