From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Graf Subject: Re: [PATCH] KVM: Fix compilation on non-x86 Date: Wed, 25 Jan 2012 18:45:17 +0100 Message-ID: <4F203FAD.2080605@suse.de> References: <1327512783-29868-1-git-send-email-agraf@suse.de> <4F203EA8.4060104@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: "qemu-ppc@nongnu.org" , qemu-devel Developers , "kvm@vger.kernel.org" , "mtosatti@redhat.com" , "aliguori@us.ibm.com" To: Jan Kiszka Return-path: Received: from cantor2.suse.de ([195.135.220.15]:49518 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756429Ab2AYRpS (ORCPT ); Wed, 25 Jan 2012 12:45:18 -0500 In-Reply-To: <4F203EA8.4060104@siemens.com> Sender: kvm-owner@vger.kernel.org List-ID: On 01/25/2012 06:40 PM, Jan Kiszka wrote: > On 2012-01-25 18:33, Alexander Graf wrote: >> Commit 84b058d broke compilation for KVM on non-x86 targets, which >> don't have KVM_CAP_IRQ_ROUTING defined. >> >> Fix by not using the unavailable constant when it's not around. >> >> Signed-off-by: Alexander Graf >> --- >> kvm-all.c | 4 ++++ >> 1 files changed, 4 insertions(+), 0 deletions(-) >> >> diff --git a/kvm-all.c b/kvm-all.c >> index e411d3c..831f39a 100644 >> --- a/kvm-all.c >> +++ b/kvm-all.c >> @@ -1305,7 +1305,11 @@ int kvm_has_many_ioeventfds(void) >> >> int kvm_has_gsi_routing(void) >> { >> +#ifdef KVM_CAP_IRQ_ROUTING >> return kvm_check_extension(kvm_state, KVM_CAP_IRQ_ROUTING); >> +#else >> + return false; >> +#endif >> } >> >> int kvm_allows_irq0_override(void) > Yep, thanks. Btw, I really dislike the concept of conditional CAP defines. If a CAP isn't available, we get false returned from the kernel anyway. And if a CAP is architecture specific, we should rather be #ifdefing on TARGET_XXX rather than the CAP. Alex