From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52248 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZfrC-0000iJ-4d for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PZfr4-0008KI-Qm for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:30 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:50543) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PZfr4-0008K6-Kf for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:26 -0500 From: Jan Kiszka Date: Mon, 3 Jan 2011 09:32:57 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH v2 07/17] kvm: x86: Prepare kvm_get_mp_state for in-kernel irqchip List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity , Marcelo Tosatti Cc: Jan Kiszka , qemu-devel@nongnu.org, kvm@vger.kernel.org From: Jan Kiszka This code path will not yet be taken as we still lack in-kernel irqchip support. But qemu-kvm can already make use of it and drop its own mp_state access services. Signed-off-by: Jan Kiszka --- target-i386/kvm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 684430f..30aa51c 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1198,6 +1198,9 @@ static int kvm_get_mp_state(CPUState *env) return ret; } env->mp_state = mp_state.mp_state; + if (kvm_irqchip_in_kernel()) { + env->halted = (mp_state.mp_state == KVM_MP_STATE_HALTED); + } return 0; } -- 1.7.1