diff options
| author | Cole Robinson <crobinso@redhat.com> | 2019-09-09 13:34:10 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-09-16 12:32:21 +0200 |
| commit | 709ebb905491258676776c78ca38a61563e59aac (patch) | |
| tree | 9508da3866c1f0f2801f1b0f8c7aeadf06b4fd98 | |
| parent | 0c9956f8213ad1074474f2f938574043e4ee5dfd (diff) | |
| download | qemu-709ebb905491258676776c78ca38a61563e59aac.zip qemu-709ebb905491258676776c78ca38a61563e59aac.tar.gz qemu-709ebb905491258676776c78ca38a61563e59aac.tar.bz2 | |
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 <crobinso@redhat.com>
Message-Id: <e73e6edff68fd30d69c6a1d02c9ef9192f773c63.1568049871.git.crobinso@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | default-configs/i386-softmmu.mak | 1 | ||||
| -rw-r--r-- | hw/i386/Kconfig | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index cd5ea39..ba3fb3f 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 6350438..c7a9d63 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 |