diff mbox

[PULL,14/21] linux-user: Avoid conditional cpu_reset()

Message ID 885a73f72b967900296d71c97cc7c560585a9086.1374593203.git.riku.voipio@linaro.org
State New
Headers show

Commit Message

Riku Voipio July 23, 2013, 3:49 p.m. UTC 
From: Andreas Färber <afaerber@suse.de>

Some CPUs reset as part of cpu_init(), some others were reset
afterwards, some not at all. While some targets didn't implement a
cpu_[state_]reset() function, QOM cpu_reset() is always available.
There's nothing wrong with resetting twice on startup, so drop
the #ifdef.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 linux-user/main.c | 2 --
 1 file changed, 2 deletions(-)
diff mbox

Patch

diff --git a/linux-user/main.c b/linux-user/main.c
index 5537967..547884c 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3594,9 +3594,7 @@  int main(int argc, char **argv, char **envp)
         fprintf(stderr, "Unable to find CPU definition\n");
         exit(1);
     }
-#if defined(TARGET_SPARC) || defined(TARGET_PPC)
     cpu_reset(ENV_GET_CPU(env));
-#endif
 
     thread_cpu = ENV_GET_CPU(env);