From patchwork Tue Sep 27 16:31:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 116633 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BA76BB6F75 for ; Wed, 28 Sep 2011 02:57:12 +1000 (EST) Received: from localhost ([::1]:37118 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8aaK-0002Q7-D0 for incoming@patchwork.ozlabs.org; Tue, 27 Sep 2011 12:32:44 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8aZs-00018K-8D for qemu-devel@nongnu.org; Tue, 27 Sep 2011 12:32:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R8aZo-0002RX-LF for qemu-devel@nongnu.org; Tue, 27 Sep 2011 12:32:16 -0400 Received: from mail-bw0-f45.google.com ([209.85.214.45]:54831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8aZo-0002Pn-91 for qemu-devel@nongnu.org; Tue, 27 Sep 2011 12:32:12 -0400 Received: by mail-bw0-f45.google.com with SMTP id zv15so7356430bkb.4 for ; Tue, 27 Sep 2011 09:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=Mb1oikTkSI47tVwFHIvauIDUEcjPHvYoQsZB/+H/FaU=; b=e+a9bOgwMdHl8D0X5vPCoZwmgAsq8ObKFi09XwYIURicNvs5Xe9rx95iEV/dMcc8af nymodXJfTZ5lUmA+B67EXYahlaUMG2A2/8KMyILb6FQdDc4nfLK7UOWnGgYdnmRPUqTC wccgqY27mPQ6Ji0hK/Sac1NgdK5n4PuPV1kxc= Received: by 10.204.140.13 with SMTP id g13mr5113779bku.208.1317141131835; Tue, 27 Sep 2011 09:32:11 -0700 (PDT) Received: from localhost.localdomain (93-34-218-143.ip51.fastwebnet.it. [93.34.218.143]) by mx.google.com with ESMTPS id d1sm25178167bku.1.2011.09.27.09.32.10 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 27 Sep 2011 09:32:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 27 Sep 2011 18:31:45 +0200 Message-Id: <1317141111-27701-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1317141111-27701-1-git-send-email-pbonzini@redhat.com> References: <1317141111-27701-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.45 Subject: [Qemu-devel] [PATCH 06/12] qemu-timer: use atexit for quit_timers 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 Signed-off-by: Paolo Bonzini --- qemu-timer.c | 15 ++++++++------- qemu-timer.h | 1 - vl.c | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index d8507e3..7fa81e1 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -840,6 +840,13 @@ static void alarm_timer_on_change_state_rearm(void *opaque, int running, qemu_rearm_alarm_timer((struct qemu_alarm_timer *) opaque); } +static void quit_timers(void) +{ + struct qemu_alarm_timer *t = alarm_timer; + alarm_timer = NULL; + t->stop(t); +} + int init_timer_alarm(void) { struct qemu_alarm_timer *t = NULL; @@ -859,6 +866,7 @@ int init_timer_alarm(void) } /* first event is at time 0 */ + atexit(quit_timers); t->pending = 1; alarm_timer = t; qemu_add_vm_change_state_handler(alarm_timer_on_change_state_rearm, t); @@ -869,13 +877,6 @@ fail: return err; } -void quit_timers(void) -{ - struct qemu_alarm_timer *t = alarm_timer; - alarm_timer = NULL; - t->stop(t); -} - int qemu_calculate_timeout(void) { return 1000; diff --git a/qemu-timer.h b/qemu-timer.h index ce576b9..b4ea201 100644 --- a/qemu-timer.h +++ b/qemu-timer.h @@ -62,7 +62,6 @@ void configure_alarms(char const *opt); int qemu_calculate_timeout(void); void init_clocks(void); int init_timer_alarm(void); -void quit_timers(void); int64_t cpu_get_ticks(void); void cpu_enable_ticks(void); diff --git a/vl.c b/vl.c index bd4a5ce..8ae6468 100644 --- a/vl.c +++ b/vl.c @@ -3572,7 +3572,6 @@ int main(int argc, char **argv, char **envp) os_setup_post(); main_loop(); - quit_timers(); net_cleanup(); res_free();