Re: [PATCH] hw/isa: Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c

[Paolo Bonzini <pbonzini@redhat.com>]

On 30/09/19 17:04, Thomas Huth wrote:
> Currently, isa-superio.c is always compiled as soon as CONFIG_ISA_BUS
> is enabled. But there are also machines that have an ISA BUS without
> any of the superio chips attached to it, so we should not compile
> isa-superio.c in case we only compile a QEMU for such a machine.
> Thus add a proper CONFIG_ISA_SUPERIO switch so that this file only gets
> compiled when we really, really need it.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  hw/isa/Kconfig       | 10 +++++++---
>  hw/isa/Makefile.objs |  2 +-
>  hw/mips/Kconfig      |  1 +
>  3 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
> index 6db0d7970c..98a289957e 100644
> --- a/hw/isa/Kconfig
> +++ b/hw/isa/Kconfig
> @@ -13,9 +13,13 @@ config I82378
>      select MC146818RTC
>      select PCSPK
>  
> -config PC87312
> +config ISA_SUPERIO
>      bool
>      select ISA_BUS
> +
> +config PC87312
> +    bool
> +    select ISA_SUPERIO
>      select I8259
>      select I8254
>      select I8257
> @@ -34,14 +38,14 @@ config PIIX4
>  
>  config VT82C686
>      bool
> -    select ISA_BUS
> +    select ISA_SUPERIO
>      select ACPI_SMBUS
>      select SERIAL_ISA
>      select FDC
>  
>  config SMC37C669
>      bool
> -    select ISA_BUS
> +    select ISA_SUPERIO
>      select SERIAL_ISA
>      select PARALLEL
>      select FDC
> diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs
> index 9e106df186..ff97485504 100644
> --- a/hw/isa/Makefile.objs
> +++ b/hw/isa/Makefile.objs
> @@ -1,5 +1,5 @@
>  common-obj-$(CONFIG_ISA_BUS) += isa-bus.o
> -common-obj-$(CONFIG_ISA_BUS) += isa-superio.o
> +common-obj-$(CONFIG_ISA_SUPERIO) += isa-superio.o
>  common-obj-$(CONFIG_APM) += apm.o
>  common-obj-$(CONFIG_I82378) += i82378.o
>  common-obj-$(CONFIG_PC87312) += pc87312.o
> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
> index 62aa01b29e..2c2adbc42a 100644
> --- a/hw/mips/Kconfig
> +++ b/hw/mips/Kconfig
> @@ -13,6 +13,7 @@ config R4K
>  
>  config MALTA
>      bool
> +    select ISA_SUPERIO
>  
>  config MIPSSIM
>      bool
> 

Queued, thanks.

Paolo