From patchwork Fri Mar 19 05:24:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TeLeMan X-Patchwork-Id: 48111 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 9F9FDB7CB6 for ; Fri, 19 Mar 2010 16:25:55 +1100 (EST) Received: from localhost ([127.0.0.1]:56566 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NsUiV-00072I-JP for incoming@patchwork.ozlabs.org; Fri, 19 Mar 2010 01:25:51 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NsUhU-00070U-4Q for qemu-devel@nongnu.org; Fri, 19 Mar 2010 01:24:48 -0400 Received: from [199.232.76.173] (port=43677 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NsUhS-0006zo-RZ for qemu-devel@nongnu.org; Fri, 19 Mar 2010 01:24:46 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NsUhS-0004Cr-4d for qemu-devel@nongnu.org; Fri, 19 Mar 2010 01:24:46 -0400 Received: from mail-px0-f176.google.com ([209.85.216.176]:64410) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NsUhR-0004Ck-R0 for qemu-devel@nongnu.org; Fri, 19 Mar 2010 01:24:46 -0400 Received: by pxi6 with SMTP id 6so2013772pxi.18 for ; Thu, 18 Mar 2010 22:24:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:cc:content-type; bh=9G/O07lGlRSpRX+B82qIBER8xMSbgtZBM+XBanbP5n0=; b=kAvavFyzDKbvzBUPMewBQT/RdDmCrb1pJhqdJ62ELnHvmb6WCek6716YHs6Or28u27 2JtebmffMQk2J10Rrsb4r2Hw/3As2uqATG38wGJM8Op258Xe8HypvrjRoqyBBFhdupP4 8vw2wqx5wnJPlew2CcKHV5HV7dHILkAHGsHdU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=kF60nvYx8l6oteVIZpfSogKUy6gA6nnQNUKZgBCfinF7VCxRlPq3zMso4ZBBmo3nDQ +Km4WYTAf+shFwY59JRo2XQa1kzpDsa18sOsyhjeJmIukx2TtD3LLDrs8cByNS6YWlKY UG46sSeIvyC5Usv//O2Z6XUKzAUZspc+6Ost8= MIME-Version: 1.0 Received: by 10.141.125.6 with SMTP id c6mr1322996rvn.59.1268976284681; Thu, 18 Mar 2010 22:24:44 -0700 (PDT) Date: Fri, 19 Mar 2010 13:24:44 +0800 Message-ID: From: TeLeMan To: qemu-devel , Paolo Bonzini X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH, RFC] qemu-timer: fix alarm_timer pending 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 I fetched the lastest qemu-timer codes and found qemu would have no response when the guest os was WinXP and the timer was "dynticks" on the win32 host. After qemu froze, it seemed the win32_rearm_timer() would never be called and alarm_timer->pending was always 0. I could not find the more deeper reason and just referred to the previous implement to make this patch. Signed-off-by: TeLeMan --- qemu-timer.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index 3d6e99a..f9e2b19 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -280,7 +280,12 @@ static struct qemu_alarm_timer *alarm_timer; int qemu_alarm_pending(void) { - return alarm_timer->pending; + if(alarm_timer->pending) { + alarm_timer->pending = 0; + return 1; + } + + return 0; } static inline int alarm_has_dynticks(struct qemu_alarm_timer *t) @@ -724,8 +729,6 @@ void qemu_run_all_timers(void) qemu_rearm_alarm_timer(alarm_timer); } - alarm_timer->pending = 0; - /* vm time timers */ if (vm_running) { qemu_run_timers(vm_clock);