Since the default-configs/mips-softmmu-common.mak is not yet ported
to the Kconfig format, we have to select this variable there (used
by the MIPS Malta machine).
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
---
default-configs/mips-softmmu-common.mak | 1 +
hw/acpi/Kconfig | 7 +++++++
hw/acpi/Makefile.objs | 3 ++-
hw/i386/Kconfig | 2 ++
hw/isa/Kconfig | 2 +-
5 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/default-configs/mips-softmmu-common.mak
b/default-configs/mips-softmmu-common.mak
index 0795d522db..61cc3d2c6b 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -20,6 +20,7 @@ CONFIG_ACPI_X86=y
CONFIG_ACPI_MEMORY_HOTPLUG=y
CONFIG_ACPI_NVDIMM=y
CONFIG_ACPI_CPU_HOTPLUG=y
+CONFIG_ACPI_PIIX4=y
CONFIG_APM=y
CONFIG_I8257=y
CONFIG_PIIX4=y
diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
index eca3beed75..627f5e9768 100644
--- a/hw/acpi/Kconfig
+++ b/hw/acpi/Kconfig
@@ -8,6 +8,13 @@ config ACPI_X86
select ACPI_CPU_HOTPLUG
select ACPI_MEMORY_HOTPLUG
+config ACPI_PIIX4
+ bool
+ select ACPI
+ select ACPI_NVDIMM
+ select ACPI_CPU_HOTPLUG
+ select ACPI_MEMORY_HOTPLUG
+
config ACPI_X86_ICH
bool
select ACPI_X86
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 2d46e3789a..2ef78175cb 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -1,5 +1,6 @@
ifeq ($(CONFIG_ACPI),y)
-common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o
+common-obj-$(CONFIG_ACPI_X86) += core.o pcihp.o
+common-obj-$(CONFIG_ACPI_PIIX4) += piix4.o
common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o tco.o
common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o
common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index 78fd70396a..f6b74e2dc0 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -69,6 +69,8 @@ config ISAPC
# FIXME: it is in the same file as i440fx, and does not compile
# if separated
depends on I440FX
+ # QEMU isapc weirdness: it uses PIIX3 with ACPI features from PIIX4
+ select ACPI_PIIX4
config Q35
bool
diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index 1c923dfd07..d3f03ef7d5 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -49,7 +49,7 @@ config PIIX3
config PIIX4
bool
select PIIX3
- #select ACPI_PIIX4
+ select ACPI_PIIX4
#select IDE_PIIX4
select ACPI_SMBUS
select MC146818RTC
--
2.20.1
