hw/i386: Move CONFIG_ACPI_PCI to CONFIG_PC

[Qemu-devel] [PATCH] hw/i386: Move CONFIG_ACPI_PCI to CONFIG_PC

Cole Robinson posted 1 patch 4 years, 7 months ago

Download mbox

Test docker-clang@ubuntu passed

Test FreeBSD passed

Test checkpatch passed

Test docker-quick@centos7 passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/e73e6edff68fd30d69c6a1d02c9ef9192f773c63.1568049871.git.crobinso@redhat.com

Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Richard Henderson <rth@twiddle.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Eduardo Habkost <ehabkost@redhat.com>

default-configs/i386-softmmu.mak | 1 -
hw/i386/Kconfig                  | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] hw/i386: Move CONFIG_ACPI_PCI to CONFIG_PC

Posted by Cole Robinson 4 years, 7 months ago

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>
---
 default-configs/i386-softmmu.mak | 1 -
 hw/i386/Kconfig                  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index cd5ea391e8..ba3fb3ff50 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 6350438036..c7a9d6315c 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
 
-- 
2.21.0

Re: [Qemu-devel] [PATCH] hw/i386: Move CONFIG_ACPI_PCI to CONFIG_PC

Posted by Paolo Bonzini 4 years, 7 months ago

On 09/09/19 19:34, Cole Robinson wrote:
> 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>
> ---
>  default-configs/i386-softmmu.mak | 1 -
>  hw/i386/Kconfig                  | 1 +
>  2 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
> index cd5ea391e8..ba3fb3ff50 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 6350438036..c7a9d6315c 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
>  
> 

Queued, thanks.

Paolo