From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH] KVM: x86: Account for failing enable_irq_window for NMI
 window request
Date: Mon, 29 Apr 2013 16:37:48 +0200
Message-ID: <517E85BC.6000809@redhat.com>
References: <517CCEB9.7030504@web.de> <1B4B44D9196EFF41AE41FDA404FC0A10CA70B5@SHSMSX101.ccr.corp.intel.com> <20130428143355.GA31934@redhat.com> <1B4B44D9196EFF41AE41FDA404FC0A10CA71A5@SHSMSX101.ccr.corp.intel.com> <517D4D9C.60905@web.de> <517D5104.20207@web.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: Gleb Natapov <gleb@redhat.com>,
	Marcelo Tosatti <mtosatti@redhat.com>,
	"Ren, Yongjie" <yongjie.ren@intel.com>, kvm <kvm@vger.kernel.org>,
	"Nakajima, Jun" <jun.nakajima@intel.com>
To: Jan Kiszka <jan.kiszka@web.de>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mail-qe0-f54.google.com ([209.85.128.54]:32798 "EHLO
	mail-qe0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1757451Ab3D2OiG (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 29 Apr 2013 10:38:06 -0400
Received: by mail-qe0-f54.google.com with SMTP id s1so259280qeb.41
        for <kvm@vger.kernel.org>; Mon, 29 Apr 2013 07:38:06 -0700 (PDT)
In-Reply-To: <517D5104.20207@web.de>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Il 28/04/2013 18:40, Jan Kiszka ha scritto:
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 8747fef..6974ca8 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -5754,7 +5754,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
>  
>  		/* enable NMI/IRQ window open exits if needed */
>  		if (vcpu->arch.nmi_pending)
> -			kvm_x86_ops->enable_nmi_window(vcpu);
> +			req_immediate_exit =
> +				kvm_x86_ops->enable_nmi_window(vcpu);

!= 0 for consistency with below?

Paolo

>  		else if (kvm_cpu_has_injectable_intr(vcpu) || req_int_win)
>  			req_immediate_exit =
>  				kvm_x86_ops->enable_irq_window(vcpu) != 0;
> -- 1.7.3.4