From: Cole Robinson Date: Mon, 9 Sep 2019 17:34:10 +0000 (-0400) Subject: hw/i386: Move CONFIG_ACPI_PCI to CONFIG_PC X-Git-Tag: v4.2.0-rc0~105^2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=709ebb905491258676776c78ca38a61563e59aac;p=thirdparty%2Fqemu.git hw/i386: Move CONFIG_ACPI_PCI to CONFIG_PC CONFIG_ACPI_PCI is a hard requirement of acpi-build.c, which is built unconditionally for x86 target. Putting it in default-configs/ suggests that it can be easily disabled, which isn't true. Relocate the symbol with the other acpi-build.c requirements, under 'config PC'. This is similar to what is done for the arm 'virt' machine type and CONFIG_ACPI_PCI Signed-off-by: Cole Robinson Message-Id: Signed-off-by: Paolo Bonzini --- diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index cd5ea391e80..ba3fb3ff50a 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -25,4 +25,3 @@ CONFIG_ISAPC=y CONFIG_I440FX=y CONFIG_Q35=y -CONFIG_ACPI_PCI=y diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 6350438036f..c7a9d6315ca 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -29,6 +29,7 @@ config PC select MC146818RTC # For ACPI builder: select SERIAL_ISA + select ACPI_PCI select ACPI_VMGENID select VIRTIO_PMEM_SUPPORTED