From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fO0g7-00057A-PW for qemu-devel@nongnu.org; Wed, 30 May 2018 08:58:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fO0g5-00079D-53 for qemu-devel@nongnu.org; Wed, 30 May 2018 08:58:11 -0400 Date: Wed, 30 May 2018 14:58:05 +0200 From: Igor Mammedov Message-ID: <20180530145805.61c3ef26@redhat.com> In-Reply-To: <20180517081527.14410-3-david@redhat.com> References: <20180517081527.14410-1-david@redhat.com> <20180517081527.14410-3-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 02/14] memory-device: introduce separate config option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Hildenbrand Cc: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, "Michael S . Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost , David Gibson , Markus Armbruster , qemu-ppc@nongnu.org, Pankaj Gupta , Alexander Graf , Cornelia Huck , Christian Borntraeger , Luiz Capitulino On Thu, 17 May 2018 10:15:15 +0200 David Hildenbrand wrote: > Some architectures might support memory devices, while they don't > support DIMM/NVDIMM. So let's > - Rename CONFIG_MEM_HOTPLUG to CONFIG_MEM_DEVICE > - Introduce CONFIG_DIMM and use it similarly to CONFIG NVDIMM > > CONFIG_DIMM and CONFIG_NVDIMM require CONFIG_MEM_DEVICE. > > Signed-off-by: David Hildenbrand Reviewed-by: Igor Mammedov > --- > default-configs/i386-softmmu.mak | 3 ++- > default-configs/ppc64-softmmu.mak | 3 ++- > default-configs/x86_64-softmmu.mak | 3 ++- > hw/Makefile.objs | 2 +- > hw/mem/Makefile.objs | 4 ++-- > qapi/misc.json | 2 +- > 6 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak > index 8c7d4a0fa0..4c1637338b 100644 > --- a/default-configs/i386-softmmu.mak > +++ b/default-configs/i386-softmmu.mak > @@ -50,7 +50,8 @@ CONFIG_PCI_Q35=y > CONFIG_APIC=y > CONFIG_IOAPIC=y > CONFIG_PVPANIC=y > -CONFIG_MEM_HOTPLUG=y > +CONFIG_MEM_DEVICE=y > +CONFIG_DIMM=y > CONFIG_NVDIMM=y > CONFIG_ACPI_NVDIMM=y > CONFIG_PCIE_PORT=y > diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak > index b94af6c7c6..f550573782 100644 > --- a/default-configs/ppc64-softmmu.mak > +++ b/default-configs/ppc64-softmmu.mak > @@ -16,4 +16,5 @@ CONFIG_VIRTIO_VGA=y > CONFIG_XICS=$(CONFIG_PSERIES) > CONFIG_XICS_SPAPR=$(CONFIG_PSERIES) > CONFIG_XICS_KVM=$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM)) > -CONFIG_MEM_HOTPLUG=y > +CONFIG_MEM_DEVICE=y > +CONFIG_DIMM=y > diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak > index 0390b4303c..7785351414 100644 > --- a/default-configs/x86_64-softmmu.mak > +++ b/default-configs/x86_64-softmmu.mak > @@ -50,7 +50,8 @@ CONFIG_PCI_Q35=y > CONFIG_APIC=y > CONFIG_IOAPIC=y > CONFIG_PVPANIC=y > -CONFIG_MEM_HOTPLUG=y > +CONFIG_MEM_DEVICE=y > +CONFIG_DIMM=y > CONFIG_NVDIMM=y > CONFIG_ACPI_NVDIMM=y > CONFIG_PCIE_PORT=y > diff --git a/hw/Makefile.objs b/hw/Makefile.objs > index 6a0ffe0afd..127a60eca4 100644 > --- a/hw/Makefile.objs > +++ b/hw/Makefile.objs > @@ -33,7 +33,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += vfio/ > devices-dirs-$(CONFIG_SOFTMMU) += virtio/ > devices-dirs-$(CONFIG_SOFTMMU) += watchdog/ > devices-dirs-$(CONFIG_SOFTMMU) += xen/ > -devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/ > +devices-dirs-$(CONFIG_MEM_DEVICE) += mem/ > devices-dirs-$(CONFIG_SOFTMMU) += smbios/ > devices-dirs-y += core/ > common-obj-y += $(devices-dirs-y) > diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs > index 10be4df2a2..3e2f7c5ca2 100644 > --- a/hw/mem/Makefile.objs > +++ b/hw/mem/Makefile.objs > @@ -1,3 +1,3 @@ > -common-obj-$(CONFIG_MEM_HOTPLUG) += pc-dimm.o > -common-obj-$(CONFIG_MEM_HOTPLUG) += memory-device.o > +common-obj-$(CONFIG_DIMM) += pc-dimm.o > +common-obj-$(CONFIG_MEM_DEVICE) += memory-device.o > common-obj-$(CONFIG_NVDIMM) += nvdimm.o > diff --git a/qapi/misc.json b/qapi/misc.json > index f5988cc0b5..4e6265cd2e 100644 > --- a/qapi/misc.json > +++ b/qapi/misc.json > @@ -2060,7 +2060,7 @@ > # > # @plugged-memory: size of memory that can be hot-unplugged. This field > # is omitted if target doesn't support memory hotplug > -# (i.e. CONFIG_MEM_HOTPLUG not defined on build time). > +# (i.e. CONFIG_MEM_DEVICE not defined at build time). > # > # Since: 2.11.0 > ##