From c31ab3d8c43fe8bd6577417d00e267da143a7641 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Thu, 17 Apr 2008 19:30:57 -0300 Subject: [PATCH] Clear HF_HALTED mask at vcpu startup time 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 Signed-off-by: Avi Kivity --- qemu-kvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index f7a217a9ec..50589a726a 100644 --- a/qemu-kvm.c +++ b/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; } -- 2.11.4.GIT