diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2014-12-24 10:57:04 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-01-26 12:22:44 +0100 |
commit | cd1bd53a669c88f219ca47b538889cd918605fea (patch) | |
tree | ac499c36e4e031d8d7c514277f6c4da34fd027ab /qemu-timer.c | |
parent | 65a81af8df722714298f17d2b40da8e5f045e059 (diff) | |
download | hqemu-cd1bd53a669c88f219ca47b538889cd918605fea.zip hqemu-cd1bd53a669c88f219ca47b538889cd918605fea.tar.gz |
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: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qemu-timer.c')
-rw-r--r-- | qemu-timer.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/qemu-timer.c b/qemu-timer.c index 98d9d1b..464396f 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -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,9 +404,11 @@ void timer_del(QEMUTimer *ts) { QEMUTimerList *timer_list = ts->timer_list; - qemu_mutex_lock(&timer_list->active_timers_lock); - timer_del_locked(timer_list, ts); - qemu_mutex_unlock(&timer_list->active_timers_lock); + 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 |