hw/scsi: Introduce VHOST_SCSI_COMMON symbol in Kconfig
Instead of adding 'vhost-scsi-common.c' twice (for VHOST_SCSI and VHOST_USER_SCSI), have it depend on VHOST_SCSI_COMMON, selected by both symbols. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20230524093744.88442-3-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
parent
b3b408ffb9
commit
8f691f1cb7
|
@ -48,13 +48,19 @@ config VIRTIO_SCSI
|
||||||
depends on VIRTIO
|
depends on VIRTIO
|
||||||
select SCSI
|
select SCSI
|
||||||
|
|
||||||
|
config VHOST_SCSI_COMMON
|
||||||
|
bool
|
||||||
|
depends on VIRTIO
|
||||||
|
|
||||||
config VHOST_SCSI
|
config VHOST_SCSI
|
||||||
bool
|
bool
|
||||||
default y
|
default y
|
||||||
|
select VHOST_SCSI_COMMON
|
||||||
depends on VIRTIO && VHOST_KERNEL
|
depends on VIRTIO && VHOST_KERNEL
|
||||||
|
|
||||||
config VHOST_USER_SCSI
|
config VHOST_USER_SCSI
|
||||||
bool
|
bool
|
||||||
# Only PCI devices are provided for now
|
# Only PCI devices are provided for now
|
||||||
default y if VIRTIO_PCI
|
default y if VIRTIO_PCI
|
||||||
|
select VHOST_SCSI_COMMON
|
||||||
depends on VIRTIO && VHOST_USER && LINUX
|
depends on VIRTIO && VHOST_USER && LINUX
|
||||||
|
|
|
@ -17,8 +17,10 @@ specific_scsi_ss = ss.source_set()
|
||||||
|
|
||||||
virtio_scsi_ss = ss.source_set()
|
virtio_scsi_ss = ss.source_set()
|
||||||
virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c'))
|
virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c'))
|
||||||
virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-common.c', 'vhost-scsi.c'))
|
|
||||||
virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-scsi-common.c', 'vhost-user-scsi.c'))
|
virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI_COMMON', if_true: files('vhost-scsi-common.c'))
|
||||||
|
virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi.c'))
|
||||||
|
virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi.c'))
|
||||||
specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss)
|
specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss)
|
||||||
|
|
||||||
specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c'))
|
specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c'))
|
||||||
|
|
Loading…
Reference in New Issue