[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/51] scsi: express dependencies with Kconfig
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 15/51] scsi: express dependencies with Kconfig |
Date: |
Thu, 7 Feb 2019 18:56:58 +0100 |
This automatically removes the SCSI subsystem from the
binary altogether if no controllers are selected.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Yang Zhong <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
default-configs/arm-softmmu.mak | 1 -
default-configs/hppa-softmmu.mak | 1 -
default-configs/mips-softmmu-common.mak | 1 -
default-configs/sparc-softmmu.mak | 1 -
default-configs/virtio.mak | 1 -
hw/scsi/Kconfig | 10 +++++++++-
hw/scsi/Makefile.objs | 2 +-
hw/usb/Kconfig | 2 ++
8 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 901f42a..44acb5a 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -163,5 +163,4 @@ CONFIG_HIGHBANK=y
CONFIG_MUSICPAL=y
# for realview and versatilepb
-CONFIG_SCSI=y
CONFIG_LSI_SCSI_PCI=y
diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmmu.mak
index 5089a94..b7f2b43 100644
--- a/default-configs/hppa-softmmu.mak
+++ b/default-configs/hppa-softmmu.mak
@@ -7,7 +7,6 @@ CONFIG_I8259=y
CONFIG_E1000_PCI=y
CONFIG_IDE_CMD646=y
# CONFIG_IDE_MMIO=y
-CONFIG_SCSI=y
CONFIG_LSI_SCSI_PCI=y
CONFIG_VIRTIO_VGA=y
CONFIG_MC146818RTC=y
diff --git a/default-configs/mips-softmmu-common.mak
b/default-configs/mips-softmmu-common.mak
index 90a2412..a7a8d4e 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -4,7 +4,6 @@ CONFIG_ISA_BUS=y
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
CONFIG_ESP=y
-CONFIG_SCSI=y
CONFIG_VGA_ISA=y
CONFIG_VGA_ISA_MM=y
CONFIG_VGA_CIRRUS=y
diff --git a/default-configs/sparc-softmmu.mak
b/default-configs/sparc-softmmu.mak
index 59a4a3d..805c400 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -2,7 +2,6 @@
CONFIG_ISA_BUS=y
CONFIG_ECC=y
-CONFIG_SCSI=y
CONFIG_ESP=y
CONFIG_ESCC=y
CONFIG_M48T59=y
diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak
index 51599ed..82d0726 100644
--- a/default-configs/virtio.mak
+++ b/default-configs/virtio.mak
@@ -7,6 +7,5 @@ CONFIG_VIRTIO_GPU=y
CONFIG_VIRTIO_INPUT=y
CONFIG_VIRTIO_NET=y
CONFIG_VIRTIO_RNG=y
-CONFIG_SCSI=y
CONFIG_VIRTIO_SCSI=y
CONFIG_VIRTIO_SERIAL=y
diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig
index a7d25d3..b9cf269 100644
--- a/hw/scsi/Kconfig
+++ b/hw/scsi/Kconfig
@@ -5,24 +5,29 @@ config LSI_SCSI_PCI
bool
default y if PCI_DEVICES
depends on PCI
+ select SCSI
config MPTSAS_SCSI_PCI
bool
default y if PCI_DEVICES
depends on PCI
+ select SCSI
config MEGASAS_SCSI_PCI
bool
default y if PCI_DEVICES
depends on PCI
+ select SCSI
config VMW_PVSCSI_SCSI_PCI
bool
default y if PCI_DEVICES
depends on PCI
+ select SCSI
config ESP
bool
+ select SCSI
config ESP_PCI
bool
@@ -34,11 +39,14 @@ config SPAPR_VSCSI
bool
default y
depends on PSERIES
+ select SCSI
config VIRTIO_SCSI
bool
+ select SCSI
config VHOST_USER_SCSI
bool
- default y
+ # Only PCI devices are provided for now
+ default y if VIRTIO_PCI
depends on VHOST_USER && LINUX
diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs
index 45167ba..54b36ed 100644
--- a/hw/scsi/Makefile.objs
+++ b/hw/scsi/Makefile.objs
@@ -6,7 +6,7 @@ common-obj-$(CONFIG_MEGASAS_SCSI_PCI) += megasas.o
common-obj-$(CONFIG_VMW_PVSCSI_SCSI_PCI) += vmw_pvscsi.o
common-obj-$(CONFIG_ESP) += esp.o
common-obj-$(CONFIG_ESP_PCI) += esp-pci.o
-obj-$(CONFIG_PSERIES) += spapr_vscsi.o
+obj-$(CONFIG_SPAPR_VSCSI) += spapr_vscsi.o
ifeq ($(CONFIG_VIRTIO_SCSI),y)
obj-y += virtio-scsi.o virtio-scsi-dataplane.o
diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig
index e20670a..a1b7acb 100644
--- a/hw/usb/Kconfig
+++ b/hw/usb/Kconfig
@@ -52,11 +52,13 @@ config USB_STORAGE_BOT
bool
default y
depends on USB
+ select SCSI
config USB_STORAGE_UAS
bool
default y
depends on USB
+ select SCSI
config USB_AUDIO
bool
--
1.8.3.1
- [Qemu-devel] [PATCH 04/51] hw/display: make edid configurable, (continued)
- [Qemu-devel] [PATCH 04/51] hw/display: make edid configurable, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 10/51] hw/pci/Makefile.objs: make pcie configurable, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 08/51] kconfig: introduce CONFIG_TEST_DEVICES, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 07/51] minikconfig: implement allnoconfig and defconfig modes, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 06/51] build: switch to Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 14/51] block: fix recursion in hw/block/dataplane, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 02/51] minikconfig: add AST, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 15/51] scsi: express dependencies with Kconfig,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 13/51] build: convert usb.mak to Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 16/51] isa: express dependencies with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 01/51] minikconfig: add parser skeleton, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 17/51] i386: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
Re: [Qemu-devel] [PATCH 17/51] i386: express dependencies with Kconfig, Thomas Huth, 2019/02/26