From patchwork Thu May 13 13:17:14 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Gleb Natapov <gleb@redhat.com>
X-Patchwork-Id: 99317
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4DDHJ0f031037
	for <patchwork-kvm@patchwork.kernel.org>;
	Thu, 13 May 2010 13:17:19 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752923Ab0EMNRR (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Thu, 13 May 2010 09:17:17 -0400
Received: from mx1.redhat.com ([209.132.183.28]:12626 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752059Ab0EMNRQ (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 13 May 2010 09:17:16 -0400
Received: from int-mx02.intmail.prod.int.phx2.redhat.com
	(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4DDHG8a029960
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <kvm@vger.kernel.org>; Thu, 13 May 2010 09:17:16 -0400
Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com
	[10.35.1.237])
	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o4DDHFkO012158; Thu, 13 May 2010 09:17:16 -0400
Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519)
	id C7F4A18D450; Thu, 13 May 2010 16:17:14 +0300 (IDT)
Date: Thu, 13 May 2010 16:17:14 +0300
From: Gleb Natapov <gleb@redhat.com>
To: avi@redhat.com, mtosatti@redhat.com
Cc: kvm@vger.kernel.org
Subject: [PATCH] fix "info cpus" halted state display
Message-ID: <20100513131714.GC7757@redhat.com>
MIME-Version: 1.0
Content-Disposition: inline
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Thu, 13 May 2010 13:17:19 +0000 (UTC)


diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 61d9331..0ec2881 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -922,10 +922,6 @@ void kvm_arch_load_regs(CPUState *env, int level)
         if (env->kvm_vcpu_update_vapic)
             kvm_tpr_enable_vapic(env);
     }
-    if (kvm_irqchip_in_kernel()) {
-        /* Avoid deadlock: no user space IRQ will ever clear it. */
-        env->halted = 0;
-    }
 
     kvm_put_vcpu_events(env, level);
     kvm_put_debugregs(env);