From 66d2c8105620f55e3e843cd43ca38701323fe16e Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Thu, 15 Jan 2009 15:23:27 +0200 Subject: [PATCH] Allow calling vm_stop() from vcpu thread Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity --- qemu-kvm.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index 5ff63adc02..97f4a81b7e 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -289,11 +289,15 @@ static void pause_all_threads(void) { CPUState *penv = first_cpu; - assert(!cpu_single_env); - while (penv) { - penv->kvm_cpu_state.stop = 1; - pthread_kill(penv->kvm_cpu_state.thread, SIG_IPI); + if (penv != cpu_single_env) { + penv->kvm_cpu_state.stop = 1; + pthread_kill(penv->kvm_cpu_state.thread, SIG_IPI); + } else { + penv->kvm_cpu_state.stop = 0; + penv->kvm_cpu_state.stopped = 1; + cpu_interrupt(penv, CPU_INTERRUPT_EXIT); + } penv = (CPUState *)penv->next_cpu; } -- 2.11.4.GIT