From patchwork Tue Sep 27 16:31:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 116643 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 7E0DBB6F70 for ; Wed, 28 Sep 2011 03:35:20 +1000 (EST) Received: from localhost ([::1]:37153 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8aaO-0002TS-E5 for incoming@patchwork.ozlabs.org; Tue, 27 Sep 2011 12:32:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8aZx-0001PY-MB for qemu-devel@nongnu.org; Tue, 27 Sep 2011 12:32:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R8aZr-0002S2-3c for qemu-devel@nongnu.org; Tue, 27 Sep 2011 12:32:18 -0400 Received: from mail-bw0-f45.google.com ([209.85.214.45]:54831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8aZq-0002Pn-UJ for qemu-devel@nongnu.org; Tue, 27 Sep 2011 12:32:15 -0400 Received: by mail-bw0-f45.google.com with SMTP id zv15so7356430bkb.4 for ; Tue, 27 Sep 2011 09:32:14 -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=q/sIhVSLPa77bxoXow7XCP1qnwZjm8IUTBrK3qyWm94=; b=PAbHqXKToUvJ9pOY5/1I61vYAGVk+eg451QyNC8IgH8KY6v2zUfCFePdjsFP1JGZ35 mHEtfgGnOkrr3gpvZmk0JA0sZCwa8YxGC3645XBtVArEwoe7BYTfuxSTr1aSoLLTAhaX sgRQddWXcQ6X4nXiL/7MDOoE/uxfz50Qb1Goc= Received: by 10.204.138.85 with SMTP id z21mr5245564bkt.184.1317141134381; Tue, 27 Sep 2011 09:32:14 -0700 (PDT) Received: from localhost.localdomain (93-34-218-143.ip51.fastwebnet.it. [93.34.218.143]) by mx.google.com with ESMTPS id d1sm25178167bku.1.2011.09.27.09.32.13 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 27 Sep 2011 09:32:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 27 Sep 2011 18:31:47 +0200 Message-Id: <1317141111-27701-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1317141111-27701-1-git-send-email-pbonzini@redhat.com> References: <1317141111-27701-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.45 Subject: [Qemu-devel] [PATCH 08/12] qemu-timer: do not use RunState change handlers 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 files changed, 4 insertions(+), 8 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index 58926dd..f11a28d 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -273,7 +273,11 @@ static QEMUClock *qemu_new_clock(int type) void qemu_clock_enable(QEMUClock *clock, int enabled) { + bool old = clock->enabled; clock->enabled = enabled; + if (enabled && !old) { + qemu_rearm_alarm_timer(alarm_timer); + } } int64_t qemu_clock_has_timers(QEMUClock *clock) @@ -806,13 +810,6 @@ static void win32_rearm_timer(struct qemu_alarm_timer *t, #endif /* _WIN32 */ -static void alarm_timer_on_change_state_rearm(void *opaque, int running, - RunState state) -{ - if (running) - qemu_rearm_alarm_timer((struct qemu_alarm_timer *) opaque); -} - static void quit_timers(void) { struct qemu_alarm_timer *t = alarm_timer; @@ -842,7 +839,6 @@ int init_timer_alarm(void) atexit(quit_timers); t->pending = 1; alarm_timer = t; - qemu_add_vm_change_state_handler(alarm_timer_on_change_state_rearm, t); return 0;