@@ -140,7 +140,6 @@ bool qemu_clock_has_timers(QEMUClock *clock);
* an expired timer
*/
bool qemu_clock_expired(QEMUClock *clock);
-int64_t qemu_clock_deadline(QEMUClock *clock);
/**
* qemu_clock_deadline_ns:
@@ -246,21 +245,6 @@ bool timerlist_has_timers(QEMUTimerList *timer_list);
bool timerlist_expired(QEMUTimerList *timer_list);
/**
- * timerlist_deadline:
- * @timer_list: the timer list to operate on
- *
- * Determine the deadline for a timer_list. This is
- * a legacy function which returns INT32_MAX if the
- * timer list has no timers or if the earliest timer
- * expires later than INT32_MAX nanoseconds away.
- *
- * Returns: the number of nanoseconds until the earliest
- * timer expires or INT32_MAX in the situations listed
- * above
- */
-int64_t timerlist_deadline(QEMUTimerList *timer_list);
-
-/**
* timerlist_deadline_ns:
* @timer_list: the timer list to operate on
*
@@ -176,26 +176,6 @@ bool qemu_clock_expired(QEMUClock *clock)
return timerlist_expired(clock->main_loop_timerlist);
}
-int64_t timerlist_deadline(QEMUTimerList *timer_list)
-{
- /* To avoid problems with overflow limit this to 2^32. */
- int64_t delta = INT32_MAX;
-
- if (timer_list->clock->enabled && timer_list->active_timers) {
- delta = timer_list->active_timers->expire_time -
- qemu_get_clock_ns(timer_list->clock);
- }
- if (delta < 0) {
- delta = 0;
- }
- return delta;
-}
-
-int64_t qemu_clock_deadline(QEMUClock *clock)
-{
- return timerlist_deadline(clock->main_loop_timerlist);
-}
-
/*
* As above, but return -1 for no deadline, and do not cap to 2^32
* as we know the result is always positive.
Remove qemu_clock_deadline and qemu_timerlist_deadline now we are using the ns functions throughout. Signed-off-by: Alex Bligh <alex@alex.org.uk> --- include/qemu/timer.h | 16 ---------------- qemu-timer.c | 20 -------------------- 2 files changed, 36 deletions(-)