X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=util%2Fqemu-timer.c;h=1cc1b2f2c378ad2012f4aa2ea215fc9c1aae1b71;hb=HEAD;hp=f36c75e594a6f23a7b982567f81180605d17f73d;hpb=dce628a97fde2594f99d738883a157f05aa0a14f;p=mirror_qemu.git

diff --git a/util/qemu-timer.c b/util/qemu-timer.c
index f36c75e594..6a0de33dd2 100644
--- a/util/qemu-timer.c
+++ b/util/qemu-timer.c
@@ -100,7 +100,7 @@ QEMUTimerList *timerlist_new(QEMUClockType type,
     QEMUTimerList *timer_list;
     QEMUClock *clock = qemu_clock_ptr(type);
 
-    timer_list = g_malloc0(sizeof(QEMUTimerList));
+    timer_list = g_new0(QEMUTimerList, 1);
     qemu_event_init(&timer_list->timers_done_ev, true);
     timer_list->clock = clock;
     timer_list->notify_cb = cb;
@@ -261,6 +261,9 @@ int64_t qemu_clock_deadline_ns_all(QEMUClockType type, int attr_mask)
     }
 
     QLIST_FOREACH(timer_list, &clock->timerlists, list) {
+        if (!qatomic_read(&timer_list->active_timers)) {
+            continue;
+        }
         qemu_mutex_lock(&timer_list->active_timers_lock);
         ts = timer_list->active_timers;
         /* Skip all external timers */