From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NzFC8-0002QN-PT
	for qemu-devel@nongnu.org; Tue, 06 Apr 2010 16:16:20 -0400
Received: from [140.186.70.92] (port=49673 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NzFC2-0002NL-Rj
	for qemu-devel@nongnu.org; Tue, 06 Apr 2010 16:16:19 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <paolo.bonzini@gmail.com>) id 1NzFBy-0000qZ-57
	for qemu-devel@nongnu.org; Tue, 06 Apr 2010 16:16:14 -0400
Received: from mail-fx0-f221.google.com ([209.85.220.221]:60462)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <paolo.bonzini@gmail.com>) id 1NzFBy-0000qO-0J
	for qemu-devel@nongnu.org; Tue, 06 Apr 2010 16:16:10 -0400
Received: by fxm21 with SMTP id 21so363110fxm.2
	for <qemu-devel@nongnu.org>; Tue, 06 Apr 2010 13:16:09 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <4BBB9685.9090801@redhat.com>
Date: Tue, 06 Apr 2010 22:16:05 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <alpine.LNX.2.00.1004051747280.12421@linmac>
In-Reply-To: <alpine.LNX.2.00.1004051747280.12421@linmac>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] [PATCH] fix 100% cpu utilization when cpu is stopped
	(was Re: d6f4ade214a9f74dca9495b83a24ff9c113e4f9a)
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: malc <av1474@comtv.ru>
Cc: qemu-devel@nongnu.org

On 04/05/2010 03:51 PM, malc wrote:
> Hello,
>
> d6f4ade214a9f74dca9495b83a24ff9c113e4f9a: disentangle tcg and deadline calculation
> 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 <pbonzini@redhat.com>

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;