hw/isa: Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c
PATCH 1/1 hw/isa: Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c
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.
--- hw/isa/Kconfig | 10 +++++++--- hw/isa/Makefile.objs | 2 +- hw/mips/Kconfig | 1 + 3 files changed, 9 insertions(+), 4 deletions(-)
hw/isa/Kconfig +7 -3
@@ -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
hw/isa/Makefile.objs +1 -1
@@ -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
hw/mips/Kconfig +1 -0
@@ -13,6 +13,7 @@ config R4K config MALTA bool + select ISA_SUPERIO config MIPSSIM bool
Signature · 1 line
2.18.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#! /bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-mingw@fedora J=14 NETWORK=1
=== TEST SCRIPT END ===
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Quoted 8 lines · Thomas Huth
Currently,
isa-superio.cis always compiled as soon asCONFIG_ISA_BUSis enabled. But there are also machines that have an ISA BUS without any of the superio chips attached to it, so we should not compileisa-superio.cin case we only compile a QEMU for such a machine. Thus add a properCONFIG_ISA_SUPERIOswitch so that this file only gets compiled when we really, really need it.Signed-off-by Thomas Huth <[email protected]>
Quoted 66 lines
--- hw/isa/Kconfig | 10 +++++++--- hw/isa/Makefile.objs | 2 +- hw/mips/Kconfig | 1 + 3 files changed, 9 insertions(+), 4 deletions(-)hw/isa/Kconfig +7
-3@@ -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 FDChw/isa/Makefile.objs +1
-1@@ -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.ohw/mips/Kconfig +1
-0@@ -13,6 +13,7 @@ config R4K config MALTA bool + select ISA_SUPERIO config MIPSSIM bool
Paolo Bonzini
AppliedQuoted 67 lines · Thomas Huth
Currently,
isa-superio.cis always compiled as soon asCONFIG_ISA_BUSis enabled. But there are also machines that have an ISA BUS without any of the superio chips attached to it, so we should not compileisa-superio.cin case we only compile a QEMU for such a machine. Thus add a properCONFIG_ISA_SUPERIOswitch so that this file only gets compiled when we really, really need it.Signed-off-by Thomas Huth <[email protected]>--- hw/isa/Kconfig | 10 +++++++--- hw/isa/Makefile.objs | 2 +- hw/mips/Kconfig | 1 + 3 files changed, 9 insertions(+), 4 deletions(-)hw/isa/Kconfig +7
-3@@ -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 FDChw/isa/Makefile.objs +1
-1@@ -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.ohw/mips/Kconfig +0
-0
hw/mips/Kconfig config R4K · line 19
Quoted 7 lines
hw/mips/Kconfig +1
-0@@ -13,6 +13,7 @@ config R4K config MALTA bool + select ISA_SUPERIO config MIPSSIM bool
Queued, thanks.
Paolo