mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-11-05 20:35:44 +00:00
fix 100% cpu utilization when cpu is stopped
> 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 <pbonzini@redhat.com>
Cc: malc <av1474@comtv.ru>
Signed-off-by: malc <av1474@comtv.ru>
This commit is contained in:
parent
f7e2aca834
commit
55274a3052
1 changed files with 2 additions and 4 deletions
6
cpus.c
6
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;
|
||||
|
|
Loading…
Reference in a new issue