From patchwork Mon Oct 29 18:07:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 195104 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8F0FC2C008C for ; Tue, 30 Oct 2012 05:09:48 +1100 (EST) Received: from localhost ([::1]:58325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TStmU-0006MD-Jn for incoming@patchwork.ozlabs.org; Mon, 29 Oct 2012 14:09:46 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=laCnh0Yte+7cwspX6oNEU6EmL1XUaph3GA6/bhV4yn0=; b=iZkl8FEVoZE2hZGwX/iwGLvPLBbFZzIRR+D9hGl4t9h/udpgUsnj8LBfUo77ovEsAb 4XmdzTfDSyvOK6XxD+qOEg5gCCJpTTA3bOZTEeKUkZH84tqmYAhNelxDiuf1GXVAStyU fXYEZYEhtdXZRAccpN+EMoOJXFgA6z1ZmGkZI36tnzHU/IQBSIUDtn73XBYvRuYraqNq 65erwR9iiV+5ul47waPHdMs6jqift5urF4eeMhjE7h9yrU9/5xtNRI0pX4Df/78B1RHQ dlRNWKd4HGHBqE3W4NpwplGTCXYfFAZKBxG/gRQto7/wzCEBIfGb3jGfzrxqI3Qr8/il Wr/g== Received: by 10.66.73.6 with SMTP id h6mr85345015pav.69.1351534099957; Mon, 29 Oct 2012 11:08:19 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id vi9sm6327135pbc.41.2012.10.29.11.08.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Oct 2012 11:08:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 29 Oct 2012 19:07:15 +0100 Message-Id: <1351534038-15503-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1351534038-15503-1-git-send-email-pbonzini@redhat.com> References: <1351534038-15503-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Subject: [Qemu-devel] [PATCH 08/11] qemu-timer: make initialization functions idempotent 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 | 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];