From patchwork Fri Nov 2 14:43:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 196572 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A17272C00B2 for ; Sat, 3 Nov 2012 01:44:57 +1100 (EST) Received: from localhost ([::1]:43420 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUIUR-0003lB-TK for incoming@patchwork.ozlabs.org; Fri, 02 Nov 2012 10:44:55 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=2qDIrOqV9xh+SmrtVuMV0aP/h55HVwGNDgwO9KdT+gU=; b=uzJ6HE2t2Yn+zUXVqQNdKQLAx4zGYCZF5e85+/2A2HSo7TeFDuTwU9TLOZEVM30Xk3 dgt1T9bUHAH02ZXu1fHa6cxy7UYaljUHuNxLzXbXpFHhLAOCSjFbs/lca3SnjElz6bie astycjiDh62c/xIbr6fZzzkGCsqjpkM7j386HfO6K42E0TU1WFtR7XpYny9ayk4e3tXN NXissUZ3r0j1EvtBCrUk7OFSstTsqvjOLKZajkufxKRm28cH3/uonvUEou3SEk7XEJ4f HK++2fHq8/60hfVUzjpqcBCyCSkW97fCpLcsv7PobGKrgo8kTIxns9Yxuh5z+PHpVTZA 4Tyg== Received: by 10.68.243.10 with SMTP id wu10mr6818295pbc.85.1351867427939; Fri, 02 Nov 2012 07:43:47 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id nm2sm5857112pbc.43.2012.11.02.07.43.44 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 07:43:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2012 15:43:22 +0100 Message-Id: <1351867404-25510-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1351867404-25510-1-git-send-email-pbonzini@redhat.com> References: <1351867404-25510-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.220.45 Cc: blauwirbel@gmail.com, jan.kiszka@siemens.com, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH v2 3/5] qemu-timer: reinitialize timers after fork X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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;