aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-12-24 10:57:04 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2015-01-26 12:22:44 +0100
commitcd1bd53a669c88f219ca47b538889cd918605fea (patch)
treeac499c36e4e031d8d7c514277f6c4da34fd027ab /include
parent65a81af8df722714298f17d2b40da8e5f045e059 (diff)
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 'include')
-rw-r--r--include/qemu/timer.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index 9a3504c900..ca5befba0e 100644
--- a/include/qemu/timer.h
+++ b/include/qemu/timer.h
@@ -595,6 +595,17 @@ static inline QEMUTimer *timer_new_ms(QEMUClockType type, QEMUTimerCB *cb,
}
/**
+ * 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
*