From patchwork Fri Oct 21 16:26:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 121034 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 31DD71007D1 for ; Sat, 22 Oct 2011 04:44:21 +1100 (EST) Received: from localhost ([::1]:60037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHHwO-00055B-Mb for incoming@patchwork.ozlabs.org; Fri, 21 Oct 2011 12:27:28 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHHw1-0004L1-WB for qemu-devel@nongnu.org; Fri, 21 Oct 2011 12:27:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RHHvw-0007Qy-EX for qemu-devel@nongnu.org; Fri, 21 Oct 2011 12:27:05 -0400 Received: from mail-ww0-f41.google.com ([74.125.82.41]:52021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHHvw-0007Qk-9m for qemu-devel@nongnu.org; Fri, 21 Oct 2011 12:27:00 -0400 Received: by wwe32 with SMTP id 32so1099917wwe.4 for ; Fri, 21 Oct 2011 09:26:59 -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=FupIsYJnlTHCUx610BvFQE5rqCoY4Od5rvJ65gPZm80=; b=jlRBhoi2EFfFGE4bGA29czXOWl6RyvubQwAD5pucTzobxDjkg6NyQoB87Kl08EGya7 K+n3z82396FBtiSxmEWwMxboSyh3U/GcKTMCi8idlnMWLe6mIi5BSn401h0jRMCcIlgJ fjelswmpj1cbJgK+PIpp0ZXc/3qf0tOsOqYpc= Received: by 10.227.196.195 with SMTP id eh3mr5620357wbb.75.1319214418803; Fri, 21 Oct 2011 09:26:58 -0700 (PDT) Received: from localhost.localdomain (93-34-199-98.ip51.fastwebnet.it. [93.34.199.98]) by mx.google.com with ESMTPS id b5sm22704403wbh.4.2011.10.21.09.26.57 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Oct 2011 09:26:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 21 Oct 2011 18:26:39 +0200 Message-Id: <1319214405-20388-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1319214405-20388-1-git-send-email-pbonzini@redhat.com> References: <1319214405-20388-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.41 Subject: [Qemu-devel] [PATCH v3 07/13] 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 66f70fb..6bd7e71 100644 --- a/vl.c +++ b/vl.c @@ -3565,7 +3565,6 @@ int main(int argc, char **argv, char **envp) os_setup_post(); main_loop(); - quit_timers(); net_cleanup(); res_free();