Commit c5b31cc2 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: remove CONFIG_HAVE_KVM_IRQFD 



All platforms with a kernel irqchip have support for irqfd.  Unify the
two configuration items so that userspace can expect to use irqfd to
inject interrupts into the irqchip.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8132d887

arch/arm64/kvm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ menuconfig KVM 
	select KVM_GENERIC_DIRTYLOG_READ_PROTECT

	select KVM_XFER_TO_GUEST_WORK

	select KVM_VFIO

	select HAVE_KVM_IRQFD

	select HAVE_KVM_DIRTY_RING_ACQ_REL

	select NEED_KVM_DIRTY_RING_WITH_BITMAP

	select HAVE_KVM_MSI

arch/powerpc/kvm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -224,7 +224,6 @@ config KVM_MPIC 
	bool "KVM in-kernel MPIC emulation"

	depends on KVM && PPC_E500

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQFD

	select HAVE_KVM_IRQ_ROUTING

	select HAVE_KVM_MSI

	help
@@ -237,7 +236,6 @@ config KVM_XICS 
	bool "KVM in-kernel XICS emulation"

	depends on KVM_BOOK3S_64 && !KVM_MPIC

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQFD

	default y

	help

	  Include support for the XICS (eXternal Interrupt Controller

arch/powerpc/kvm/powerpc.c

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
		break;

#endif



#ifdef CONFIG_HAVE_KVM_IRQFD

#ifdef CONFIG_HAVE_KVM_IRQCHIP

	case KVM_CAP_IRQFD_RESAMPLE:

		r = !xive_enabled();

		break;

arch/riscv/kvm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ config KVM 
	tristate "Kernel-based Virtual Machine (KVM) support (EXPERIMENTAL)"

	depends on RISCV_SBI && MMU

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQFD

	select HAVE_KVM_IRQ_ROUTING

	select HAVE_KVM_MSI

	select HAVE_KVM_VCPU_ASYNC_IOCTL

arch/s390/kvm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ config KVM 
	select KVM_ASYNC_PF

	select KVM_ASYNC_PF_SYNC

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQFD

	select HAVE_KVM_IRQ_ROUTING

	select HAVE_KVM_INVALID_WAKEUPS

	select HAVE_KVM_NO_POLL