summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@web.de>2009-06-27 09:25:07 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-06-29 14:18:08 -0500
commita08d43677f87a19daa653774d3c6f71855e23178 (patch)
treeb37c74bd58d4dd7c21fbdea080a8b543e27a2ba9 /hw/usb-uhci.c
parentmonitor: Make pci_add device options truely optional (diff)
downloadqemu-kvm-a08d43677f87a19daa653774d3c6f71855e23178.tar.gz
qemu-kvm-a08d43677f87a19daa653774d3c6f71855e23178.tar.bz2
qemu-kvm-a08d43677f87a19daa653774d3c6f71855e23178.zip
Revert "Introduce reset notifier order"
This reverts commit 8217606e6edb49591b4a6fd5a0d1229cebe470a9 (and updates later added users of qemu_register_reset), we solved the problem it originally addressed less invasively. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/usb-uhci.c')
-rw-r--r--hw/usb-uhci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index ea83bdc3e..7b74207b5 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -1094,7 +1094,7 @@ void usb_uhci_piix3_init(PCIBus *bus, int devfn)
}
s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s);
- qemu_register_reset(uhci_reset, 0, s);
+ qemu_register_reset(uhci_reset, s);
uhci_reset(s);
/* Use region 4 for consistency with real hardware. BSD guests seem
@@ -1129,7 +1129,7 @@ void usb_uhci_piix4_init(PCIBus *bus, int devfn)
}
s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s);
- qemu_register_reset(uhci_reset, 0, s);
+ qemu_register_reset(uhci_reset, s);
uhci_reset(s);
/* Use region 4 for consistency with real hardware. BSD guests seem