[PATCH] KVM: PPC: Fix compile warning

[PATCH] KVM: PPC: Fix compile warning

[Alexander Graf]

KVM compilation fails with the following warning:

include/linux/kvm_host.h: In function 'kvm_irq_routing_update':
include/linux/kvm_host.h:679:2: error: 'struct kvm' has no member named 'irq_routing'

That function is only used and reasonable to have on systems that implement
an in-kernel interrupt chip. PPC doesn't.

Fix by #ifdef'ing it out when no irqchip is available.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 include/linux/kvm_host.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index f17beae..da0794f 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -673,11 +673,13 @@ static inline int kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags)
 
 static inline void kvm_irqfd_release(struct kvm *kvm) {}
 
+#ifdef CONFIG_HAVE_KVM_IRQCHIP
 static inline void kvm_irq_routing_update(struct kvm *kvm,
 					  struct kvm_irq_routing_table *irq_rt)
 {
 	rcu_assign_pointer(kvm->irq_routing, irq_rt);
 }
+#endif
 
 static inline int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args)
 {
-- 
1.6.0.2

Re: [PATCH] KVM: PPC: Fix compile warning

[Avi Kivity]

On 11/25/2010 11:25 AM, Alexander Graf wrote:
> KVM compilation fails with the following warning:
>
> include/linux/kvm_host.h: In function 'kvm_irq_routing_update':
> include/linux/kvm_host.h:679:2: error: 'struct kvm' has no member named 'irq_routing'
>
> That function is only used and reasonable to have on systems that implement
> an in-kernel interrupt chip. PPC doesn't.
>
> Fix by #ifdef'ing it out when no irqchip is available.
>

Applied, thanks.  Let's see how buildbot takes it.

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

Re: [PATCH] KVM: PPC: Fix compile warning

[Alexander Graf]

On 25.11.2010, at 10:36, Avi Kivity wrote:

> On 11/25/2010 11:25 AM, Alexander Graf wrote:
>> KVM compilation fails with the following warning:
>> 
>> include/linux/kvm_host.h: In function 'kvm_irq_routing_update':
>> include/linux/kvm_host.h:679:2: error: 'struct kvm' has no member named 'irq_routing'
>> 
>> That function is only used and reasonable to have on systems that implement
>> an in-kernel interrupt chip. PPC doesn't.
>> 
>> Fix by #ifdef'ing it out when no irqchip is available.
>> 
> 
> Applied, thanks.  Let's see how buildbot takes it.

Well, s390 is still broken. There were two issues there.


Alex