summaryrefslogtreecommitdiffstats
path: root/bsd-user
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-01-20 05:34:10 +0100
committerAndreas Färber <afaerber@suse.de>2013-02-01 01:35:43 +0100
commit77868120cfe93ad7816dfac6546684e5a6c6e256 (patch)
tree96d5deb9c8aab88ad9eb29e9603a567886b65efa /bsd-user
parentcc36a7a2c7e281d7d715ac73d31bbccc0d2d2670 (diff)
downloadhqemu-77868120cfe93ad7816dfac6546684e5a6c6e256.zip
hqemu-77868120cfe93ad7816dfac6546684e5a6c6e256.tar.gz
linux-user: bsd-user: Don't reset X86CPU twice
Since commit 65dee38052597b6285eb208125369f01b29ba6c1 (target-i386: move cpu_reset and reset callback to cpu.c) the x86 CPU is reset through cpu_init() but was still reset immediately after in linux-user and bsd-user. Clean this up. Similarly in linux-user/syscall.c it is also reset after cpu_copy(). But that's a bug of its own, fixing which poses a semantic change. Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Diffstat (limited to 'bsd-user')
-rw-r--r--bsd-user/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 1dc0330..ae24723 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -917,7 +917,7 @@ int main(int argc, char **argv)
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
}
-#if defined(TARGET_I386) || defined(TARGET_SPARC) || defined(TARGET_PPC)
+#if defined(TARGET_SPARC) || defined(TARGET_PPC)
cpu_reset(ENV_GET_CPU(env));
#endif
thread_env = env;
OpenPOWER on IntegriCloud