diff options
| author | Andreas Färber | 2013-07-10 18:30:38 +0200 |
|---|---|---|
| committer | Riku Voipio | 2013-07-22 21:08:33 +0200 |
| commit | 885a73f72b967900296d71c97cc7c560585a9086 (patch) | |
| tree | cf60b4eab5ce6db99a6d1086cd1ea831bd7fbc01 /linux-user | |
| parent | configure: Make NPTL non-optional (diff) | |
| download | qemu-885a73f72b967900296d71c97cc7c560585a9086.tar.gz qemu-885a73f72b967900296d71c97cc7c560585a9086.tar.xz qemu-885a73f72b967900296d71c97cc7c560585a9086.zip | |
linux-user: Avoid conditional cpu_reset()
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>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index 5537967254..547884c481 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); |