[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/11] qemu-timer: make initialization functions ide
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 08/11] qemu-timer: make initialization functions idempotent |
Date: |
Mon, 29 Oct 2012 19:07:15 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-timer.c | 12 +++++++++---
1 file modificato, 9 inserzioni(+), 3 rimozioni(-)
diff --git a/qemu-timer.c b/qemu-timer.c
index ede84ff..f3426c9 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -430,9 +430,11 @@ void qemu_unregister_clock_reset_notifier(QEMUClock
*clock, Notifier *notifier)
void init_clocks(void)
{
- rt_clock = qemu_new_clock(QEMU_CLOCK_REALTIME);
- vm_clock = qemu_new_clock(QEMU_CLOCK_VIRTUAL);
- host_clock = qemu_new_clock(QEMU_CLOCK_HOST);
+ if (!rt_clock) {
+ rt_clock = qemu_new_clock(QEMU_CLOCK_REALTIME);
+ vm_clock = qemu_new_clock(QEMU_CLOCK_VIRTUAL);
+ host_clock = qemu_new_clock(QEMU_CLOCK_HOST);
+ }
}
uint64_t qemu_timer_expire_time_ns(QEMUTimer *ts)
@@ -745,6 +747,10 @@ int init_timer_alarm(void)
struct qemu_alarm_timer *t = NULL;
int i, err = -1;
+ if (alarm_timer) {
+ return 0;
+ }
+
for (i = 0; alarm_timers[i].name; i++) {
t = &alarm_timers[i];
--
1.7.12.1
- [Qemu-devel] [PATCH 00/11] Trim dependencies of qemu-ga, vscclient, tests, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 01/11] janitor: move iovector functions out of cutils.c, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 03/11] compiler: use weak aliases to provide default definitions, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 02/11] build: move cutils.o and qemu-timer-common.o to oslib-obj-y, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 04/11] sockets: use weak aliases instead of qemu-tool.c, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 05/11] fdsets: use weak aliases instead of qemu-tool.c/qemu-user.c, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 06/11] iohandler: add weak alias in qemu-sockets.c, for qemu-ga, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 07/11] win32: add weak version of qemu_fd_register, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 08/11] qemu-timer: make initialization functions idempotent,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 09/11] main-loop: unify qemu_init_main_loop between QEMU and tools, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 10/11] qemu-tool: do not depend on qemu-timer.c, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 11/11] build: do not include main loop where it is not actually used, Paolo Bonzini, 2012/10/29