Commit cd1bd53a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

qemu-timer: introduce timer_deinit 



In some cases, a timer was set to NULL so that we could check if it is
initialized.  Use the timer_list field instead, and add a timer_deinit
function that NULLs it.

It then makes sense that timer_del be a no-op (instead of a crasher) on
such a de-initialized timer.  It avoids the need to poke at the timerlist
field to check if the timers are initialized.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 65a81af8

include/qemu/timer.h

+11 −0
Original line number Diff line number Diff line
@@ -594,6 +594,17 @@ static inline QEMUTimer *timer_new_ms(QEMUClockType type, QEMUTimerCB *cb, 
    return timer_new(type, SCALE_MS, cb, opaque);

}



/**

 * timer_deinit:

 * @ts: the timer to be de-initialised

 *

 * Deassociate the timer from any timerlist.  You should

 * call timer_del before.  After this call, any further

 * timer_del call cannot cause dangling pointer accesses

 * even if the previously used timerlist is freed.

 */

void timer_deinit(QEMUTimer *ts);



/**

 * timer_free:

 * @ts: the timer

qemu-timer.c

+11 −3
Original line number Diff line number Diff line
@@ -342,6 +342,12 @@ void timer_init_tl(QEMUTimer *ts, 
    ts->expire_time = -1;

}



void timer_deinit(QEMUTimer *ts)

{

    assert(ts->expire_time == -1);

    ts->timer_list = NULL;

}



void timer_free(QEMUTimer *ts)

{

    g_free(ts);
@@ -398,10 +404,12 @@ void timer_del(QEMUTimer *ts) 
{

    QEMUTimerList *timer_list = ts->timer_list;



    if (timer_list) {

        qemu_mutex_lock(&timer_list->active_timers_lock);

        timer_del_locked(timer_list, ts);

        qemu_mutex_unlock(&timer_list->active_timers_lock);

    }

}



/* modify the current timer so that it will be fired when current_time

   >= expire_time. The corresponding callback will be called. */