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 X-Patchwork-Id: 86946 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 E096DB700F for ; Tue, 15 Mar 2011 22:28:01 +1100 (EST) Received: from localhost ([127.0.0.1]:46633 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzSPu-00011b-R1 for incoming@patchwork.ozlabs.org; Tue, 15 Mar 2011 07:27:58 -0400 Received: from [140.186.70.92] (port=35026 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzSOd-0000t9-7F for qemu-devel@nongnu.org; Tue, 15 Mar 2011 07:26:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzSOb-0004AJ-Et for qemu-devel@nongnu.org; Tue, 15 Mar 2011 07:26:39 -0400 Received: from thoth.sbs.de ([192.35.17.2]:19895) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzSOb-00049N-65 for qemu-devel@nongnu.org; Tue, 15 Mar 2011 07:26:37 -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 To: Avi Kivity , Marcelo Tosatti Date: Tue, 15 Mar 2011 12:26:19 +0100 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.2 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v2 08/20] kvm: x86: Do not leave halt if interrupts are disabled 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 When an external interrupt is pending but IF is cleared, we must not leave the halt state prematurely. Signed-off-by: Jan Kiszka --- target-i386/kvm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) 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) {