From b1bbfe72ec1ebf302d97f886cc646466c0abd679 Mon Sep 17 00:00:00 2001 From: Alex Bligh Date: Wed, 21 Aug 2013 16:02:55 +0100 Subject: [PATCH] aio / timers: On timer modification, qemu_notify or aio_notify On qemu_mod_timer_ns, ensure qemu_notify or aio_notify is called to end the appropriate poll(), irrespective of use_icount value. On qemu_clock_enable, ensure qemu_notify or aio_notify is called for all QEMUTimerLists attached to the QEMUClock. Signed-off-by: Alex Bligh Signed-off-by: Stefan Hajnoczi --- include/qemu/timer.h | 9 +++++++++ qemu-timer.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index cb7321c003..3fa9fa72bf 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -136,6 +136,15 @@ bool qemu_clock_use_for_deadline(QEMUClock *clock); QEMUTimerList *qemu_clock_get_main_loop_timerlist(QEMUClock *clock); /** + * qemu_clock_nofify: + * @clock: the clock to operate on + * + * Call the notifier callback connected with the default timer + * list linked to the clock, or qemu_notify() if none. + */ +void qemu_clock_notify(QEMUClock *clock); + +/** * timerlist_new: * @type: the clock type to associate with the timerlist * @cb: the callback to call on notification diff --git a/qemu-timer.c b/qemu-timer.c index ffdc28a264..746ba8b7e1 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -304,11 +304,20 @@ bool qemu_clock_use_for_deadline(QEMUClock *clock) return !(use_icount && (clock->type == QEMU_CLOCK_VIRTUAL)); } +void qemu_clock_notify(QEMUClock *clock) +{ + QEMUTimerList *timer_list; + QLIST_FOREACH(timer_list, &clock->timerlists, list) { + timerlist_notify(timer_list); + } +} + void qemu_clock_enable(QEMUClock *clock, bool enabled) { bool old = clock->enabled; clock->enabled = enabled; if (enabled && !old) { + qemu_clock_notify(clock); qemu_rearm_alarm_timer(alarm_timer); } } @@ -522,9 +531,7 @@ void qemu_mod_timer_ns(QEMUTimer *ts, int64_t expire_time) } /* Interrupt execution to force deadline recalculation. */ qemu_clock_warp(ts->timer_list->clock); - if (use_icount) { - timerlist_notify(ts->timer_list); - } + timerlist_notify(ts->timer_list); } } -- 2.11.4.GIT