From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NzGzT-0000dn-3S for qemu-devel@nongnu.org; Tue, 06 Apr 2010 18:11:23 -0400 Received: from [140.186.70.92] (port=34163 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzGzQ-0000dd-JC for qemu-devel@nongnu.org; Tue, 06 Apr 2010 18:11:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NzGzL-0004Gc-14 for qemu-devel@nongnu.org; Tue, 06 Apr 2010 18:11:19 -0400 Received: from mail-fx0-f214.google.com ([209.85.220.214]:39305) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NzGzK-0004GT-SU for qemu-devel@nongnu.org; Tue, 06 Apr 2010 18:11:14 -0400 Received: by fxm6 with SMTP id 6so453296fxm.17 for ; Tue, 06 Apr 2010 15:11:13 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 7 Apr 2010 00:11:09 +0200 Message-Id: <1270591869-11602-1-git-send-email-pbonzini@redhat.com> In-Reply-To: References: Subject: [Qemu-devel] [PATCH resend] fix 100% cpu utilization when cpu is stopped List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org > Hello, > > d6f4ade (disentangle tcg and deadline calculation, 2010-03-10) > introduces following regression(s): > > 100% cpu utilization when QEMU is invoked like: > qemu -S -s ... > > ditto when gdb takes control over the session via gdb-stub > (i.e. the breakpoint is hit or C-c is pressed inside gdb to > interrupt the attached qemu instance) The bug is that env->stopped is not really as comprehensive as it seems to be (and cpu_has_work thinks); it is only valid with iothread basically, and even then it is cleared by reset and it is not set when starting qemu with -S. Signed-off-by: Paolo Bonzini Cc: malc --- cpus.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cpus.c b/cpus.c index a2e0642..0debe77 100644 --- a/cpus.c +++ b/cpus.c @@ -100,9 +100,7 @@ static int cpu_can_run(CPUState *env) { if (env->stop) return 0; - if (env->stopped) - return 0; - if (!vm_running) + if (env->stopped || !vm_running) return 0; return 1; } @@ -111,7 +109,7 @@ static int cpu_has_work(CPUState *env) { if (env->stop) return 1; - if (env->stopped) + if (env->stopped || !vm_running) return 0; if (!env->halted) return 1; -- 1.6.6.1