From patchwork Wed Dec 2 13:48:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 40070 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D6AEFB7BE3 for ; Thu, 3 Dec 2009 03:39:08 +1100 (EST) Received: from localhost ([127.0.0.1]:37092 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFsEM-0004dv-2E for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 11:39:06 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFpZK-0006UI-Pk for qemu-devel@nongnu.org; Wed, 02 Dec 2009 08:48:35 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFpZF-0006Rv-6s for qemu-devel@nongnu.org; Wed, 02 Dec 2009 08:48:34 -0500 Received: from [199.232.76.173] (port=58149 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFpZE-0006Ri-5t for qemu-devel@nongnu.org; Wed, 02 Dec 2009 08:48:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22381) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFpZD-0004Fb-T0 for qemu-devel@nongnu.org; Wed, 02 Dec 2009 08:48:28 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB2DmQLP007247 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 2 Dec 2009 08:48:26 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB2DmN2G026291; Wed, 2 Dec 2009 08:48:25 -0500 From: Glauber Costa To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 11:48:12 -0200 Message-Id: <1259761702-4041-2-git-send-email-glommer@redhat.com> In-Reply-To: <1259761702-4041-1-git-send-email-glommer@redhat.com> References: <1259761702-4041-1-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 01/11] Don't mess with halted state. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When we have irqchip in kernel, halted state is kernel business. So don't initialize it in our code. Signed-off-by: Glauber Costa --- hw/apic-kvm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/hw/apic-kvm.c b/hw/apic-kvm.c index 089fa45..e5a0bfc 100644 --- a/hw/apic-kvm.c +++ b/hw/apic-kvm.c @@ -122,10 +122,9 @@ static void kvm_apic_reset(void *opaque) s->dev.next_time = 0; s->dev.wait_for_sipi = 1; - s->cpu_env->halted = !(s->dev.apicbase & MSR_IA32_APICBASE_BSP); s->cpu_env->mp_state - = s->cpu_env->halted ? KVM_MP_STATE_UNINITIALIZED : KVM_MP_STATE_RUNNABLE; + = bsp ? KVM_MP_STATE_RUNNABLE : KVM_MP_STATE_UNINITIALIZED; kvm_put_mp_state(s->cpu_env);