On 2/22/21 10:19 PM, Jason Wang wrote: > We used to prompt CONFIG_VIRTIO_PCI_MODERN to user which may bring a > lot of confusion. E.g it may break various default configs which want > virtio devices. > > So this patch fixes this by hiding the prompot and documenting the > dependency. While at it, rename the module to VIRTIO_PCI_LIB. > > Cc: Arnd Bergmann <a...@arndb.de> > Cc: Anders Roxell <anders.rox...@linaro.org> > Cc: Guenter Roeck <li...@roeck-us.net> > Reported-by: Naresh Kamboju <naresh.kamb...@linaro.org> > Fixes: 86b87c9d858b6 ("virtio-pci: introduce modern device module") > Signed-off-by: Jason Wang <jasow...@redhat.com>
Acked-by: Guenter Roeck <li...@roeck-us.net> > --- > drivers/virtio/Kconfig | 11 ++++++----- > drivers/virtio/Makefile | 2 +- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig > index 6b9b81f4b8c2..ce1b3f6ec325 100644 > --- a/drivers/virtio/Kconfig > +++ b/drivers/virtio/Kconfig > @@ -12,13 +12,13 @@ config ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS > This option is selected if the architecture may need to enforce > VIRTIO_F_ACCESS_PLATFORM > > -config VIRTIO_PCI_MODERN > - tristate "Modern Virtio PCI Device" > - depends on PCI > +config VIRTIO_PCI_LIB > + tristate > help > Modern PCI device implementation. This module implements the > basic probe and control for devices which are based on modern > - PCI device with possible vendor specific extensions. > + PCI device with possible vendor specific extensions. Any > + module that selects this module must depend on PCI. Nit: "depends on PCI" might have been useful here, since the config system would then complain about any violations. Thanks, Guenter > > menuconfig VIRTIO_MENU > bool "Virtio drivers" > @@ -28,7 +28,8 @@ if VIRTIO_MENU > > config VIRTIO_PCI > tristate "PCI driver for virtio devices" > - depends on VIRTIO_PCI_MODERN > + depends on PCI > + select VIRTIO_PCI_LIB > select VIRTIO > help > This driver provides support for virtio based paravirtual device > diff --git a/drivers/virtio/Makefile b/drivers/virtio/Makefile > index f097578aaa8f..699bbea0465f 100644 > --- a/drivers/virtio/Makefile > +++ b/drivers/virtio/Makefile > @@ -1,6 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0 > obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o > -obj-$(CONFIG_VIRTIO_PCI_MODERN) += virtio_pci_modern_dev.o > +obj-$(CONFIG_VIRTIO_PCI_LIB) += virtio_pci_modern_dev.o > obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o > obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o > virtio_pci-y := virtio_pci_modern.o virtio_pci_common.o >