]> git.proxmox.com Git - qemu.git/commitdiff
qemu-timer: reinitialize timers after fork
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 2 Nov 2012 14:43:22 +0000 (15:43 +0100)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 2 Nov 2012 18:07:54 +0000 (13:07 -0500)
Timers are not inherited by the child of a fork(2), so just use
pthread_atfork to reinstate them after daemonize.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
qemu-timer.c

index f3426c993798373668889ccc62d3d0d0cfd3dc5c..7b2217aab003756c79d66c3f2d2be56d8b677161 100644 (file)
@@ -742,6 +742,17 @@ static void quit_timers(void)
     t->stop(t);
 }
 
+static void reinit_timers(void)
+{
+    struct qemu_alarm_timer *t = alarm_timer;
+    t->stop(t);
+    if (t->start(t)) {
+        fprintf(stderr, "Internal timer error: aborting\n");
+        exit(1);
+    }
+    qemu_rearm_alarm_timer(t);
+}
+
 int init_timer_alarm(void)
 {
     struct qemu_alarm_timer *t = NULL;
@@ -765,6 +776,9 @@ int init_timer_alarm(void)
     }
 
     atexit(quit_timers);
+#ifdef CONFIG_POSIX
+    pthread_atfork(NULL, NULL, reinit_timers);
+#endif
     alarm_timer = t;
     return 0;