From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 8 Feb 2011 18:18:25 +0100 Message-Id: <1297185509-20996-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1297185509-20996-1-git-send-email-pbonzini@redhat.com> References: <1297185509-20996-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [CFT PATCH 08/12] do not use timedwait on qemu_halt_cond List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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); -- 1.7.3.5