From patchwork Thu Nov 26 17:24:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 39575 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 0452B1007D1 for ; Fri, 27 Nov 2009 04:57:21 +1100 (EST) Received: from localhost ([127.0.0.1]:39895 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDiak-0001F4-6u for incoming@patchwork.ozlabs.org; Thu, 26 Nov 2009 12:57:18 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDi5q-0004sg-0d for qemu-devel@nongnu.org; Thu, 26 Nov 2009 12:25:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDi5l-0004lH-NS for qemu-devel@nongnu.org; Thu, 26 Nov 2009 12:25:21 -0500 Received: from [199.232.76.173] (port=51786 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDi5l-0004kr-1u for qemu-devel@nongnu.org; Thu, 26 Nov 2009 12:25:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23082) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDi5k-0004pW-GT for qemu-devel@nongnu.org; Thu, 26 Nov 2009 12:25:16 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAQHPFL8008292 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 26 Nov 2009 12:25:15 -0500 Received: from localhost.localdomain (vpn-11-223.rdu.redhat.com [10.11.11.223]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAQHP8YI030005; Thu, 26 Nov 2009 12:25:14 -0500 From: Glauber Costa To: qemu-devel@nongnu.org Date: Thu, 26 Nov 2009 15:24:56 -0200 Message-Id: <1259256300-23937-4-git-send-email-glommer@redhat.com> In-Reply-To: <1259256300-23937-3-git-send-email-glommer@redhat.com> References: <1259256300-23937-1-git-send-email-glommer@redhat.com> <1259256300-23937-2-git-send-email-glommer@redhat.com> <1259256300-23937-3-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 3/7] 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; }