From patchwork Tue Dec 1 12:51:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 39900 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 34F28B6F16 for ; Wed, 2 Dec 2009 00:02:36 +1100 (EST) Received: from localhost ([127.0.0.1]:53272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFSNF-00081r-Tu for incoming@patchwork.ozlabs.org; Tue, 01 Dec 2009 08:02:34 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFSD0-0005WR-9h for qemu-devel@nongnu.org; Tue, 01 Dec 2009 07:51:58 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFSCv-0005Uj-6e for qemu-devel@nongnu.org; Tue, 01 Dec 2009 07:51:57 -0500 Received: from [199.232.76.173] (port=35006 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFSCu-0005Ug-F9 for qemu-devel@nongnu.org; Tue, 01 Dec 2009 07:51:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41433) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFSCu-0004rX-0i for qemu-devel@nongnu.org; Tue, 01 Dec 2009 07:51:52 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB1Cpp6b006604 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 1 Dec 2009 07:51:51 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB1CphNx002534; Tue, 1 Dec 2009 07:51:49 -0500 From: Glauber Costa To: qemu-devel@nongnu.org Date: Tue, 1 Dec 2009 10:51:29 -0200 Message-Id: <1259671897-22232-4-git-send-email-glommer@redhat.com> In-Reply-To: <1259671897-22232-3-git-send-email-glommer@redhat.com> References: <1259671897-22232-1-git-send-email-glommer@redhat.com> <1259671897-22232-2-git-send-email-glommer@redhat.com> <1259671897-22232-3-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, avi@redhat.com, agraf@suse.de Subject: [Qemu-devel] [PATCH v2 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 78f6d65..1c4f660 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; }