Commit 013aabdc authored by Clement Deschamps's avatar Clement Deschamps Committed by Paolo Bonzini
Browse files

icount: fix deadlock when all cpus are sleeping 



When all cpus are sleeping (e.g in WFI), to avoid a deadlock
in the main_loop, wake it up in order to start the warp timer.

Signed-off-by: default avatarClement Deschamps <clement.deschamps@greensocs.com>
Message-Id: <20181021142103.19014-1-clement.deschamps@greensocs.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fc3d1bad

cpus.c

+8 −0
Original line number Diff line number Diff line
@@ -1554,6 +1554,14 @@ static void *qemu_tcg_rr_cpu_thread_fn(void *arg) 
            atomic_mb_set(&cpu->exit_request, 0);

        }



        if (use_icount && all_cpu_threads_idle()) {

            /*

             * When all cpus are sleeping (e.g in WFI), to avoid a deadlock

             * in the main_loop, wake it up in order to start the warp timer.

             */

            qemu_notify_event();

        }



        qemu_tcg_rr_wait_io_event(cpu ? cpu : first_cpu);

        deal_with_unplugged_cpus();

    }