aboutsummaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2009-11-05 16:05:15 -0200
committerBlue Swirl <blauwirbel@gmail.com>2009-11-07 08:06:58 +0000
commitc169998802505c244b8bcad562633f29de7d74a4 (patch)
tree70c88e1184c0b4e77b1b4997250cc418d07cde8b /target-i386
parentcae334cd6b2aed62a2af82314da1b9eab06824d5 (diff)
v3: don't call reset functions on cpu initialization
There is absolutely no need to call reset functions when initializing devices. Since we are already registering them, calling qemu_system_reset() should suffice. Actually, it is what happens when we reboot the machine, and using the same process instead of a special case semantics will even allow us to find bugs easier. Furthermore, the fact that we initialize things like the cpu quite early, leads to the need to introduce synchronization stuff like qemu_system_cond. This patch removes it entirely. All we need to do is call qemu_system_reset() only when we're already sure the system is up and running I tested it with qemu (with and without io-thread) and qemu-kvm, and it seems to be doing okay - although qemu-kvm uses a slightly different patch. [ v2: user mode still needs cpu_reset, so put it in ifdef. ] [ v3: leave qemu_system_cond for now. ] Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/helper.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c
index c9615444e3..3fff1bbed1 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1885,7 +1885,9 @@ CPUX86State *cpu_x86_init(const char *cpu_model)
return NULL;
}
mce_init(env);
+#ifdef CONFIG_USER_ONLY
cpu_reset(env);
+#endif
qemu_init_vcpu(env);