[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/13] qemu-timer: use atexit for quit_timers
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 07/13] qemu-timer: use atexit for quit_timers |
Date: |
Tue, 11 Oct 2011 13:35:24 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 dbf7778..99f8ced 100644
--- a/vl.c
+++ b/vl.c
@@ -3561,7 +3561,6 @@ int main(int argc, char **argv, char **envp)
os_setup_post();
main_loop();
- quit_timers();
net_cleanup();
res_free();
--
1.7.6
- [Qemu-devel] [PATCH 01/13] remove unused function, (continued)
- [Qemu-devel] [PATCH 01/13] remove unused function, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 06/13] qemu-timer: do not refer to runstate_is_running(), Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 02/13] qemu-timer: remove active_timers array, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 09/13] qemu-timer: do not use RunState change handlers, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 04/13] qemu-timer: more clock functions, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 12/13] Revert to a hand-made select loop, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 08/13] qemu-timer: move more stuff out of qemu-timer.c, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 07/13] qemu-timer: use atexit for quit_timers,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 05/13] qemu-timer: move icount to cpus.c, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 03/13] qemu-timer: move common code to qemu_rearm_alarm_timer, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 13/13] simplify main loop functions, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 11/13] create main-loop.c, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 10/13] create main-loop.h, Paolo Bonzini, 2011/10/11
- Re: [Qemu-devel] [PATCH v2 00/13] allow tools to use the QEMU main loop, Anthony Liguori, 2011/10/17