david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Register usb-uhci reset function.

Browse Source 
The device is not reset on system reset currently.
Without this patch RHEL4.8 hangs after reboot if -usbdevice table
is in use.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
This commit is contained in:
Gleb Natapov 2009-06-17 19:32:02 +03:00 committed by Blue Swirl
parent bc26e55a66
commit c8075ac370
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/usb-uhci.c
View File

@ -319,8 +319,9 @@ static void uhci_update_irq(UHCIState *s)
qemu_set_irq(s->dev.irq[3], level); qemu_set_irq(s->dev.irq[3], level);
} }
static void uhci_reset(UHCIState *s) static void uhci_reset(void *opaque)
{ {
UHCIState *s = opaque;
uint8_t *pci_conf; uint8_t *pci_conf;
int i; int i;
UHCIPort *port; UHCIPort *port;
@ -1093,6 +1094,7 @@ void usb_uhci_piix3_init(PCIBus *bus, int devfn)
} }
s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s); s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s);
qemu_register_reset(uhci_reset, 0, s);
uhci_reset(s); uhci_reset(s);
/* Use region 4 for consistency with real hardware. BSD guests seem /* Use region 4 for consistency with real hardware. BSD guests seem
@ -1127,6 +1129,7 @@ void usb_uhci_piix4_init(PCIBus *bus, int devfn)
} }
s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s); s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s);
qemu_register_reset(uhci_reset, 0, s);
uhci_reset(s); uhci_reset(s);
/* Use region 4 for consistency with real hardware. BSD guests seem /* Use region 4 for consistency with real hardware. BSD guests seem