UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: Introduce CONFIG_HAVE_KVM_IRQ_ROUTING 

Quite a bit of code in KVM has been conditionalized on availability of
IOAPIC emulation. However, most of it is generically applicable to
platforms that don't have an IOPIC, but a different type of irq chip.

Make code that only relies on IRQ routing, not an APIC itself, on
CONFIG_HAVE_KVM_IRQ_ROUTING, so that we can reuse it later.

Signed-off-by: Alexander Graf <agraf@suse.de>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Alexander Graf 2013-04-17 13:29:30 +02:00
parent 8175e5b79c
commit a725d56a02
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/kvm/Kconfig
View File

@ -29,6 +29,7 @@ config KVM
select MMU_NOTIFIER select MMU_NOTIFIER
select ANON_INODES select ANON_INODES
select HAVE_KVM_IRQCHIP select HAVE_KVM_IRQCHIP
select HAVE_KVM_IRQ_ROUTING
select HAVE_KVM_EVENTFD select HAVE_KVM_EVENTFD
select KVM_APIC_ARCHITECTURE select KVM_APIC_ARCHITECTURE
select KVM_ASYNC_PF select KVM_ASYNC_PF

6
include/linux/kvm_host.h
View File

@ -304,7 +304,7 @@ struct kvm_kernel_irq_routing_entry {
struct hlist_node link; struct hlist_node link;
}; };
#ifdef __KVM_HAVE_IOAPIC #ifdef CONFIG_HAVE_KVM_IRQ_ROUTING
struct kvm_irq_routing_table { struct kvm_irq_routing_table {
int chip[KVM_NR_IRQCHIPS][KVM_IRQCHIP_NUM_PINS]; int chip[KVM_NR_IRQCHIPS][KVM_IRQCHIP_NUM_PINS];
@ -432,7 +432,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
int __must_check vcpu_load(struct kvm_vcpu *vcpu); int __must_check vcpu_load(struct kvm_vcpu *vcpu);
void vcpu_put(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu);
#ifdef __KVM_HAVE_IOAPIC #ifdef CONFIG_HAVE_KVM_IRQ_ROUTING
int kvm_irqfd_init(void); int kvm_irqfd_init(void);
void kvm_irqfd_exit(void); void kvm_irqfd_exit(void);
#else #else
@ -957,7 +957,7 @@ static inline int mmu_notifier_retry(struct kvm *kvm, unsigned long mmu_seq)
} }
#endif #endif
#ifdef KVM_CAP_IRQ_ROUTING #ifdef CONFIG_HAVE_KVM_IRQ_ROUTING
#define KVM_MAX_IRQ_ROUTES 1024 #define KVM_MAX_IRQ_ROUTES 1024

3
virt/kvm/Kconfig
View File

@ -6,6 +6,9 @@ config HAVE_KVM
config HAVE_KVM_IRQCHIP config HAVE_KVM_IRQCHIP
bool bool
config HAVE_KVM_IRQ_ROUTING
bool
config HAVE_KVM_EVENTFD config HAVE_KVM_EVENTFD
bool bool
select EVENTFD select EVENTFD

6
virt/kvm/eventfd.c
View File

@ -35,7 +35,7 @@
#include "iodev.h" #include "iodev.h"
#ifdef __KVM_HAVE_IOAPIC #ifdef CONFIG_HAVE_KVM_IRQ_ROUTING
/* /*
* -------------------------------------------------------------------- * --------------------------------------------------------------------
* irqfd: Allows an fd to be used to inject an interrupt to the guest * irqfd: Allows an fd to be used to inject an interrupt to the guest
@ -433,7 +433,7 @@ fail:
void void
kvm_eventfd_init(struct kvm *kvm) kvm_eventfd_init(struct kvm *kvm)
{ {
#ifdef __KVM_HAVE_IOAPIC #ifdef CONFIG_HAVE_KVM_IRQ_ROUTING
spin_lock_init(&kvm->irqfds.lock); spin_lock_init(&kvm->irqfds.lock);
INIT_LIST_HEAD(&kvm->irqfds.items); INIT_LIST_HEAD(&kvm->irqfds.items);
INIT_LIST_HEAD(&kvm->irqfds.resampler_list); INIT_LIST_HEAD(&kvm->irqfds.resampler_list);
@ -442,7 +442,7 @@ kvm_eventfd_init(struct kvm *kvm)
INIT_LIST_HEAD(&kvm->ioeventfds); INIT_LIST_HEAD(&kvm->ioeventfds);
} }
#ifdef __KVM_HAVE_IOAPIC #ifdef CONFIG_HAVE_KVM_IRQ_ROUTING
/* /*
* shutdown any irqfd's that match fd+gsi * shutdown any irqfd's that match fd+gsi
*/ */

2
virt/kvm/kvm_main.c
View File

@ -2404,7 +2404,7 @@ static long kvm_dev_ioctl_check_extension_generic(long arg)
case KVM_CAP_SIGNAL_MSI: case KVM_CAP_SIGNAL_MSI:
#endif #endif
return 1; return 1;
#ifdef KVM_CAP_IRQ_ROUTING #ifdef CONFIG_HAVE_KVM_IRQ_ROUTING
case KVM_CAP_IRQ_ROUTING: case KVM_CAP_IRQ_ROUTING:
return KVM_MAX_IRQ_ROUTES; return KVM_MAX_IRQ_ROUTES;
#endif #endif