From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: QEMU/KVM: clear HF_HALTED mask at vcpu startup time Date: Thu, 17 Apr 2008 19:30:57 -0300 Message-ID: <20080417223057.GA13186@dmt> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Avi Kivity , kvm-devel Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces@lists.sourceforge.net Errors-To: kvm-devel-bounces@lists.sourceforge.net List-Id: kvm.vger.kernel.org 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 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; } ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone