From 5973c775c853e26f684de58ad28c267281aaffd6 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Tue, 10 May 2011 07:06:00 +0200 Subject: qemu-timer.c: rename qemu_timer_new_scale() Get rid of qemu_timer_new() implementation, and update all callers to use qemu_timer_new_ms() or qemu_timer_new_ns() instead. Rename qemu_new_timer_scale() to qemu_new_timer() to follow upstream conventions. Change-Id: Id2c04f8597ec5026e02f87b3e2c5507920eb688e --- monitor.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'monitor.c') diff --git a/monitor.c b/monitor.c index 2d0a071..3c9d512 100644 --- a/monitor.c +++ b/monitor.c @@ -1120,8 +1120,7 @@ static void do_sendkey(Monitor *mon, const char *string, int has_hold_time, kbd_put_keycode(keycode & 0x7f); } /* delayed key up events */ - qemu_mod_timer(key_timer, qemu_get_clock(vm_clock) + - muldiv64(get_ticks_per_sec(), hold_time, 1000)); + qemu_mod_timer(key_timer, qemu_get_clock_ms(vm_clock) + hold_time); } static int mouse_button_state; @@ -3072,7 +3071,7 @@ void monitor_init(CharDriverState *chr, int flags) Monitor *mon; if (is_first_init) { - key_timer = qemu_new_timer(vm_clock, release_keys, NULL); + key_timer = qemu_new_timer_ms(vm_clock, release_keys, NULL); is_first_init = 0; } -- cgit v1.1