[kvm-devel] QEMU/KVM: clear HF_HALTED mask at vcpu startup time

[Marcelo T. <mto...@re...>]

Now that threads are spinned up before machine->init(), clearing
of HF_HALTED_MASK for irqchip in kernel case needs to be moved
to actual vcpu startup.

Signed-off-by: Marcelo Tosatti <mto...@re...>

diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c
index f7a217a..50589a7 100644
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -325,6 +325,8 @@ static int kvm_main_loop_cpu(CPUState *env)
 
     setup_kernel_sigmask(env);
     pthread_mutex_lock(&qemu_mutex);
+    if (kvm_irqchip_in_kernel(kvm_context))
+	env->hflags &= ~HF_HALTED_MASK;
 
     kvm_qemu_init_env(env);
     env->ready_for_interrupt_injection = 1;
@@ -368,8 +370,6 @@ static void *ap_main_loop(void *_env)
     sigprocmask(SIG_BLOCK, &signals, NULL);
     kvm_create_vcpu(kvm_context, env->cpu_index);
     kvm_qemu_init_env(env);
-    if (kvm_irqchip_in_kernel(kvm_context))
-	env->hflags &= ~HF_HALTED_MASK;
     kvm_main_loop_cpu(env);
     return NULL;
 }