diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2011-03-21 21:28:38 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-03-21 21:28:38 +0100 |
| commit | aa315f95b7c3c5b032cbc6c78f434a871002f558 (patch) | |
| tree | 61c0142bd9a3f43aa6f800fcaebc2e1f0ccf5f5b /usb-linux.c | |
| parent | 32465727627711ff3e1cde6777a014413c3cb9ee (diff) | |
| parent | 6d5ad9bf9318b1555d5567cd7e1760a51a55ebf8 (diff) | |
Merge branch 'for-anthony' of git://github.com/bonzini/qemu
* 'for-anthony' of git://github.com/bonzini/qemu:
remove qemu_get_clock
add a generic scaling mechanism for timers
change all other clock references to use nanosecond resolution accessors
change all rt_clock references to use millisecond resolution accessors
add more helper functions with explicit milli/nanosecond resolution
Diffstat (limited to 'usb-linux.c')
| -rw-r--r-- | usb-linux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usb-linux.c b/usb-linux.c index ccf70734e3..255009f539 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -1535,12 +1535,12 @@ static void usb_host_auto_check(void *unused) } if (!usb_auto_timer) { - usb_auto_timer = qemu_new_timer(rt_clock, usb_host_auto_check, NULL); + usb_auto_timer = qemu_new_timer_ms(rt_clock, usb_host_auto_check, NULL); if (!usb_auto_timer) { return; } } - qemu_mod_timer(usb_auto_timer, qemu_get_clock(rt_clock) + 2000); + qemu_mod_timer(usb_auto_timer, qemu_get_clock_ms(rt_clock) + 2000); } /* |