On Thu, May 16, 2019 at 08:35:43PM +0200, Philippe Mathieu-Daudé wrote: >On 4/19/19 2:30 AM, Wei Yang wrote: >> Now we have two identical build_mcfg functions. >> >> Consolidate them in acpi/pci.c. >> >> Signed-off-by: Wei Yang <richardw.y...@linux.intel.com> >> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> >> Reviewed-by: Igor Mammedov <imamm...@redhat.com> >> >> --- >> v3: >> * adjust changelog based on Igor's suggestion >> --- >> default-configs/arm-softmmu.mak | 1 + >> default-configs/i386-softmmu.mak | 1 + >> hw/acpi/Kconfig | 4 +++ >> hw/acpi/Makefile.objs | 1 + >> hw/acpi/pci.c | 46 ++++++++++++++++++++++++++++++++ >> hw/arm/virt-acpi-build.c | 17 ------------ >> hw/i386/acpi-build.c | 18 +------------ >> include/hw/acpi/pci.h | 1 + >> 8 files changed, 55 insertions(+), 34 deletions(-) >> create mode 100644 hw/acpi/pci.c >> >> diff --git a/default-configs/arm-softmmu.mak >> b/default-configs/arm-softmmu.mak >> index 613d19a06d..8f2796e195 100644 >> --- a/default-configs/arm-softmmu.mak >> +++ b/default-configs/arm-softmmu.mak >> @@ -144,6 +144,7 @@ CONFIG_XIO3130=y >> CONFIG_IOH3420=y >> CONFIG_I82801B11=y >> CONFIG_ACPI=y >> +CONFIG_ACPI_PCI=y >> CONFIG_ARM_VIRT=y >> CONFIG_SMBIOS=y >> CONFIG_ASPEED_SOC=y >> diff --git a/default-configs/i386-softmmu.mak >> b/default-configs/i386-softmmu.mak >> index ba3fb3ff50..cd5ea391e8 100644 >> --- a/default-configs/i386-softmmu.mak >> +++ b/default-configs/i386-softmmu.mak >> @@ -25,3 +25,4 @@ >> CONFIG_ISAPC=y >> CONFIG_I440FX=y >> CONFIG_Q35=y >> +CONFIG_ACPI_PCI=y >> diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig >> index eca3beed75..7265843cc3 100644 >> --- a/hw/acpi/Kconfig >> +++ b/hw/acpi/Kconfig >> @@ -23,6 +23,10 @@ config ACPI_NVDIMM >> bool >> depends on ACPI >> >> +config ACPI_PCI >> + bool >> + depends on ACPI > >Shouldn't this be "depends on ACPI && PCI"? >
I think you are right. Let me fix this. Thanks -- Wei Yang Help you, Help me
