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: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2020-04-12 04:36:55 -04:00
parent 425a507023
commit 58ad13729a
3 changed files with 7 additions and 13 deletions

View File

@ -1,21 +1,16 @@
# 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

View File

@ -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.

View File

@ -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