* [PATCH] hw/isa: Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c
@ 2019-09-30 15:04 Thomas Huth
2019-09-30 17:19 ` no-reply
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Thomas Huth @ 2019-09-30 15:04 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel, Michael S . Tsirkin
Cc: qemu-trivial, Aleksandar Rikalo, Hervé Poussineau,
Aleksandar Markovic, Aurelien Jarno, Richard Henderson
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
--
2.18.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] hw/isa: Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c
2019-09-30 15:04 [PATCH] hw/isa: Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c Thomas Huth
@ 2019-09-30 17:19 ` no-reply
2019-10-01 9:10 ` Philippe Mathieu-Daudé
2019-10-01 9:17 ` Paolo Bonzini
2 siblings, 0 replies; 4+ messages in thread
From: no-reply @ 2019-09-30 17:19 UTC (permalink / raw)
To: thuth
Cc: mst, qemu-trivial, qemu-devel, arikalo, hpoussin, amarkovic,
pbonzini, aurelien, rth
Patchew URL: https://patchew.org/QEMU/20190930150436.18162-1-thuth@redhat.com/
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/20190930150436.18162-1-thuth@redhat.com/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] hw/isa: Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c
2019-09-30 15:04 [PATCH] hw/isa: Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c Thomas Huth
2019-09-30 17:19 ` no-reply
@ 2019-10-01 9:10 ` Philippe Mathieu-Daudé
2019-10-01 9:17 ` Paolo Bonzini
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-01 9:10 UTC (permalink / raw)
To: Thomas Huth, Paolo Bonzini, qemu-devel, Michael S . Tsirkin
Cc: qemu-trivial, Aleksandar Rikalo, Hervé Poussineau,
Aleksandar Markovic, Aurelien Jarno, Richard Henderson
On 9/30/19 5:04 PM, 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] hw/isa: Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c
2019-09-30 15:04 [PATCH] hw/isa: Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c Thomas Huth
2019-09-30 17:19 ` no-reply
2019-10-01 9:10 ` Philippe Mathieu-Daudé
@ 2019-10-01 9:17 ` Paolo Bonzini
2 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2019-10-01 9:17 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, Michael S . Tsirkin
Cc: qemu-trivial, Aleksandar Rikalo, Hervé Poussineau,
Aleksandar Markovic, Aurelien Jarno, Richard Henderson
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-01 9:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-30 15:04 [PATCH] hw/isa: Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c Thomas Huth
2019-09-30 17:19 ` no-reply
2019-10-01 9:10 ` Philippe Mathieu-Daudé
2019-10-01 9:17 ` Paolo Bonzini
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).