From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=50801 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtzD6-0003SS-5s for qemu-devel@nongnu.org; Mon, 28 Feb 2011 04:17:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ptz8K-0004kV-4S for qemu-devel@nongnu.org; Mon, 28 Feb 2011 04:11:13 -0500 Received: from mail-gy0-f173.google.com ([209.85.160.173]:45960) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ptz8K-0004do-1p for qemu-devel@nongnu.org; Mon, 28 Feb 2011 04:11:12 -0500 Received: by mail-gy0-f173.google.com with SMTP id 8so1782110gyd.4 for ; Mon, 28 Feb 2011 01:11:12 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 28 Feb 2011 10:10:16 +0100 Message-Id: <1298884224-19734-15-git-send-email-pbonzini@redhat.com> In-Reply-To: <1298884224-19734-1-git-send-email-pbonzini@redhat.com> References: <1298884224-19734-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3 uq/master 14/22] 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 Cc: blauwirbel@gmail.com, jan.kiszka@siemes.com, aurelien@aurel32.net, kvm@vger.kernel.org, mtosatti@redhat.com 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 6cfb45b..4c3837f 100644 --- a/cpus.c +++ b/cpus.c @@ -771,7 +771,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_wait(tcg_halt_cond, &qemu_global_mutex); } qemu_mutex_unlock(&qemu_global_mutex); @@ -794,7 +794,7 @@ static void qemu_tcg_wait_io_event(void) static void qemu_kvm_wait_io_event(CPUState *env) { while (cpu_thread_is_idle(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); -- 1.7.4