Patchwork Make SCSI HBA configurable

login
register
mail settings
Submitter Hannes Reinecke
Date Nov. 22, 2010, 10:15 a.m.
Message ID <20101122101536.41288F90AF@ochil.suse.de>
Download mbox | patch
Permalink /patch/72534/
State New
Headers show

Comments

Hannes Reinecke - Nov. 22, 2010, 10:15 a.m.
This patch introduces configuration variables
CONFIG_SCSI_LSI
CONFIG_SCSI_MEGASAS
and renames the existing CONFIG_ESP to CONFIG_SCSI_ESP.
With this the available SCSI HBAs can be configured for each
target configuration instead of compiling it in for everyone.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 Makefile.objs                        |    5 +++--
 default-configs/i386-softmmu.mak     |    2 ++
 default-configs/mips-softmmu.mak     |    2 +-
 default-configs/mips64-softmmu.mak   |    2 +-
 default-configs/mips64el-softmmu.mak |    2 +-
 default-configs/mipsel-softmmu.mak   |    2 +-
 default-configs/ppc-softmmu.mak      |    2 ++
 default-configs/ppc64-softmmu.mak    |    2 ++
 default-configs/ppcemb-softmmu.mak   |    2 ++
 default-configs/sparc-softmmu.mak    |    2 +-
 default-configs/sparc64-softmmu.mak  |    2 ++
 default-configs/x86_64-softmmu.mak   |    2 ++
 12 files changed, 20 insertions(+), 7 deletions(-)
Paolo Bonzini - Nov. 22, 2010, 11:04 a.m.
On 11/22/2010 11:15 AM, Hannes Reinecke wrote:
>
> This patch introduces configuration variables
> CONFIG_SCSI_LSI
> CONFIG_SCSI_MEGASAS
> and renames the existing CONFIG_ESP to CONFIG_SCSI_ESP.
> With this the available SCSI HBAs can be configured for each
> target configuration instead of compiling it in for everyone.
>
> Signed-off-by: Hannes Reinecke<hare@suse.de>
> ---
>   Makefile.objs                        |    5 +++--
>   default-configs/i386-softmmu.mak     |    2 ++
>   default-configs/mips-softmmu.mak     |    2 +-
>   default-configs/mips64-softmmu.mak   |    2 +-
>   default-configs/mips64el-softmmu.mak |    2 +-
>   default-configs/mipsel-softmmu.mak   |    2 +-
>   default-configs/ppc-softmmu.mak      |    2 ++
>   default-configs/ppc64-softmmu.mak    |    2 ++
>   default-configs/ppcemb-softmmu.mak   |    2 ++
>   default-configs/sparc-softmmu.mak    |    2 +-
>   default-configs/sparc64-softmmu.mak  |    2 ++
>   default-configs/x86_64-softmmu.mak   |    2 ++
>   12 files changed, 20 insertions(+), 7 deletions(-)
>
> diff --git a/Makefile.objs b/Makefile.objs
> index 89c8661..3b040cd 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -231,8 +231,9 @@ hw-obj-$(CONFIG_IDE_MACIO) += ide/macio.o
>   hw-obj-$(CONFIG_IDE_VIA) += ide/via.o
>
>   # SCSI layer
> -hw-obj-y += lsi53c895a.o megasas.o
> -hw-obj-$(CONFIG_ESP) += esp.o
> +hw-obj-$(CONFIG_SCSI_LSI) += lsi53c895a.o
> +hw-obj-$(CONFIG_SCSI_MEGASAS) += megasas.o
> +hw-obj-$(CONFIG_SCSI_ESP) += esp.o
>
>   hw-obj-y += dma-helpers.o sysbus.o isa-bus.o
>   hw-obj-y += qdev-addr.o
> diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
> index ed00471..130c157 100644
> --- a/default-configs/i386-softmmu.mak
> +++ b/default-configs/i386-softmmu.mak
> @@ -19,6 +19,8 @@ CONFIG_IDE_QDEV=y
>   CONFIG_IDE_PCI=y
>   CONFIG_IDE_ISA=y
>   CONFIG_IDE_PIIX=y
> +CONFIG_SCSI_LSI=y
> +CONFIG_SCSI_MEGASAS=y
>   CONFIG_NE2000_ISA=y
>   CONFIG_PIIX_PCI=y
>   CONFIG_SOUND=y
> diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
> index 3d0af83..7e840a4 100644
> --- a/default-configs/mips-softmmu.mak
> +++ b/default-configs/mips-softmmu.mak
> @@ -1,7 +1,7 @@
>   # Default configuration for mips-softmmu
>
>   CONFIG_ISA_MMIO=y
> -CONFIG_ESP=y
> +CONFIG_SCSI_ESP=y
>   CONFIG_VGA_PCI=y
>   CONFIG_VGA_ISA=y
>   CONFIG_VGA_ISA_MM=y
> diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
> index 0030de4..3816be3 100644
> --- a/default-configs/mips64-softmmu.mak
> +++ b/default-configs/mips64-softmmu.mak
> @@ -1,7 +1,7 @@
>   # Default configuration for mips64-softmmu
>
>   CONFIG_ISA_MMIO=y
> -CONFIG_ESP=y
> +CONFIG_SCSI_ESP=y
>   CONFIG_VGA_PCI=y
>   CONFIG_VGA_ISA=y
>   CONFIG_VGA_ISA_MM=y
> diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
> index fa2a3ff..21c59e0 100644
> --- a/default-configs/mips64el-softmmu.mak
> +++ b/default-configs/mips64el-softmmu.mak
> @@ -1,7 +1,7 @@
>   # Default configuration for mips64el-softmmu
>
>   CONFIG_ISA_MMIO=y
> -CONFIG_ESP=y
> +CONFIG_SCSI_ESP=y
>   CONFIG_VGA_PCI=y
>   CONFIG_VGA_ISA=y
>   CONFIG_VGA_ISA_MM=y
> diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
> index 238b73a..3cf853a 100644
> --- a/default-configs/mipsel-softmmu.mak
> +++ b/default-configs/mipsel-softmmu.mak
> @@ -1,7 +1,7 @@
>   # Default configuration for mipsel-softmmu
>
>   CONFIG_ISA_MMIO=y
> -CONFIG_ESP=y
> +CONFIG_SCSI_ESP=y
>   CONFIG_VGA_PCI=y
>   CONFIG_VGA_ISA=y
>   CONFIG_VGA_ISA_MM=y
> diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
> index 940f4bf..0cc5914 100644
> --- a/default-configs/ppc-softmmu.mak
> +++ b/default-configs/ppc-softmmu.mak
> @@ -29,6 +29,8 @@ CONFIG_IDE_PCI=y
>   CONFIG_IDE_ISA=y
>   CONFIG_IDE_CMD646=y
>   CONFIG_IDE_MACIO=y
> +CONFIG_SCSI_LSI=y
> +CONFIG_SCSI_MEGASAS=y
>   CONFIG_NE2000_ISA=y
>   CONFIG_SOUND=y
>   CONFIG_VIRTIO_PCI=y
> diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
> index e1bc6b8..ce83254 100644
> --- a/default-configs/ppc64-softmmu.mak
> +++ b/default-configs/ppc64-softmmu.mak
> @@ -29,6 +29,8 @@ CONFIG_IDE_PCI=y
>   CONFIG_IDE_ISA=y
>   CONFIG_IDE_CMD646=y
>   CONFIG_IDE_MACIO=y
> +CONFIG_SCSI_LSI=y
> +CONFIG_SCSI_MEGASAS=y
>   CONFIG_NE2000_ISA=y
>   CONFIG_SOUND=y
>   CONFIG_VIRTIO_PCI=y
> diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
> index 8f1cc09..44111c3 100644
> --- a/default-configs/ppcemb-softmmu.mak
> +++ b/default-configs/ppcemb-softmmu.mak
> @@ -29,6 +29,8 @@ CONFIG_IDE_PCI=y
>   CONFIG_IDE_ISA=y
>   CONFIG_IDE_CMD646=y
>   CONFIG_IDE_MACIO=y
> +CONFIG_SCSI_LSI=y
> +CONFIG_SCSI_MEGASAS=y
>   CONFIG_NE2000_ISA=y
>   CONFIG_SOUND=y
>   CONFIG_VIRTIO_PCI=y
> diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
> index becf880..872929d 100644
> --- a/default-configs/sparc-softmmu.mak
> +++ b/default-configs/sparc-softmmu.mak
> @@ -1,7 +1,7 @@
>   # Default configuration for sparc-softmmu
>
>   CONFIG_ECC=y
> -CONFIG_ESP=y
> +CONFIG_SCSI_ESP=y
>   CONFIG_ESCC=y
>   CONFIG_M48T59=y
>   CONFIG_PTIMER=y
> diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
> index 1cc3f13..b4a3c27 100644
> --- a/default-configs/sparc64-softmmu.mak
> +++ b/default-configs/sparc64-softmmu.mak
> @@ -13,4 +13,6 @@ CONFIG_IDE_QDEV=y
>   CONFIG_IDE_PCI=y
>   CONFIG_IDE_ISA=y
>   CONFIG_IDE_CMD646=y
> +CONFIG_SCSI_LSI=y
> +CONFIG_SCSI_MEGASAS=y
>   CONFIG_VIRTIO_PCI=y
> diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
> index 5183203..f28b66d 100644
> --- a/default-configs/x86_64-softmmu.mak
> +++ b/default-configs/x86_64-softmmu.mak
> @@ -19,6 +19,8 @@ CONFIG_IDE_QDEV=y
>   CONFIG_IDE_PCI=y
>   CONFIG_IDE_ISA=y
>   CONFIG_IDE_PIIX=y
> +CONFIG_SCSI_LSI=y
> +CONFIG_SCSI_MEGASAS=y
>   CONFIG_NE2000_ISA=y
>   CONFIG_PIIX_PCI=y
>   CONFIG_SOUND=y

Acked-By: Paolo Bonzini <pbonzini@redhat.com>

Paolo
Jes Sorensen - Nov. 22, 2010, 3:05 p.m.
On 11/22/10 11:15, Hannes Reinecke wrote:
> 
> This patch introduces configuration variables
> CONFIG_SCSI_LSI
> CONFIG_SCSI_MEGASAS
> and renames the existing CONFIG_ESP to CONFIG_SCSI_ESP.
> With this the available SCSI HBAs can be configured for each
> target configuration instead of compiling it in for everyone.
> 
> Signed-off-by: Hannes Reinecke <hare@suse.de>
> ---
>  Makefile.objs                        |    5 +++--
>  default-configs/i386-softmmu.mak     |    2 ++
>  default-configs/mips-softmmu.mak     |    2 +-
>  default-configs/mips64-softmmu.mak   |    2 +-
>  default-configs/mips64el-softmmu.mak |    2 +-
>  default-configs/mipsel-softmmu.mak   |    2 +-
>  default-configs/ppc-softmmu.mak      |    2 ++
>  default-configs/ppc64-softmmu.mak    |    2 ++
>  default-configs/ppcemb-softmmu.mak   |    2 ++
>  default-configs/sparc-softmmu.mak    |    2 +-
>  default-configs/sparc64-softmmu.mak  |    2 ++
>  default-configs/x86_64-softmmu.mak   |    2 ++
>  12 files changed, 20 insertions(+), 7 deletions(-)

Acked-by: Jes Sorensen <Jes.Sorensen@redhat.com>

With a configure flag to flip modify the list from the default it would
reach perfect status :)

Cheers,
Jes
Alexander Graf - Nov. 22, 2010, 10:01 p.m.
On 22.11.2010, at 16:05, Jes Sorensen wrote:

> On 11/22/10 11:15, Hannes Reinecke wrote:
>> 
>> This patch introduces configuration variables
>> CONFIG_SCSI_LSI
>> CONFIG_SCSI_MEGASAS
>> and renames the existing CONFIG_ESP to CONFIG_SCSI_ESP.
>> With this the available SCSI HBAs can be configured for each
>> target configuration instead of compiling it in for everyone.
>> 
>> Signed-off-by: Hannes Reinecke <hare@suse.de>
>> ---
>> Makefile.objs                        |    5 +++--
>> default-configs/i386-softmmu.mak     |    2 ++
>> default-configs/mips-softmmu.mak     |    2 +-
>> default-configs/mips64-softmmu.mak   |    2 +-
>> default-configs/mips64el-softmmu.mak |    2 +-
>> default-configs/mipsel-softmmu.mak   |    2 +-
>> default-configs/ppc-softmmu.mak      |    2 ++
>> default-configs/ppc64-softmmu.mak    |    2 ++
>> default-configs/ppcemb-softmmu.mak   |    2 ++
>> default-configs/sparc-softmmu.mak    |    2 +-
>> default-configs/sparc64-softmmu.mak  |    2 ++
>> default-configs/x86_64-softmmu.mak   |    2 ++
>> 12 files changed, 20 insertions(+), 7 deletions(-)
> 
> Acked-by: Jes Sorensen <Jes.Sorensen@redhat.com>
> 
> With a configure flag to flip modify the list from the default it would
> reach perfect status :)

We don't have that for any device yet that's represented in the default-configs. I'd actually rather advocate to go with a make menuconfig + Kconfig style format here instead of configure options.


Alex
Paul Brook - Nov. 25, 2010, 10:59 a.m.
> This patch introduces configuration variables
> CONFIG_SCSI_LSI
> CONFIG_SCSI_MEGASAS
> and renames the existing CONFIG_ESP to CONFIG_SCSI_ESP.
> With this the available SCSI HBAs can be configured for each
> target configuration instead of compiling it in for everyone.

No. These are both PCI devices, I see no particularly good reason to make them 
optional. At minimum they should be enabled by default on all configs.

The ESP controller is different because it is't a general purpose device, and 
only makes sense on certain systems.

Paul
Alexander Graf - Nov. 25, 2010, 12:54 p.m.
On 25.11.2010, at 11:59, Paul Brook wrote:

>> This patch introduces configuration variables
>> CONFIG_SCSI_LSI
>> CONFIG_SCSI_MEGASAS
>> and renames the existing CONFIG_ESP to CONFIG_SCSI_ESP.
>> With this the available SCSI HBAs can be configured for each
>> target configuration instead of compiling it in for everyone.
> 
> No. These are both PCI devices, I see no particularly good reason to make them 
> optional. At minimum they should be enabled by default on all configs.
> 
> The ESP controller is different because it is't a general purpose device, and 
> only makes sense on certain systems.

RH needs to compile out as much as they can from the code base, because they state that they support everything that's compiled in. So making as much as possible optional is good. And I don't see why we should limit ourselves here.


Alex
Paul Brook - Nov. 25, 2010, 1:22 p.m.
> On 25.11.2010, at 11:59, Paul Brook wrote:
> >> This patch introduces configuration variables
> >> CONFIG_SCSI_LSI
> >> CONFIG_SCSI_MEGASAS
> >> and renames the existing CONFIG_ESP to CONFIG_SCSI_ESP.
> >> With this the available SCSI HBAs can be configured for each
> >> target configuration instead of compiling it in for everyone.
> > 
> > No. These are both PCI devices, I see no particularly good reason to make
> > them optional. At minimum they should be enabled by default on all
> > configs.
> > 
> > The ESP controller is different because it is't a general purpose device,
> > and only makes sense on certain systems.
> 
> RH needs to compile out as much as they can from the code base, because
> they state that they support everything that's compiled in. So making as
> much as possible optional is good. And I don't see why we should limit
> ourselves here.

My second point (should be enabled by default) still applies.  Your patch 
removes the lsi controller from the default arm-softmmu config, which is 
definitely wrong.

Paul
Alexander Graf - Nov. 25, 2010, 1:24 p.m.
On 25.11.2010, at 14:22, Paul Brook wrote:

>> On 25.11.2010, at 11:59, Paul Brook wrote:
>>>> This patch introduces configuration variables
>>>> CONFIG_SCSI_LSI
>>>> CONFIG_SCSI_MEGASAS
>>>> and renames the existing CONFIG_ESP to CONFIG_SCSI_ESP.
>>>> With this the available SCSI HBAs can be configured for each
>>>> target configuration instead of compiling it in for everyone.
>>> 
>>> No. These are both PCI devices, I see no particularly good reason to make
>>> them optional. At minimum they should be enabled by default on all
>>> configs.
>>> 
>>> The ESP controller is different because it is't a general purpose device,
>>> and only makes sense on certain systems.
>> 
>> RH needs to compile out as much as they can from the code base, because
>> they state that they support everything that's compiled in. So making as
>> much as possible optional is good. And I don't see why we should limit
>> ourselves here.
> 
> My second point (should be enabled by default) still applies.  Your patch 
> removes the lsi controller from the default arm-softmmu config, which is 
> definitely wrong.

My patches don't even touch the LSI controller. I guess you meant Hannes.
But I agree. Enablement-wise nothing should change before and after the patch.


Alex
Jes Sorensen - Nov. 26, 2010, 8:01 a.m.
On 11/25/10 14:22, Paul Brook wrote:
>> On 25.11.2010, at 11:59, Paul Brook wrote:
>> RH needs to compile out as much as they can from the code base, because
>> they state that they support everything that's compiled in. So making as
>> much as possible optional is good. And I don't see why we should limit
>> ourselves here.
> 
> My second point (should be enabled by default) still applies.  Your patch 
> removes the lsi controller from the default arm-softmmu config, which is 
> definitely wrong.

Right I am not advocating changing the defaults, all I suggest is we
make it an option to disable some of the devices. There are people
running on smaller systems or dedicated systems where they know exactly
which 7 devices they need and nothing more. They would be quite happy to
be able to strip down QEMU to the minimum they need.

Cheers,
Jes

Patch

diff --git a/Makefile.objs b/Makefile.objs
index 89c8661..3b040cd 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -231,8 +231,9 @@  hw-obj-$(CONFIG_IDE_MACIO) += ide/macio.o
 hw-obj-$(CONFIG_IDE_VIA) += ide/via.o
 
 # SCSI layer
-hw-obj-y += lsi53c895a.o megasas.o
-hw-obj-$(CONFIG_ESP) += esp.o
+hw-obj-$(CONFIG_SCSI_LSI) += lsi53c895a.o
+hw-obj-$(CONFIG_SCSI_MEGASAS) += megasas.o
+hw-obj-$(CONFIG_SCSI_ESP) += esp.o
 
 hw-obj-y += dma-helpers.o sysbus.o isa-bus.o
 hw-obj-y += qdev-addr.o
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index ed00471..130c157 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -19,6 +19,8 @@  CONFIG_IDE_QDEV=y
 CONFIG_IDE_PCI=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_PIIX=y
+CONFIG_SCSI_LSI=y
+CONFIG_SCSI_MEGASAS=y
 CONFIG_NE2000_ISA=y
 CONFIG_PIIX_PCI=y
 CONFIG_SOUND=y
diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
index 3d0af83..7e840a4 100644
--- a/default-configs/mips-softmmu.mak
+++ b/default-configs/mips-softmmu.mak
@@ -1,7 +1,7 @@ 
 # Default configuration for mips-softmmu
 
 CONFIG_ISA_MMIO=y
-CONFIG_ESP=y
+CONFIG_SCSI_ESP=y
 CONFIG_VGA_PCI=y
 CONFIG_VGA_ISA=y
 CONFIG_VGA_ISA_MM=y
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
index 0030de4..3816be3 100644
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/mips64-softmmu.mak
@@ -1,7 +1,7 @@ 
 # Default configuration for mips64-softmmu
 
 CONFIG_ISA_MMIO=y
-CONFIG_ESP=y
+CONFIG_SCSI_ESP=y
 CONFIG_VGA_PCI=y
 CONFIG_VGA_ISA=y
 CONFIG_VGA_ISA_MM=y
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index fa2a3ff..21c59e0 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -1,7 +1,7 @@ 
 # Default configuration for mips64el-softmmu
 
 CONFIG_ISA_MMIO=y
-CONFIG_ESP=y
+CONFIG_SCSI_ESP=y
 CONFIG_VGA_PCI=y
 CONFIG_VGA_ISA=y
 CONFIG_VGA_ISA_MM=y
diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
index 238b73a..3cf853a 100644
--- a/default-configs/mipsel-softmmu.mak
+++ b/default-configs/mipsel-softmmu.mak
@@ -1,7 +1,7 @@ 
 # Default configuration for mipsel-softmmu
 
 CONFIG_ISA_MMIO=y
-CONFIG_ESP=y
+CONFIG_SCSI_ESP=y
 CONFIG_VGA_PCI=y
 CONFIG_VGA_ISA=y
 CONFIG_VGA_ISA_MM=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 940f4bf..0cc5914 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -29,6 +29,8 @@  CONFIG_IDE_PCI=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_CMD646=y
 CONFIG_IDE_MACIO=y
+CONFIG_SCSI_LSI=y
+CONFIG_SCSI_MEGASAS=y
 CONFIG_NE2000_ISA=y
 CONFIG_SOUND=y
 CONFIG_VIRTIO_PCI=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index e1bc6b8..ce83254 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -29,6 +29,8 @@  CONFIG_IDE_PCI=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_CMD646=y
 CONFIG_IDE_MACIO=y
+CONFIG_SCSI_LSI=y
+CONFIG_SCSI_MEGASAS=y
 CONFIG_NE2000_ISA=y
 CONFIG_SOUND=y
 CONFIG_VIRTIO_PCI=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 8f1cc09..44111c3 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -29,6 +29,8 @@  CONFIG_IDE_PCI=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_CMD646=y
 CONFIG_IDE_MACIO=y
+CONFIG_SCSI_LSI=y
+CONFIG_SCSI_MEGASAS=y
 CONFIG_NE2000_ISA=y
 CONFIG_SOUND=y
 CONFIG_VIRTIO_PCI=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index becf880..872929d 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -1,7 +1,7 @@ 
 # Default configuration for sparc-softmmu
 
 CONFIG_ECC=y
-CONFIG_ESP=y
+CONFIG_SCSI_ESP=y
 CONFIG_ESCC=y
 CONFIG_M48T59=y
 CONFIG_PTIMER=y
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index 1cc3f13..b4a3c27 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -13,4 +13,6 @@  CONFIG_IDE_QDEV=y
 CONFIG_IDE_PCI=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_CMD646=y
+CONFIG_SCSI_LSI=y
+CONFIG_SCSI_MEGASAS=y
 CONFIG_VIRTIO_PCI=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 5183203..f28b66d 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -19,6 +19,8 @@  CONFIG_IDE_QDEV=y
 CONFIG_IDE_PCI=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_PIIX=y
+CONFIG_SCSI_LSI=y
+CONFIG_SCSI_MEGASAS=y
 CONFIG_NE2000_ISA=y
 CONFIG_PIIX_PCI=y
 CONFIG_SOUND=y