From patchwork Fri Aug 27 09:37:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 136881 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 o7R9bn67019386 for ; Fri, 27 Aug 2010 09:37:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753405Ab0H0Jhr (ORCPT ); Fri, 27 Aug 2010 05:37:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44381 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750707Ab0H0Jhq (ORCPT ); Fri, 27 Aug 2010 05:37:46 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7R9bk68028091 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 27 Aug 2010 05:37:46 -0400 Received: from localhost.localdomain ([10.3.121.6]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7R9bjSt019508; Fri, 27 Aug 2010 05:37:45 -0400 From: Jes.Sorensen@redhat.com To: kvm@vger.kernel.org Cc: avi@redhat.com, gleb@redhat.com Subject: [PATCH] Disable GUEST_INTR_STATE_STI flag before injecting NMI to guest on VMX Date: Fri, 27 Aug 2010 11:37:43 +0200 Message-Id: <1282901863-27417-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 27 Aug 2010 09:37:50 +0000 (UTC) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index cf56462..2cafc17 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2888,6 +2888,7 @@ static void vmx_inject_nmi(struct kvm_vcpu *vcpu) kvm_rip_write(vcpu, vmx->rmode.irq.rip - 1); return; } + vmcs_clear_bits(GUEST_INTERRUPTIBILITY_INFO, GUEST_INTR_STATE_STI); vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK | NMI_VECTOR); }