From patchwork Tue Feb 8 17:18:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 82363 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 DC735B7147 for ; Wed, 9 Feb 2011 04:51:56 +1100 (EST) Received: from localhost ([127.0.0.1]:47414 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmrjF-0001KS-0G for incoming@patchwork.ozlabs.org; Tue, 08 Feb 2011 12:51:53 -0500 Received: from [140.186.70.92] (port=54301 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pmrhu-0000pR-9Q for qemu-devel@nongnu.org; Tue, 08 Feb 2011 12:50:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pmrht-0005Sz-4T for qemu-devel@nongnu.org; Tue, 08 Feb 2011 12:50:30 -0500 Received: from mail-yi0-f45.google.com ([209.85.218.45]:61541) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PmrDL-0000yQ-4g for qemu-devel@nongnu.org; Tue, 08 Feb 2011 12:18:55 -0500 Received: by mail-yi0-f45.google.com with SMTP id 21so2633904yie.4 for ; Tue, 08 Feb 2011 09:18:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=MWs7TmwImQVbZ1xcCFGvOCGx07/VbwpUB1iy3x3mLBk=; b=atwQqeZ4d5rkCSAmp65V0qTyBRFcAWc6nODcGLn/5JEAa7taONloSzLk+ttZDDtbIZ p9BxxeC5ybLAYpnCKgQGSgG3StAIPm2Z63rAXgFyLQcjYdErMoqpTcVv0cQOGlGmc9Ql 88Gv+RWItrSbx2274C3arlsMGLRux+1paVFjA= 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=G9i9NEydMA+ApqQ51UH7MVLdqCBmc0vxRA25uwbpvX65jFipze8KoTiFEsbjRfIA4Q IOp0tuUQkSzWddnHjHR0pWorYx4BvoOnFgcTdUd9k9UKcNJI6r/d/6RUyfp4J/T5qFyo LSKKD57vasGbjEI4Sb0/qlY8Vzq1ffTf5H/gw= Received: by 10.90.102.15 with SMTP id z15mr158305agb.190.1297185534873; Tue, 08 Feb 2011 09:18:54 -0800 (PST) Received: from localhost.localdomain (93-34-149-100.ip50.fastwebnet.it [93.34.149.100]) by mx.google.com with ESMTPS id e24sm7303210ana.22.2011.02.08.09.18.53 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 08 Feb 2011 09:18:54 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 8 Feb 2011 18:18:25 +0100 Message-Id: <1297185509-20996-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.3.5 In-Reply-To: <1297185509-20996-1-git-send-email-pbonzini@redhat.com> References: <1297185509-20996-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.218.45 Subject: [Qemu-devel] [CFT PATCH 08/12] do not use timedwait on qemu_halt_cond 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 The following conditions can cause cpu_has_work(env) to become true: - env->queued_work_first: run_on_cpu is already kicking the VCPU - env->stop = 1: pause_all_vcpus is already kicking the VCPU - env->stopped = 0: resume_all_vcpus is already kicking the VCPU - vm_running = 1: vm_start is calling resume_all_vcpus - env->halted = 0: see previous patch - qemu_cpu_has_work(env): when it becomes true, board code should set env->halted = 0 too. Signed-off-by: Paolo Bonzini --- cpus.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpus.c b/cpus.c index ee2a6cc..be3d82d 100644 --- a/cpus.c +++ b/cpus.c @@ -746,7 +746,7 @@ static void qemu_tcg_wait_io_event(void) CPUState *env; while (!any_cpu_has_work()) - qemu_cond_timedwait(tcg_halt_cond, &qemu_global_mutex, 1000); + qemu_cond_wait(tcg_halt_cond, &qemu_global_mutex); qemu_mutex_unlock(&qemu_global_mutex); @@ -768,7 +768,7 @@ static void qemu_tcg_wait_io_event(void) static void qemu_kvm_wait_io_event(CPUState *env) { while (!cpu_has_work(env)) - qemu_cond_timedwait(env->halt_cond, &qemu_global_mutex, 1000); + qemu_cond_wait(env->halt_cond, &qemu_global_mutex); qemu_kvm_eat_signals(env); qemu_wait_io_event_common(env);