aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2009-02-26 07:55:33 -0500
committerAvi Kivity <avi@redhat.com>2009-06-10 04:48:24 -0400
commitb95b51d580bff9376850eef29d34c3aa08c26db7 (patch)
tree54f505ef2fba99adc38580f631556cb756f6df2f
parenta90ede7b17d122acd58e6e1ff911be9dcf5263cc (diff)
KVM: declare ioapic functions only on affected hardware
Since "KVM: Unify the delivery of IOAPIC and MSI interrupts" I get the following warnings: CC [M] arch/s390/kvm/kvm-s390.o In file included from arch/s390/kvm/kvm-s390.c:22: include/linux/kvm_host.h:357: warning: 'struct kvm_ioapic' declared inside parameter list include/linux/kvm_host.h:357: warning: its scope is only this definition or declaration, which is probably not what you want This patch limits IOAPIC functions for architectures that have one. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--include/linux/kvm_host.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 3832243625d4..3b91ec9982c2 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -363,9 +363,11 @@ void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,
363 struct kvm_irq_mask_notifier *kimn); 363 struct kvm_irq_mask_notifier *kimn);
364void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask); 364void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask);
365 365
366#ifdef __KVM_HAVE_IOAPIC
366void kvm_get_intr_delivery_bitmask(struct kvm_ioapic *ioapic, 367void kvm_get_intr_delivery_bitmask(struct kvm_ioapic *ioapic,
367 union kvm_ioapic_redirect_entry *entry, 368 union kvm_ioapic_redirect_entry *entry,
368 unsigned long *deliver_bitmask); 369 unsigned long *deliver_bitmask);
370#endif
369int kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level); 371int kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);
370void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin); 372void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin);
371void kvm_register_irq_ack_notifier(struct kvm *kvm, 373void kvm_register_irq_ack_notifier(struct kvm *kvm,