From c169998802505c244b8bcad562633f29de7d74a4 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Thu, 5 Nov 2009 16:05:15 -0200 Subject: 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 Signed-off-by: Blue Swirl --- hw/piix4.c | 1 - 1 file changed, 1 deletion(-) (limited to 'hw/piix4.c') diff --git a/hw/piix4.c b/hw/piix4.c index a6aea15e78..f75951b3ea 100644 --- a/hw/piix4.c +++ b/hw/piix4.c @@ -97,7 +97,6 @@ static int piix4_initfn(PCIDevice *d) PCI_HEADER_TYPE_NORMAL | PCI_HEADER_TYPE_MULTI_FUNCTION; // header_type = PCI_multifunction, generic piix4_dev = d; - piix4_reset(d); qemu_register_reset(piix4_reset, d); return 0; } -- cgit v1.2.3