Commit 58ad1372 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

vdpa: make vhost, virtio depend on menu 



If user did not configure any vdpa drivers, neither vhost
nor virtio vdpa are going to be useful. So there's no point
in prompting for these and selecting vdpa core automatically.
Simplify configuration by making virtio and vhost vdpa
drivers depend on vdpa menu entry. Once done, we no longer
need a separate menu entry, so also get rid of this.
While at it, fix up the IFC entry: VDPA->vDPA for consistency
with other places.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
parent 425a5070

drivers/vdpa/Kconfig

+5 −11
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config VDPA

	tristate

menuconfig VDPA

	tristate "vDPA drivers"

	help

	  Enable this module to support vDPA device that uses a

	  datapath which complies with virtio specifications with

	  vendor specific control path.



menuconfig VDPA_MENU

	bool "VDPA drivers"

	default n



if VDPA_MENU

if VDPA



config VDPA_SIM

	tristate "vDPA device simulator"

	depends on RUNTIME_TESTING_MENU && HAS_DMA

	select VDPA

	select VHOST_RING

	default n

	help
@@ -24,9 +19,8 @@ config VDPA_SIM 
	  development of vDPA.



config IFCVF

	tristate "Intel IFC VF VDPA driver"

	tristate "Intel IFC VF vDPA driver"

	depends on PCI_MSI

	select VDPA

	default n

	help

	  This kernel module can drive Intel IFC VF NIC to offload
@@ -34,4 +28,4 @@ config IFCVF 
	  To compile this driver as a module, choose M here: the module will

	  be called ifcvf.



endif # VDPA_MENU
 
endif # VDPA

drivers/vhost/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ config VHOST_VDPA 
	tristate "Vhost driver for vDPA-based backend"

	depends on EVENTFD

	select VHOST

	select VDPA

	depends on VDPA

	help

	  This kernel module can be loaded in host kernel to accelerate

	  guest virtio devices with the vDPA-based backends.

drivers/virtio/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ config VIRTIO_PCI_LEGACY 


config VIRTIO_VDPA

	tristate "vDPA driver for virtio devices"

	select VDPA

	depends on VDPA

	select VIRTIO

	help

	  This driver provides support for virtio based paravirtual

CRA Git | Maintained and supported by SUSTech CRA and CCSE