From cd1bd53a669c88f219ca47b538889cd918605fea Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 24 Dec 2014 10:57:04 +0100 Subject: 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 --- include/qemu/timer.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include/qemu') diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 9a3504c..ca5befb 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 * -- cgit v1.1