From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TStlB-0003aF-6W for qemu-devel@nongnu.org; Mon, 29 Oct 2012 14:08:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TStl6-0005jk-Cy for qemu-devel@nongnu.org; Mon, 29 Oct 2012 14:08:25 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:62356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TStl6-0005YM-6a for qemu-devel@nongnu.org; Mon, 29 Oct 2012 14:08:20 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so4194358pbb.4 for ; Mon, 29 Oct 2012 11:08:19 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 29 Oct 2012 19:07:15 +0100 Message-Id: <1351534038-15503-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1351534038-15503-1-git-send-email-pbonzini@redhat.com> References: <1351534038-15503-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/11] qemu-timer: make initialization functions idempotent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- 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