From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH v5 4/4] KVM: x86: Add support for local interrupt requests
 from userspace
Date: Wed, 29 Jul 2015 12:15:01 +0200
Message-ID: <55B8A7A5.3090205@redhat.com>
References: <1438039062-3168-1-git-send-email-srutherford@google.com>
 <1438039062-3168-4-git-send-email-srutherford@google.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
To: Steve Rutherford <srutherford@google.com>, kvm@vger.kernel.org
Return-path: <kvm-owner@vger.kernel.org>
Received: from mail-wi0-f179.google.com ([209.85.212.179]:37614 "EHLO
	mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751063AbbG2KPF (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 29 Jul 2015 06:15:05 -0400
Received: by wibud3 with SMTP id ud3so19049498wib.0
        for <kvm@vger.kernel.org>; Wed, 29 Jul 2015 03:15:03 -0700 (PDT)
In-Reply-To: <1438039062-3168-4-git-send-email-srutherford@google.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>



On 28/07/2015 01:17, Steve Rutherford wrote:
> +
> +	if (irqchip_in_kernel(vcpu->kvm) && !pic_in_kernel(vcpu->kvm) &&
> +	    vcpu->arch.pending_external_vector == -1) {
> +		vcpu->arch.pending_external_vector = irq->irq;
> +		return 0;
> +	} else if (irqchip_in_kernel(vcpu->kvm) && !pic_in_kernel(vcpu->kvm))
> +		return -EEXIST;
> +	else if (irqchip_in_kernel(vcpu->kvm))
>  		return -ENXIO;

This is better written as:

	if (!irqchip_in_kernel(vcpu->kvm)) {
	        kvm_queue_interrupt(vcpu, irq->irq, false);
	        kvm_make_request(KVM_REQ_EVENT, vcpu);
		return 0;
	}

	/*
	 * With in-kernel LAPIC, we only use this to inject EXTINT, so
	 * fail for in-kernel 8259.
	 */
	if (pic_in_kernel(vcpu->kvm)) {
		return -ENXIO;

	if (vcpu->arch.pending_external_vector != -1)
		return -EEXIST;

	vcpu->arch.pending_external_vector = irq->irq;
	return 0;

Paolo