* [Qemu-devel] [PATCH] hw: allow compiling out SCSI
@ 2018-05-22 19:49 Paolo Bonzini
2018-05-22 20:37 ` Philippe Mathieu-Daudé
2018-06-01 11:38 ` Stefan Hajnoczi
0 siblings, 2 replies; 4+ messages in thread
From: Paolo Bonzini @ 2018-05-22 19:49 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
default-configs/mips-softmmu-common.mak | 1 +
default-configs/pci.mak | 1 +
default-configs/riscv32-softmmu.mak | 1 +
default-configs/riscv64-softmmu.mak | 1 +
default-configs/s390x-softmmu.mak | 1 +
default-configs/sparc-softmmu.mak | 1 +
default-configs/usb.mak | 1 +
hw/Makefile.objs | 2 +-
8 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index e31f046b3b..fae2347ee7 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -4,6 +4,7 @@ include pci.mak
include sound.mak
include usb.mak
CONFIG_ESP=y
+CONFIG_SCSI=y
CONFIG_VGA_ISA=y
CONFIG_VGA_ISA_MM=y
CONFIG_VGA_CIRRUS=y
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index 35e7596949..163dd814c7 100644
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -15,6 +15,7 @@ CONFIG_PCNET_COMMON=y
CONFIG_AC97=y
CONFIG_HDA=y
CONFIG_ES1370=y
+CONFIG_SCSI=y
CONFIG_LSI_SCSI_PCI=y
CONFIG_VMW_PVSCSI_SCSI_PCI=y
CONFIG_MEGASAS_SCSI_PCI=y
diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak
index f9e742120c..9159a4a8af 100644
--- a/default-configs/riscv32-softmmu.mak
+++ b/default-configs/riscv32-softmmu.mak
@@ -2,3 +2,4 @@
CONFIG_SERIAL=y
CONFIG_VIRTIO=y
+CONFIG_SCSI=y
diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak
index f9e742120c..9159a4a8af 100644
--- a/default-configs/riscv64-softmmu.mak
+++ b/default-configs/riscv64-softmmu.mak
@@ -2,3 +2,4 @@
CONFIG_SERIAL=y
CONFIG_VIRTIO=y
+CONFIG_SCSI=y
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
index 2f4bfe73b4..729033b25a 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -2,6 +2,7 @@ CONFIG_PCI=y
CONFIG_VIRTIO_PCI=$(CONFIG_PCI)
CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
+CONFIG_SCSI=y
CONFIG_VIRTIO=y
CONFIG_SCLPCONSOLE=y
CONFIG_TERMINAL3270=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 004b0f4e77..12f97eeb20 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -2,6 +2,7 @@
CONFIG_ISA_BUS=y
CONFIG_ECC=y
+CONFIG_SCSI=y
CONFIG_ESP=y
CONFIG_ESCC=y
CONFIG_M48T59=y
diff --git a/default-configs/usb.mak b/default-configs/usb.mak
index f4b85684f0..e42cfeabbe 100644
--- a/default-configs/usb.mak
+++ b/default-configs/usb.mak
@@ -3,6 +3,7 @@ CONFIG_USB_TABLET_WACOM=y
CONFIG_USB_STORAGE_BOT=y
CONFIG_USB_STORAGE_UAS=y
CONFIG_USB_STORAGE_MTP=y
+CONFIG_SCSI=y
CONFIG_USB_SMARTCARD=y
CONFIG_USB_AUDIO=y
CONFIG_USB_SERIAL=y
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 6a0ffe0afd..a19c1417ed 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -23,7 +23,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += nvram/
devices-dirs-$(CONFIG_SOFTMMU) += pci/
devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
devices-dirs-$(CONFIG_SOFTMMU) += pcmcia/
-devices-dirs-$(CONFIG_SOFTMMU) += scsi/
+devices-dirs-$(CONFIG_SCSI) += scsi/
devices-dirs-$(CONFIG_SOFTMMU) += sd/
devices-dirs-$(CONFIG_SOFTMMU) += ssi/
devices-dirs-$(CONFIG_SOFTMMU) += timer/
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] hw: allow compiling out SCSI
2018-05-22 19:49 [Qemu-devel] [PATCH] hw: allow compiling out SCSI Paolo Bonzini
@ 2018-05-22 20:37 ` Philippe Mathieu-Daudé
2018-05-22 22:05 ` Paolo Bonzini
2018-06-01 11:38 ` Stefan Hajnoczi
1 sibling, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2018-05-22 20:37 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
Hi Paolo,
On 05/22/2018 04:49 PM, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> default-configs/mips-softmmu-common.mak | 1 +
> default-configs/pci.mak | 1 +
> default-configs/riscv32-softmmu.mak | 1 +
> default-configs/riscv64-softmmu.mak | 1 +
> default-configs/s390x-softmmu.mak | 1 +
> default-configs/sparc-softmmu.mak | 1 +
> default-configs/usb.mak | 1 +
> hw/Makefile.objs | 2 +-
> 8 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
> index e31f046b3b..fae2347ee7 100644
> --- a/default-configs/mips-softmmu-common.mak
> +++ b/default-configs/mips-softmmu-common.mak
> @@ -4,6 +4,7 @@ include pci.mak
> include sound.mak
> include usb.mak
> CONFIG_ESP=y
> +CONFIG_SCSI=y
> CONFIG_VGA_ISA=y
> CONFIG_VGA_ISA_MM=y
> CONFIG_VGA_CIRRUS=y
> diff --git a/default-configs/pci.mak b/default-configs/pci.mak
> index 35e7596949..163dd814c7 100644
> --- a/default-configs/pci.mak
> +++ b/default-configs/pci.mak
> @@ -15,6 +15,7 @@ CONFIG_PCNET_COMMON=y
> CONFIG_AC97=y
> CONFIG_HDA=y
> CONFIG_ES1370=y
> +CONFIG_SCSI=y
> CONFIG_LSI_SCSI_PCI=y
> CONFIG_VMW_PVSCSI_SCSI_PCI=y
> CONFIG_MEGASAS_SCSI_PCI=y
> diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak
> index f9e742120c..9159a4a8af 100644
> --- a/default-configs/riscv32-softmmu.mak
> +++ b/default-configs/riscv32-softmmu.mak
> @@ -2,3 +2,4 @@
>
> CONFIG_SERIAL=y
> CONFIG_VIRTIO=y
> +CONFIG_SCSI=y
> diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak
> index f9e742120c..9159a4a8af 100644
> --- a/default-configs/riscv64-softmmu.mak
> +++ b/default-configs/riscv64-softmmu.mak
> @@ -2,3 +2,4 @@
>
> CONFIG_SERIAL=y
> CONFIG_VIRTIO=y
> +CONFIG_SCSI=y
> diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
> index 2f4bfe73b4..729033b25a 100644
> --- a/default-configs/s390x-softmmu.mak
> +++ b/default-configs/s390x-softmmu.mak
> @@ -2,6 +2,7 @@ CONFIG_PCI=y
> CONFIG_VIRTIO_PCI=$(CONFIG_PCI)
> CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
> CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
> +CONFIG_SCSI=y
> CONFIG_VIRTIO=y
> CONFIG_SCLPCONSOLE=y
> CONFIG_TERMINAL3270=y
> diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
> index 004b0f4e77..12f97eeb20 100644
> --- a/default-configs/sparc-softmmu.mak
> +++ b/default-configs/sparc-softmmu.mak
> @@ -2,6 +2,7 @@
>
> CONFIG_ISA_BUS=y
> CONFIG_ECC=y
> +CONFIG_SCSI=y
> CONFIG_ESP=y
> CONFIG_ESCC=y
> CONFIG_M48T59=y
> diff --git a/default-configs/usb.mak b/default-configs/usb.mak
> index f4b85684f0..e42cfeabbe 100644
> --- a/default-configs/usb.mak
> +++ b/default-configs/usb.mak
> @@ -3,6 +3,7 @@ CONFIG_USB_TABLET_WACOM=y
> CONFIG_USB_STORAGE_BOT=y
> CONFIG_USB_STORAGE_UAS=y
> CONFIG_USB_STORAGE_MTP=y
> +CONFIG_SCSI=y
What about:
ifeq ($(CONFIG_SCSI),y)
CONFIG_USB_STORAGE_BOT=y
CONFIG_USB_STORAGE_UAS=y
CONFIG_USB_STORAGE_MTP=y
endif
> CONFIG_USB_SMARTCARD=y
> CONFIG_USB_AUDIO=y
> CONFIG_USB_SERIAL=y
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index 6a0ffe0afd..a19c1417ed 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -23,7 +23,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += nvram/
> devices-dirs-$(CONFIG_SOFTMMU) += pci/
> devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
> devices-dirs-$(CONFIG_SOFTMMU) += pcmcia/
> -devices-dirs-$(CONFIG_SOFTMMU) += scsi/
> +devices-dirs-$(CONFIG_SCSI) += scsi/
> devices-dirs-$(CONFIG_SOFTMMU) += sd/
> devices-dirs-$(CONFIG_SOFTMMU) += ssi/
> devices-dirs-$(CONFIG_SOFTMMU) += timer/
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] hw: allow compiling out SCSI
2018-05-22 20:37 ` Philippe Mathieu-Daudé
@ 2018-05-22 22:05 ` Paolo Bonzini
0 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2018-05-22 22:05 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
On 22/05/2018 22:37, Philippe Mathieu-Daudé wrote:
> Hi Paolo,
>
> On 05/22/2018 04:49 PM, Paolo Bonzini wrote:
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>> default-configs/mips-softmmu-common.mak | 1 +
>> default-configs/pci.mak | 1 +
>> default-configs/riscv32-softmmu.mak | 1 +
>> default-configs/riscv64-softmmu.mak | 1 +
>> default-configs/s390x-softmmu.mak | 1 +
>> default-configs/sparc-softmmu.mak | 1 +
>> default-configs/usb.mak | 1 +
>> hw/Makefile.objs | 2 +-
>> 8 files changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
>> index e31f046b3b..fae2347ee7 100644
>> --- a/default-configs/mips-softmmu-common.mak
>> +++ b/default-configs/mips-softmmu-common.mak
>> @@ -4,6 +4,7 @@ include pci.mak
>> include sound.mak
>> include usb.mak
>> CONFIG_ESP=y
>> +CONFIG_SCSI=y
>> CONFIG_VGA_ISA=y
>> CONFIG_VGA_ISA_MM=y
>> CONFIG_VGA_CIRRUS=y
>> diff --git a/default-configs/pci.mak b/default-configs/pci.mak
>> index 35e7596949..163dd814c7 100644
>> --- a/default-configs/pci.mak
>> +++ b/default-configs/pci.mak
>> @@ -15,6 +15,7 @@ CONFIG_PCNET_COMMON=y
>> CONFIG_AC97=y
>> CONFIG_HDA=y
>> CONFIG_ES1370=y
>> +CONFIG_SCSI=y
>> CONFIG_LSI_SCSI_PCI=y
>> CONFIG_VMW_PVSCSI_SCSI_PCI=y
>> CONFIG_MEGASAS_SCSI_PCI=y
>> diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak
>> index f9e742120c..9159a4a8af 100644
>> --- a/default-configs/riscv32-softmmu.mak
>> +++ b/default-configs/riscv32-softmmu.mak
>> @@ -2,3 +2,4 @@
>>
>> CONFIG_SERIAL=y
>> CONFIG_VIRTIO=y
>> +CONFIG_SCSI=y
>> diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak
>> index f9e742120c..9159a4a8af 100644
>> --- a/default-configs/riscv64-softmmu.mak
>> +++ b/default-configs/riscv64-softmmu.mak
>> @@ -2,3 +2,4 @@
>>
>> CONFIG_SERIAL=y
>> CONFIG_VIRTIO=y
>> +CONFIG_SCSI=y
>> diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
>> index 2f4bfe73b4..729033b25a 100644
>> --- a/default-configs/s390x-softmmu.mak
>> +++ b/default-configs/s390x-softmmu.mak
>> @@ -2,6 +2,7 @@ CONFIG_PCI=y
>> CONFIG_VIRTIO_PCI=$(CONFIG_PCI)
>> CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
>> CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
>> +CONFIG_SCSI=y
>> CONFIG_VIRTIO=y
>> CONFIG_SCLPCONSOLE=y
>> CONFIG_TERMINAL3270=y
>> diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
>> index 004b0f4e77..12f97eeb20 100644
>> --- a/default-configs/sparc-softmmu.mak
>> +++ b/default-configs/sparc-softmmu.mak
>> @@ -2,6 +2,7 @@
>>
>> CONFIG_ISA_BUS=y
>> CONFIG_ECC=y
>> +CONFIG_SCSI=y
>> CONFIG_ESP=y
>> CONFIG_ESCC=y
>> CONFIG_M48T59=y
>> diff --git a/default-configs/usb.mak b/default-configs/usb.mak
>> index f4b85684f0..e42cfeabbe 100644
>> --- a/default-configs/usb.mak
>> +++ b/default-configs/usb.mak
>> @@ -3,6 +3,7 @@ CONFIG_USB_TABLET_WACOM=y
>> CONFIG_USB_STORAGE_BOT=y
>> CONFIG_USB_STORAGE_UAS=y
>> CONFIG_USB_STORAGE_MTP=y
>> +CONFIG_SCSI=y
>
> What about:
>
> ifeq ($(CONFIG_SCSI),y)
> CONFIG_USB_STORAGE_BOT=y
> CONFIG_USB_STORAGE_UAS=y
> CONFIG_USB_STORAGE_MTP=y
> endif
The question is where the dependency goes: is it USB storage (BOT and
UAS; MTP is different) that should bring in SCSI support, or the other
way round? Or, in Kconfig terms, whether it is a "depends on SCSI" or a
"select SCSI"...
Paolo
>> CONFIG_USB_SMARTCARD=y
>> CONFIG_USB_AUDIO=y
>> CONFIG_USB_SERIAL=y
>> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
>> index 6a0ffe0afd..a19c1417ed 100644
>> --- a/hw/Makefile.objs
>> +++ b/hw/Makefile.objs
>> @@ -23,7 +23,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += nvram/
>> devices-dirs-$(CONFIG_SOFTMMU) += pci/
>> devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
>> devices-dirs-$(CONFIG_SOFTMMU) += pcmcia/
>> -devices-dirs-$(CONFIG_SOFTMMU) += scsi/
>> +devices-dirs-$(CONFIG_SCSI) += scsi/
>> devices-dirs-$(CONFIG_SOFTMMU) += sd/
>> devices-dirs-$(CONFIG_SOFTMMU) += ssi/
>> devices-dirs-$(CONFIG_SOFTMMU) += timer/
>>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] hw: allow compiling out SCSI
2018-05-22 19:49 [Qemu-devel] [PATCH] hw: allow compiling out SCSI Paolo Bonzini
2018-05-22 20:37 ` Philippe Mathieu-Daudé
@ 2018-06-01 11:38 ` Stefan Hajnoczi
1 sibling, 0 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2018-06-01 11:38 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 618 bytes --]
On Tue, May 22, 2018 at 09:49:43PM +0200, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> default-configs/mips-softmmu-common.mak | 1 +
> default-configs/pci.mak | 1 +
> default-configs/riscv32-softmmu.mak | 1 +
> default-configs/riscv64-softmmu.mak | 1 +
> default-configs/s390x-softmmu.mak | 1 +
> default-configs/sparc-softmmu.mak | 1 +
> default-configs/usb.mak | 1 +
> hw/Makefile.objs | 2 +-
> 8 files changed, 8 insertions(+), 1 deletion(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-06-01 11:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-22 19:49 [Qemu-devel] [PATCH] hw: allow compiling out SCSI Paolo Bonzini
2018-05-22 20:37 ` Philippe Mathieu-Daudé
2018-05-22 22:05 ` Paolo Bonzini
2018-06-01 11:38 ` Stefan Hajnoczi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).