Explorar o código

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>
Marc Zyngier %!s(int64=13) %!d(string=hai) anos
pai
achega
9900b4b48b
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
  1. 1 1
      include/linux/kvm_host.h
  2. 1 1
      virt/kvm/kvm_main.c

+ 1 - 1
include/linux/kvm_host.h

@@ -802,7 +802,7 @@ static inline int mmu_notifier_retry(struct kvm_vcpu *vcpu, unsigned long mmu_se
 }
 }
 #endif
 #endif
 
 
-#ifdef CONFIG_HAVE_KVM_IRQCHIP
+#ifdef KVM_CAP_IRQ_ROUTING
 
 
 #define KVM_MAX_IRQ_ROUTES 1024
 #define KVM_MAX_IRQ_ROUTES 1024
 
 

+ 1 - 1
virt/kvm/kvm_main.c

@@ -2225,7 +2225,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 CONFIG_HAVE_KVM_IRQCHIP
+#ifdef KVM_CAP_IRQ_ROUTING
 	case KVM_CAP_IRQ_ROUTING:
 	case KVM_CAP_IRQ_ROUTING:
 		return KVM_MAX_IRQ_ROUTES;
 		return KVM_MAX_IRQ_ROUTES;
 #endif
 #endif