Commit 709ebb90 authored by Cole Robinson's avatar Cole Robinson Committed by Paolo Bonzini
Browse files

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: default avatarCole Robinson <crobinso@redhat.com>
Message-Id: <e73e6edff68fd30d69c6a1d02c9ef9192f773c63.1568049871.git.crobinso@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0c9956f8

default-configs/i386-softmmu.mak

+0 −1
Original line number Diff line number Diff line
@@ -25,4 +25,3 @@ 
CONFIG_ISAPC=y

CONFIG_I440FX=y

CONFIG_Q35=y
 
CONFIG_ACPI_PCI=y

hw/i386/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ config PC 
    select MC146818RTC

    # For ACPI builder:

    select SERIAL_ISA

    select ACPI_PCI

    select ACPI_VMGENID

    select VIRTIO_PMEM_SUPPORTED