Skip to contentSkip to conversation

vdpa: make vhost, virtio depend on menu

PATCH In review Michael S. Tsirkin 2 participants 2 messages Apr 12, 2020 – Apr 13, 2020

Subsystems (5)
lore
Share & tools
lore

Michael S. Tsirkin

author maintainer
#0 lore raw

PATCH v2 1/1 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.

---

changes from v1:
fix up virtio vdpa Kconfig

 drivers/vdpa/Kconfig   | 16 +++++-----------
 drivers/vhost/Kconfig  |  2 +-
 drivers/virtio/Kconfig |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)
drivers/vdpa/Kconfig +5 -11
index d0cb0e583a5d..71d9a64f2c7d 100644
@@ -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
 	select VHOST_IOTLB
 	default n
@@ -25,9 +20,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
@@ -35,4 +29,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
index cb6b17323eb2..e79cbbdfea45 100644
@@ -64,7 +64,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
index 2aadf398d8cc..395c3f4d49cb 100644
@@ -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
Signature · 1 line
MST
Acked-by on v2 1/1
#1 lore raw
Quoted 10 lines · Michael S. Tsirkin

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.

Quoted 74 lines

---

changes from v1:
fix up virtio vdpa Kconfig

  drivers/vdpa/Kconfig   | 16 +++++-----------
  drivers/vhost/Kconfig  |  2 +-
  drivers/virtio/Kconfig |  2 +-
  3 files changed, 7 insertions(+), 13 deletions(-)
drivers/vdpa/Kconfig +5 -11
index d0cb0e583a5d..71d9a64f2c7d 100644
@@ -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
  	select VHOST_IOTLB
  	default n
@@ -25,9 +20,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
@@ -35,4 +29,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
index cb6b17323eb2..e79cbbdfea45 100644
@@ -64,7 +64,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 +0 -0
index 2aadf398d8cc..395c3f4d49cb 100644

drivers/virtio/Kconfig config VIRTIO_PCI_LEGACY · line 51

Quoted 8 lines
drivers/virtio/Kconfig +1 -1
@@ -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

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization