From patchwork Tue Feb 15 20:56:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 83300 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 B9DE2B7110 for ; Wed, 16 Feb 2011 07:59:36 +1100 (EST) Received: from localhost ([127.0.0.1]:46354 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PpRyt-0006g8-2Y for incoming@patchwork.ozlabs.org; Tue, 15 Feb 2011 15:58:43 -0500 Received: from [140.186.70.92] (port=41191 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PpRxK-00062q-Sh for qemu-devel@nongnu.org; Tue, 15 Feb 2011 15:57:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PpRxI-0005lp-0t for qemu-devel@nongnu.org; Tue, 15 Feb 2011 15:57:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:31965) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PpRxH-0005li-QM for qemu-devel@nongnu.org; Tue, 15 Feb 2011 15:57:03 -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.14.4/8.14.4) with ESMTP id p1FKv1FP003735 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Feb 2011 15:57:01 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p1FKv0So026306; Tue, 15 Feb 2011 15:57:01 -0500 Received: from amt.cnet (vpn-8-29.rdu.redhat.com [10.11.8.29]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p1FKuxeM018032; Tue, 15 Feb 2011 15:57:00 -0500 Received: from amt.cnet (localhost.localdomain [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 0D4BD68A00D; Tue, 15 Feb 2011 18:56:33 -0200 (BRST) Received: (from marcelo@localhost) by amt.cnet (8.14.4/8.14.4/Submit) id p1FKuVO1016600; Tue, 15 Feb 2011 18:56:31 -0200 Date: Tue, 15 Feb 2011 18:56:31 -0200 From: Marcelo Tosatti To: Jan Kiszka Message-ID: <20110215205631.GA16579@amt.cnet> References: <20110215175410.GA13487@amt.cnet> <4D5ACCED.1080906@siemens.com> <20110215200446.GA15802@amt.cnet> <4D5AE2FC.4020309@web.de> <20110215205504.GA16527@amt.cnet> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20110215205504.GA16527@amt.cnet> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: "Edgar E. Iglesias" , "qemu-devel@nongnu.org" , Paolo Bonzini Subject: [Qemu-devel] [PATCH] fix halt emulation with icount and CONFIG_IOTHREAD (v2) 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 Note: to be applied to uq/master. In icount mode, halt emulation should take into account the nearest event when sleeping. Signed-off-by: Marcelo Tosatti Reported-and-tested-by: "Edgar E. Iglesias" diff --git a/cpus.c b/cpus.c index 468544c..21c3eba 100644 --- a/cpus.c +++ b/cpus.c @@ -770,7 +770,7 @@ static void qemu_tcg_wait_io_event(void) CPUState *env; while (all_cpu_threads_idle()) { - qemu_cond_timedwait(tcg_halt_cond, &qemu_global_mutex, 1000); + qemu_cond_timedwait(tcg_halt_cond, &qemu_global_mutex, qemu_calculate_timeout()); } qemu_mutex_unlock(&qemu_global_mutex);