On 01/24/15 10:21, Shannon Zhao wrote: > Expose the needed device information to the table generation > insfrastructure and register a machine_init_done notify to > call virt_acpi_build(). > > Add CONFIG_ACPI to arm-softmmu.mak, but there is compile error. > Don't include unnecessary file for ARM. Maybe this way is not > right, fix me please. > > Signed-off-by: Shannon Zhao <zhaoshengl...@huawei.com> > --- > default-configs/arm-softmmu.mak | 1 + > default-configs/i386-softmmu.mak | 3 ++ > default-configs/mips-softmmu.mak | 3 ++ > default-configs/mips64-softmmu.mak | 3 ++ > default-configs/mips64el-softmmu.mak | 3 ++ > default-configs/mipsel-softmmu.mak | 3 ++ > default-configs/x86_64-softmmu.mak | 3 ++ > hw/acpi/Makefile.objs | 5 ++- > hw/arm/virt.c | 59 +++++++++++++++++++++++++++++++-- > hw/i2c/Makefile.objs | 2 +- > 10 files changed, 78 insertions(+), 7 deletions(-)
> diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs > index cad0355..4e3f15f 100644 > --- a/hw/acpi/Makefile.objs > +++ b/hw/acpi/Makefile.objs > @@ -1,5 +1,6 @@ > -common-obj-$(CONFIG_ACPI) += core.o piix4.o ich9.o pcihp.o cpu_hotplug.o > -common-obj-$(CONFIG_ACPI) += memory_hotplug.o > +common-obj-$(CONFIG_ACPI_CORE) += core.o piix4.o ich9.o pcihp.o > +common-obj-$(CONFIG_ACPI_HOTPLUG) += cpu_hotplug.o This line has a typo and it breaks the linking of qemu-system-x86_64. You need to say CONFIG_ACPI_CPU_HOTPLUG here, not CONFIG_ACPI_HOTPLUG Thanks Laszlo
