From patchwork Mon Dec 21 08:09:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 41525 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ED959B6F08 for ; Mon, 21 Dec 2009 19:46:58 +1100 (EST) Received: from localhost ([127.0.0.1]:59680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMdup-0006Wg-9R for incoming@patchwork.ozlabs.org; Mon, 21 Dec 2009 03:46:55 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NMdKw-0002m3-2L for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:50 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NMdKp-0002iD-E3 for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:47 -0500 Received: from [199.232.76.173] (port=52818 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMdKn-0002hq-T9 for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27728) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NMdKn-0003oW-Ep for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:41 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89eFm020487 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 21 Dec 2009 03:09:40 -0500 Received: from localhost.localdomain (vpn2-10-119.ams2.redhat.com [10.36.10.119]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89V3T011460 for ; Mon, 21 Dec 2009 03:09:40 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Dec 2009 09:09:20 +0100 Message-Id: <1261382970-23251-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> References: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 09/19] remove qemu_rearm_alarm_timer from main loop X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make the timer subsystem register its own callback instead. Signed-off-by: Paolo Bonzini --- vl.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index c32dc5d..78807f5 100644 --- a/vl.c +++ b/vl.c @@ -1421,6 +1421,12 @@ static void win32_rearm_timer(struct qemu_alarm_timer *t) #endif /* _WIN32 */ +static void alarm_timer_on_change_state_rearm(void *opaque, int running, int reason) +{ + if (running) + qemu_rearm_alarm_timer((struct qemu_alarm_timer *) opaque); +} + static int init_timer_alarm(void) { struct qemu_alarm_timer *t = NULL; @@ -1442,6 +1448,7 @@ static int init_timer_alarm(void) /* first event is at time 0 */ t->pending = 1; alarm_timer = t; + qemu_add_vm_change_state_handler(alarm_timer_on_change_state_rearm, t); return 0; @@ -3094,7 +3101,6 @@ void vm_start(void) cpu_enable_ticks(); vm_running = 1; vm_state_notify(1, 0); - qemu_rearm_alarm_timer(alarm_timer); resume_all_vcpus(); } }