From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxWqc-0004I3-Fh for qemu-devel@nongnu.org; Wed, 27 May 2015 04:37:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxWqY-0004Fg-CQ for qemu-devel@nongnu.org; Wed, 27 May 2015 04:37:58 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:48064 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxWqY-0004FY-4g for qemu-devel@nongnu.org; Wed, 27 May 2015 04:37:54 -0400 References: <1432522520-8068-1-git-send-email-zhaoshenglong@huawei.com> <1432522520-8068-24-git-send-email-zhaoshenglong@huawei.com> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1432522520-8068-24-git-send-email-zhaoshenglong@huawei.com> Date: Wed, 27 May 2015 09:37:58 +0100 Message-ID: <87vbfepg9l.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v9 23/24] ACPI: split CONFIG_ACPI into 4 pieces List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Shannon Zhao Cc: peter.maydell@linaro.org, hangaohuai@huawei.com, mst@redhat.com, a.spyridakis@virtualopensystems.com, claudio.fontana@huawei.com, qemu-devel@nongnu.org, peter.huangpeng@huawei.com, hanjun.guo@linaro.org, imammedo@redhat.com, pbonzini@redhat.com, lersek@redhat.com, christoffer.dall@linaro.org, shannon.zhao@linaro.org Shannon Zhao writes: > From: Shannon Zhao > > As core.c, piix4.c, ich9.c and pcihp.c are for x86, add CONFIG_ACPI_X86 > to make it only for x86. ARM doesn't support cpu and memory hotplug, add > CONFIG_ACPI_CPU_HOTPLUG and CONFIG_ACPI_MEMORY_HOTPLUG to exclude them > for target-arm. > > Signed-off-by: Shannon Zhao > Signed-off-by: Shannon Zhao The fact a file named "core.c" is x86 only causes me slight cognitive dissonance but whatever ;-) Reviewed-by: Alex Bennée > --- > 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/i2c/Makefile.objs | 2 +- > 9 files changed, 23 insertions(+), 3 deletions(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index a767e4b..74f1db3 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -101,3 +101,4 @@ CONFIG_ALLWINNER_A10=y > CONFIG_XIO3130=y > CONFIG_IOH3420=y > CONFIG_I82801B11=y > +CONFIG_ACPI=y > diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak > index 6a74e00..91d602c 100644 > --- a/default-configs/i386-softmmu.mak > +++ b/default-configs/i386-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_X86=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_IDE_ISA=y > diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak > index cce2c81..fd0607d 100644 > --- a/default-configs/mips-softmmu.mak > +++ b/default-configs/mips-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_X86=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_PIIX4=y > diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak > index 7a88a08..b8c7910 100644 > --- a/default-configs/mips64-softmmu.mak > +++ b/default-configs/mips64-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_X86=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_PIIX4=y > diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak > index 095de43..ae4274b 100644 > --- a/default-configs/mips64el-softmmu.mak > +++ b/default-configs/mips64el-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_X86=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_PIIX4=y > diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak > index 0e25108..1e2374b 100644 > --- a/default-configs/mipsel-softmmu.mak > +++ b/default-configs/mipsel-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_X86=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_PIIX4=y > diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak > index 46b87dd..2f2955b 100644 > --- a/default-configs/x86_64-softmmu.mak > +++ b/default-configs/x86_64-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_X86=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_IDE_ISA=y > diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs > index b9fefa7..29d46d8 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_X86) += core.o piix4.o ich9.o pcihp.o > +common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o > +common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o > common-obj-$(CONFIG_ACPI) += acpi_interface.o > common-obj-$(CONFIG_ACPI) += bios-linker-loader.o > common-obj-$(CONFIG_ACPI) += aml-build.o > diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs > index 648278e..0f13060 100644 > --- a/hw/i2c/Makefile.objs > +++ b/hw/i2c/Makefile.objs > @@ -1,6 +1,6 @@ > common-obj-y += core.o smbus.o smbus_eeprom.o > common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o > -common-obj-$(CONFIG_ACPI) += smbus_ich9.o > +common-obj-$(CONFIG_ACPI_X86) += smbus_ich9.o > common-obj-$(CONFIG_APM) += pm_smbus.o > common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o > common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o -- Alex Bennée