Commit 9900b4b4 authored by Marc Zyngier's avatar Marc Zyngier Committed by Avi Kivity
Browse files

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: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <c.dall@virtualopensystems.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent dcce0489

include/linux/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ static inline int mmu_notifier_retry(struct kvm_vcpu *vcpu, unsigned long mmu_se 
}

#endif



#ifdef CONFIG_HAVE_KVM_IRQCHIP

#ifdef KVM_CAP_IRQ_ROUTING



#define KVM_MAX_IRQ_ROUTES 1024

virt/kvm/kvm_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2225,7 +2225,7 @@ static long kvm_dev_ioctl_check_extension_generic(long arg) 
	case KVM_CAP_SIGNAL_MSI:

#endif

		return 1;

#ifdef CONFIG_HAVE_KVM_IRQCHIP

#ifdef KVM_CAP_IRQ_ROUTING

	case KVM_CAP_IRQ_ROUTING:

		return KVM_MAX_IRQ_ROUTES;

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE