From patchwork Wed Dec 2 13:48:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 40072 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 4106BB7BE1 for ; Thu, 3 Dec 2009 03:43:29 +1100 (EST) Received: from localhost ([127.0.0.1]:36999 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFsIX-0001qB-TO for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 11:43:25 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFpZM-0006VY-Lw for qemu-devel@nongnu.org; Wed, 02 Dec 2009 08:48:37 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFpZI-0006Sp-6R for qemu-devel@nongnu.org; Wed, 02 Dec 2009 08:48:35 -0500 Received: from [199.232.76.173] (port=58151 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFpZG-0006Se-UB for qemu-devel@nongnu.org; Wed, 02 Dec 2009 08:48:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4131) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFpZG-0004G8-Km for qemu-devel@nongnu.org; Wed, 02 Dec 2009 08:48:30 -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 nB2DmTjB008812 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 2 Dec 2009 08:48:29 -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 nB2DmN2I026291; Wed, 2 Dec 2009 08:48:28 -0500 From: Glauber Costa To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 11:48:14 -0200 Message-Id: <1259761702-4041-4-git-send-email-glommer@redhat.com> In-Reply-To: <1259761702-4041-3-git-send-email-glommer@redhat.com> References: <1259761702-4041-1-git-send-email-glommer@redhat.com> <1259761702-4041-2-git-send-email-glommer@redhat.com> <1259761702-4041-3-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 03/11] update halted state on mp_state sync 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 If we are using in-kernel irqchip, halted state belongs in the kernel. So everytime we grab kernel's idea of mpstate, we also need to propagate halted state to userspace. Signed-off-by: Glauber Costa --- target-i386/kvm.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 7e1ce15..65ad2a1 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -825,6 +825,11 @@ static int kvm_get_mp_state(CPUState *env) return ret; } env->mp_state = mp_state.mp_state; + + if (kvm_irqchip_in_kernel()) { + env->halted = (env->mp_state == KVM_MP_STATE_HALTED); + } + return 0; }