diff options
| author | Robert Mustacchi <rm@joyent.com> | 2013-01-10 19:14:49 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2013-01-10 19:14:49 +0000 |
| commit | fe0e2a69df4f09222cee2b5841a0772ad84876aa (patch) | |
| tree | 8a9ae10716da889797f109b8fcf05ac4b02e33ff /hw/usb-uhci.c | |
| parent | 0ea9d5f4c8ad687c9957a2e134dce0dbeb1c8404 (diff) | |
| download | illumos-kvm-cmd-20130110.tar.gz | |
HVM-763 uhci timer does not properly set expire time201304182013040420130321201302072013012420130110
HVM-765 qemu needs -msave-args
HVM-767 qemu e1000g shouldn't botch popts
Diffstat (limited to 'hw/usb-uhci.c')
| -rw-r--r-- | hw/usb-uhci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index b384e1d..a05e015 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -441,6 +441,8 @@ static void uhci_ioport_writew(void *opaque, uint32_t addr, uint32_t val) case 0x00: if ((val & UHCI_CMD_RS) && !(s->cmd & UHCI_CMD_RS)) { /* start frame processing */ + s->expire_time = qemu_get_clock_ns(vm_clock) + + (get_ticks_per_sec() / FRAME_TIMER_FREQ); qemu_mod_timer(s->frame_timer, qemu_get_clock(vm_clock)); s->status &= ~UHCI_STS_HCHALTED; } else if (!(val & UHCI_CMD_RS)) { @@ -1134,8 +1136,6 @@ static int usb_uhci_common_initfn(UHCIState *s) usb_port_location(&s->ports[i].port, NULL, i+1); } s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s); - s->expire_time = qemu_get_clock(vm_clock) + - (get_ticks_per_sec() / FRAME_TIMER_FREQ); s->num_ports_vmstate = NB_PORTS; qemu_register_reset(uhci_reset, s); |