From patchwork Wed Mar 10 10:38:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 47234 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 D7944B7CF8 for ; Wed, 10 Mar 2010 22:11:53 +1100 (EST) Received: from localhost ([127.0.0.1]:41900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJpN-0001PP-Li for incoming@patchwork.ozlabs.org; Wed, 10 Mar 2010 06:11:49 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpJJl-0008GO-7e for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:09 -0500 Received: from [199.232.76.173] (port=52776 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJJk-0008Fh-7o for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:08 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpJJi-0004th-Oi for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:07 -0500 Received: from mail-ew0-f225.google.com ([209.85.219.225]:62503) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpJJi-0004sG-Bt for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:06 -0500 Received: by mail-ew0-f225.google.com with SMTP id 25so153293ewy.16 for ; Wed, 10 Mar 2010 02:39:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=ZRSJ5H4oKuz0uwlLzuoGun/DxYxFHZzPe7S0bEmzW24=; b=b5iSQlRkUHcc7hlUANMHpDQ8q+aGV4M7K2qOXHzijjU4tldIo5WrJFLQkGR+5px5p2 qihFmdCunlBtgjsJzgmMr0MC2gEozOUvuR4sT2DIcd9MBEDNAJPW7+ubP7HLAueQgxQy Dhnhp09yAxdtXYyKZzL3ag38iGxPuPUS4qdCE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=o94+fulGbVDIo/JcdO9fdOBDOlt6o96TcEYM+dfr/zH+dxhD4UnoLTpZldAPIiR7Y1 YMEjeP1D6sczQB7M1ratfl1IWhS83Dt5Y0VDKx9ekJRPIu/QYdYbzKRR6MgUaqZP06M2 KCV0uEyiPAIwFLlYc/wecrLIFBDUhHXCuM5KU= Received: by 10.213.1.150 with SMTP id 22mr4792466ebf.63.1268217545715; Wed, 10 Mar 2010 02:39:05 -0800 (PST) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com [209.132.186.34]) by mx.google.com with ESMTPS id 14sm3836002ewy.2.2010.03.10.02.39.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 10 Mar 2010 02:39:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 10 Mar 2010 11:38:44 +0100 Message-Id: <1268217535-26554-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> References: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 07/18] 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 1328979..d6bbdbe 100644 --- a/vl.c +++ b/vl.c @@ -1417,6 +1417,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; @@ -1438,6 +1444,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; @@ -3080,7 +3087,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(); } }