From patchwork Tue Mar 15 11:26:19 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Kiszka <jan.kiszka@siemens.com>
X-Patchwork-Id: 635811
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2FBQvEW017838
	for <patchwork-kvm@patchwork.kernel.org>;
	Tue, 15 Mar 2011 11:26:57 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757188Ab1COL0z (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Tue, 15 Mar 2011 07:26:55 -0400
Received: from thoth.sbs.de ([192.35.17.2]:33115 "EHLO thoth.sbs.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1757281Ab1COL0s (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 15 Mar 2011 07:26:48 -0400
Received: from mail1.siemens.de (localhost [127.0.0.1])
	by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p2FBQalH017854;
	Tue, 15 Mar 2011 12:26:36 +0100
Received: from mchn199C.mchp.siemens.de ([146.254.215.103])
	by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p2FBQVg2000888;
	Tue, 15 Mar 2011 12:26:35 +0100
From: Jan Kiszka <jan.kiszka@siemens.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org
Subject: [PATCH v2 08/20] kvm: x86: Do not leave halt if interrupts are
	disabled
Date: Tue, 15 Mar 2011 12:26:19 +0100
Message-Id: 
 <d071e9c9eea2c594d2c02fbe75689ee21a530072.1300188374.git.jan.kiszka@siemens.com>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <cover.1300188374.git.jan.kiszka@siemens.com>
References: <cover.1300188374.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1300188374.git.jan.kiszka@siemens.com>
References: <cover.1300188374.git.jan.kiszka@siemens.com>
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.6 (demeter1.kernel.org [140.211.167.41]);
	Tue, 15 Mar 2011 11:26:57 +0000 (UTC)


diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index f7995bd..3a07fce 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1590,7 +1590,9 @@ int kvm_arch_process_async_events(CPUState *env)
         return 0;
     }
 
-    if (env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) {
+    if (((env->interrupt_request & CPU_INTERRUPT_HARD) &&
+         (env->eflags & IF_MASK)) ||
+        (env->interrupt_request & CPU_INTERRUPT_NMI)) {
         env->halted = 0;
     }
     if (env->interrupt_request & CPU_INTERRUPT_INIT) {