From patchwork Wed Mar 10 10:38:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 47239 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 9FE49B7CF3 for ; Wed, 10 Mar 2010 22:27:41 +1100 (EST) Received: from localhost ([127.0.0.1]:33923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpK4f-0005x7-Su for incoming@patchwork.ozlabs.org; Wed, 10 Mar 2010 06:27:37 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpJJq-0008LM-L4 for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:14 -0500 Received: from [199.232.76.173] (port=52789 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJJp-0008Jz-GV for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:13 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpJJo-0004v3-Sj for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:13 -0500 Received: from ey-out-1920.google.com ([74.125.78.148]:44402) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpJJn-0004t4-Uj for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:12 -0500 Received: by ey-out-1920.google.com with SMTP id 5so4373200eyb.14 for ; Wed, 10 Mar 2010 02:39:11 -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=gLivhzPgPYWS+L7Rh7FRl4lxuESy98NVBMLP24kzpNE=; b=KmeWEM47+TnRMhRHs7iCRAX5usUl2f/QDm+FljauRec7n3208CbbXkZ0M5JJMJq/dl pOzsPtAdsBCuGVuyEjofCgNdHCCGvw0ekLGaU50oVnozemfKvV8RQsCHBm1faxVMHpJd 7hbXdbqQ1w30Wes9msZX1dZCCK0huXzef34dY= 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=rzA617bGDbME7aroC1MOYKfLg4CMKDfuKpFFaBAK8Oy36V4XyGk9kxZiQxBxdOttxc yJadT3ZOs+5VGASeBSLREm2/AhTFy6JHUcxzCe4Nq2RYRyCsAA9BjQ4/1997mlvCPw7c 759xixAQnAwptC2tVsHrkXtaxNw0joC64JBm4= Received: by 10.213.97.4 with SMTP id j4mr4930753ebn.9.1268217551323; Wed, 10 Mar 2010 02:39:11 -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.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 10 Mar 2010 02:39:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 10 Mar 2010 11:38:50 +0100 Message-Id: <1268217535-26554-14-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 13/18] add qemu_alarm_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 Signed-off-by: Paolo Bonzini --- vl.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 2f78817..18bd2ee 100644 --- a/vl.c +++ b/vl.c @@ -601,6 +601,13 @@ struct qemu_alarm_timer { char pending; }; +static struct qemu_alarm_timer *alarm_timer; + +static inline int qemu_alarm_pending(void) +{ + return alarm_timer->pending; +} + static inline int alarm_has_dynticks(struct qemu_alarm_timer *t) { return !!t->rearm; @@ -617,8 +624,6 @@ static void qemu_rearm_alarm_timer(struct qemu_alarm_timer *t) /* TODO: MIN_TIMER_REARM_US should be optimized */ #define MIN_TIMER_REARM_US 250 -static struct qemu_alarm_timer *alarm_timer; - #ifdef _WIN32 struct qemu_alarm_win32 { @@ -4000,7 +4005,7 @@ static void tcg_cpu_exec(void) qemu_clock_enable(vm_clock, (cur_cpu->singlestep_enabled & SSTEP_NOTIMER) == 0); - if (alarm_timer->pending) + if (qemu_alarm_pending()) break; if (cpu_can_run(env)) ret = qemu_cpu_exec(env);