From mboxrd@z Thu Jan  1 00:00:00 1970
From: Avi Kivity <avi@redhat.com>
Subject: Re: Build breakage between kvm-userspace.git HEAD and 2.6.29-rc8
Date: Sun, 15 Mar 2009 12:43:13 +0200
Message-ID: <49BCDBC1.40006@redhat.com>
References: <49BA7D77.1010003@gmail.com> <49BCC914.4070204@redhat.com> <20090315101915.GF10892@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1255; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Gregory Haskins <gregory.haskins@gmail.com>, kvm@vger.kernel.org,
	Mark McLoughlin <markmc@redhat.com>,
	Weidong Han <weidong.han@intel.com>
To: Gleb Natapov <gleb@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx2.redhat.com ([66.187.237.31]:44003 "EHLO mx2.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1758533AbZCOKnS (ORCPT <rfc822;kvm@vger.kernel.org>);
	Sun, 15 Mar 2009 06:43:18 -0400
In-Reply-To: <20090315101915.GF10892@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Gleb Natapov wrote:
> diff --git a/libkvm/libkvm.c b/libkvm/libkvm.c
> index 0ac1c28..3e6bef1 100644
> --- a/libkvm/libkvm.c
> +++ b/libkvm/libkvm.c
> @@ -667,9 +667,14 @@ int kvm_set_irq_level(kvm_context_t kvm, int irq, int level, int *status)
>  	if (r == -1)
>  		perror("kvm_set_irq_level");
>  
> -	if (status)
> +	if (status) {
> +#if defined(KVM_CAP_IRQ_INJECT_STATUS) && defined(KVM_IRQ_LINE_STATUS)
>  		*status = (kvm->irqchip_inject_ioctl == KVM_IRQ_LINE) ?
>  			1 : event.status;
> +#else
> +		*status = 1;
> +#endif
> +	}
>  
>  	return 1;
>  }
>   

Isn't #ifdef KVM_CAP_... sufficient?  If it is defined it should imply 
everything needed for injection status is defined and works.

-- 
error compiling committee.c: too many arguments to function