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>
This commit is contained in:
Glauber Costa 2009-11-05 16:05:15 -02:00 committed by Blue Swirl
parent cae334cd6b
commit c169998802
14 changed files with 4 additions and 13 deletions

View File

@ -981,7 +981,6 @@ int apic_init(CPUState *env)
s->id = env->cpuid_apic_id;
s->cpu_env = env;
apic_reset(s);
msix_supported = 1;
/* XXX: mapping more APICs at the same memory location */

View File

@ -1113,7 +1113,6 @@ static int pci_e1000_init(PCIDevice *pci_dev)
qemu_format_nic_info_str(d->vc, macaddr);
vmstate_register(-1, &vmstate_e1000, d);
e1000_reset(d);
if (!pci_dev->qdev.hotplugged) {
static int loaded = 0;

View File

@ -577,7 +577,6 @@ void hpet_init(qemu_irq *irq) {
HPETTimer *timer = &s->timer[i];
timer->qemu_timer = qemu_new_timer(vm_clock, hpet_timer, timer);
}
hpet_reset(s);
vmstate_register(-1, &vmstate_hpet, s);
qemu_register_reset(hpet_reset, s);
/* HPET Area */

View File

@ -513,7 +513,5 @@ PITState *pit_init(int base, qemu_irq irq)
register_ioport_write(base, 4, 1, pit_ioport_write, pit);
register_ioport_read(base, 3, 1, pit_ioport_read, pit);
pit_reset(pit);
return pit;
}

View File

@ -120,7 +120,6 @@ static int pci_piix_ide_initfn(PCIIDEState *d)
pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type
qemu_register_reset(piix3_reset, d);
piix3_reset(d);
pci_register_bar(&d->dev, 4, 0x10, PCI_ADDRESS_SPACE_IO, bmdma_map);

View File

@ -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;
}

View File

@ -341,7 +341,6 @@ static int piix3_initfn(PCIDevice *dev)
pci_conf[PCI_HEADER_TYPE] =
PCI_HEADER_TYPE_NORMAL | PCI_HEADER_TYPE_MULTI_FUNCTION; // header_type = PCI_multifunction, generic
piix3_reset(d);
qemu_register_reset(piix3_reset, d);
return 0;
}

View File

@ -3331,7 +3331,7 @@ static int pci_rtl8139_init(PCIDevice *dev)
PCI_ADDRESS_SPACE_MEM, rtl8139_mmio_map);
qemu_macaddr_default_if_unset(&s->conf.macaddr);
rtl8139_reset(&s->dev.qdev);
s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
s->conf.vlan, s->conf.peer,
dev->qdev.info->name, dev->qdev.id,

View File

@ -725,7 +725,6 @@ static void serial_init_core(SerialState *s)
s->transmit_timer = qemu_new_timer(vm_clock, (QEMUTimerCB *) serial_xmit, s);
qemu_register_reset(serial_reset, s);
serial_reset(s);
qemu_chr_add_handlers(s->chr, serial_can_receive1, serial_receive1,
serial_event, s);

View File

@ -1698,7 +1698,6 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState *dev,
ohci->async_td = 0;
qemu_register_reset(ohci_reset, ohci);
ohci_reset(ohci);
}
typedef struct {

View File

@ -1079,7 +1079,6 @@ static int usb_uhci_common_initfn(UHCIState *s)
s->num_ports_vmstate = NB_PORTS;
qemu_register_reset(uhci_reset, s);
uhci_reset(s);
/* Use region 4 for consistency with real hardware. BSD guests seem
to rely on this. */

View File

@ -2241,7 +2241,6 @@ void vga_common_init(VGACommonState *s, int vga_ram_size)
s->update_retrace_info = vga_precise_update_retrace_info;
break;
}
vga_reset(s);
}
/* used by both ISA and PCI */

View File

@ -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);

1
vl.c
View File

@ -4034,6 +4034,7 @@ static void main_loop(void)
qemu_system_ready = 1;
qemu_cond_broadcast(&qemu_system_cond);
#endif
qemu_system_reset();
for (;;) {
do {