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 /linux-user | |
| 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 'linux-user')
| -rw-r--r-- | linux-user/main.c | 2 | ||||
| -rw-r--r-- | linux-user/syscall.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index bd4748941a..01129f2e3c 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3375,7 +3375,7 @@ int main(int argc, char **argv, char **envp) exit(1); } #if defined(TARGET_I386) || defined(TARGET_SPARC) || defined(TARGET_PPC) - cpu_reset(env); + cpu_state_reset(env); #endif thread_env = env; diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 8a11213402..29888bd94b 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4036,7 +4036,7 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp, /* we create a new CPU instance. */ new_env = cpu_copy(env); #if defined(TARGET_I386) || defined(TARGET_SPARC) || defined(TARGET_PPC) - cpu_reset(new_env); + cpu_state_reset(new_env); #endif /* Init regs that differ from the parent. */ cpu_clone_regs(new_env, newsp); |