From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUITT-0001NM-DS for qemu-devel@nongnu.org; Fri, 02 Nov 2012 10:43:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TUITM-00055q-J6 for qemu-devel@nongnu.org; Fri, 02 Nov 2012 10:43:55 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:52118) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUITM-000539-CT for qemu-devel@nongnu.org; Fri, 02 Nov 2012 10:43:48 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so2438444pad.4 for ; Fri, 02 Nov 2012 07:43:48 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 2 Nov 2012 15:43:22 +0100 Message-Id: <1351867404-25510-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1351867404-25510-1-git-send-email-pbonzini@redhat.com> References: <1351867404-25510-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 3/5] qemu-timer: reinitialize timers after fork List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, jan.kiszka@siemens.com, peter.maydell@linaro.org 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 --- qemu-timer.c | 14 ++++++++++++++ 1 file modificato, 14 inserzioni(+) diff --git a/qemu-timer.c b/qemu-timer.c index f3426c9..7b2217a 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -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; -- 1.7.12.1