diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2012-06-15 15:07:02 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2012-06-18 09:06:35 -0400 |
commit | 9900b4b48b095895cf962054e45aafa49ef70f74 (patch) | |
tree | d831176b62979612b2d4e5504d2d2de1ddee3817 /virt | |
parent | dcce0489477f07ac1331aee71f18d6274e19a9c1 (diff) |
KVM: use KVM_CAP_IRQ_ROUTING to protect the routing related code
The KVM code sometimes uses CONFIG_HAVE_KVM_IRQCHIP to protect
code that is related to IRQ routing, which not all in-kernel
irqchips may support.
Use KVM_CAP_IRQ_ROUTING instead.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <c.dall@virtualopensystems.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 02cb440f802d..636bd08bb399 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -2225,7 +2225,7 @@ static long kvm_dev_ioctl_check_extension_generic(long arg) | |||
2225 | case KVM_CAP_SIGNAL_MSI: | 2225 | case KVM_CAP_SIGNAL_MSI: |
2226 | #endif | 2226 | #endif |
2227 | return 1; | 2227 | return 1; |
2228 | #ifdef CONFIG_HAVE_KVM_IRQCHIP | 2228 | #ifdef KVM_CAP_IRQ_ROUTING |
2229 | case KVM_CAP_IRQ_ROUTING: | 2229 | case KVM_CAP_IRQ_ROUTING: |
2230 | return KVM_MAX_IRQ_ROUTES; | 2230 | return KVM_MAX_IRQ_ROUTES; |
2231 | #endif | 2231 | #endif |