| Message ID | 20211108094705.554350-1-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vhost-user-scsi: fix Kconfig dependencies | expand |
On 11/8/21 10:47, Paolo Bonzini wrote: > VIRTIO_PCI is a hard dependency for CONFIG_VHOST_USER_SCSI; if virtio-pci > is not included, linking fails due to missing virtio_pci_types_register. > Adjust the Kconfig dependencies. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > hw/scsi/Kconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig > index 77d397c949..f972680ffc 100644 > --- a/hw/scsi/Kconfig > +++ b/hw/scsi/Kconfig > @@ -50,6 +50,6 @@ config VIRTIO_SCSI > > config VHOST_USER_SCSI > bool > + default y > # Only PCI devices are provided for now > - default y if VIRTIO_PCI > - depends on VIRTIO && VHOST_USER && LINUX > + depends on VIRTIO_PCI && VHOST_USER && LINUX But there is no PCI call there: $ git grep pci hw/scsi/vhost*scsi* $ Don't we want to add VHOST_USER_SCSI_PCI in hw/virtio/Kconfig instead?
On 11/8/21 10:53, Philippe Mathieu-Daudé wrote: >> config VHOST_USER_SCSI >> bool >> + default y >> # Only PCI devices are provided for now >> - default y if VIRTIO_PCI >> - depends on VIRTIO && VHOST_USER && LINUX >> + depends on VIRTIO_PCI && VHOST_USER && LINUX > But there is no PCI call there: Yeah, you're right. You can still access the device on virtio-mmio via -device vhost-user-scsi. > $ git grep pci hw/scsi/vhost*scsi* > $ > > Don't we want to add VHOST_USER_SCSI_PCI in > hw/virtio/Kconfig instead? In practice you already have hw/virtio/vhost-user-scsi.pci conditional on "CONFIG_VHOST_USER_SCSI && CONFIG_VIRTIO_PCI", and further configuration is not too useful. I think the best option is to either make it "default y if VIRTIO_PCI || VIRTIO_MMIO", or bite the bullet and add the ccw proxy devices. Paolo
diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index 77d397c949..f972680ffc 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -50,6 +50,6 @@ config VIRTIO_SCSI config VHOST_USER_SCSI bool + default y # Only PCI devices are provided for now - default y if VIRTIO_PCI - depends on VIRTIO && VHOST_USER && LINUX + depends on VIRTIO_PCI && VHOST_USER && LINUX
VIRTIO_PCI is a hard dependency for CONFIG_VHOST_USER_SCSI; if virtio-pci is not included, linking fails due to missing virtio_pci_types_register. Adjust the Kconfig dependencies. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/scsi/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)