From: Eduardo Habkost <ehabkost@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Alexander Graf <agraf@suse.de>, Rob Herring <robh@kernel.org>,
libvir-list@redhat.com, Richard Henderson <rth@twiddle.net>,
David Gibson <david@gibson.dropbear.id.au>,
Eric Blake <eblake@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
qemu-arm@nongnu.org,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
Peter Crosthwaite <crosthwaite.peter@gmail.com>,
Markus Armbruster <armbru@redhat.com>,
Artyom Tarasenko <atar4qemu@gmail.com>,
Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
Eduardo Habkost <ehabkost@redhat.com>,
Michael Walle <michael@walle.cc>, Thomas Huth <thuth@redhat.com>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Aleksandar Markovic <amarkovic@wavecomp.com>,
Aurelien Jarno <aurelien@aurel32.net>,
Alistair Francis <alistair@alistair23.me>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Laurent Vivier <lvivier@redhat.com>,
qemu-ppc@nongnu.org,
Xiao Guangrong <xiaoguangrong.eric@gmail.com>,
Max Filippov <jcmvbkbc@gmail.com>,
David Hildenbrand <david@redhat.com>
Subject: [Qemu-devel] [PULL v2 22/43] memory-device: introduce separate config option
Date: Thu, 25 Oct 2018 10:32:40 -0300 [thread overview]
Message-ID: <20181025133301.16578-23-ehabkost@redhat.com> (raw)
In-Reply-To: <20181025133301.16578-1-ehabkost@redhat.com>
From: David Hildenbrand <david@redhat.com>
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.
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20181005092024.14344-7-david@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
default-configs/i386-softmmu.mak | 3 ++-
default-configs/ppc64-softmmu.mak | 3 ++-
qapi/misc.json | 2 +-
hw/Makefile.objs | 2 +-
hw/mem/Makefile.objs | 4 ++--
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 210cff2781..64c998c4c8 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -51,7 +51,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/qapi/misc.json b/qapi/misc.json
index c85c6c8ca3..6c1c5c0a37 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -2066,7 +2066,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
##
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 30722ccf98..39d882af6f 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -34,7 +34,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
--
2.18.0.rc1.1.g3f1ff2140
next prev parent reply other threads:[~2018-10-25 13:36 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-25 13:32 [Qemu-devel] [PULL v2 00/43] Machine queue, 2018-10-25 Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 01/43] hostmem-file: fixed the memory leak while get pmem path Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 02/43] vl.c deprecate incorrect CPUs topology Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 03/43] vl:c: make sure that sockets are calculated correctly in '-smp X' case Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 04/43] trace-events: Fix copy/paste typo Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 05/43] hw/timer/sun4v-rtc: Convert from DPRINTF() macro to trace events Eduardo Habkost
2018-10-25 17:17 ` David Gibson
2018-10-26 8:27 ` Eduardo Habkost
2018-10-26 10:49 ` Philippe Mathieu-Daudé
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 06/43] hw/timer/sun4v-rtc: Use DeviceState::realize rather than SysBusDevice::init Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 07/43] hw/ssi/xilinx_spi: " Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 08/43] hw/sh4/sh_pci: " Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 09/43] hw/pci-host/bonito: " Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 10/43] hw/mips/gt64xxx_pci: Convert gt64120_reset() function into Device reset method Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 11/43] hw/mips/gt64xxx_pci: Mark as bridge device Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 12/43] hw/sparc64/niagara: Model the I/O Bridge with the 'unimplemented_device' Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 13/43] hw/alpha/typhoon: Remove unuseful code Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 14/43] hw/hppa/dino: " Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 15/43] hw/mips/malta: " Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 16/43] machine: fix a typo Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 17/43] memory-device: fix alignment error message Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 18/43] memory-device: fix error message when hinted address is too small Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 19/43] memory-device: improve "range conflicts" error message Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 20/43] pc-dimm: pass PCDIMMDevice to pc_dimm_.*plug Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 21/43] memory-device: use memory device terminology in error messages Eduardo Habkost
2018-10-25 13:32 ` Eduardo Habkost [this message]
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 23/43] memory-device: forward errors in get_region_size()/get_plugged_size() Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 24/43] memory-device: document MemoryDeviceClass Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 25/43] memory-device: add and use memory_device_get_region_size() Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 26/43] memory-device: factor out get_memory_region() from pc-dimm Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 27/43] memory-device: drop get_region_size() Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 28/43] memory-device: add device class function set_addr() Eduardo Habkost
2018-10-25 13:32 ` [Qemu-devel] [PULL v2 29/43] memory-device: complete factoring out pre_plug handling Eduardo Habkost
2018-10-26 19:16 ` [Qemu-devel] [PULL v2 00/43] Machine queue, 2018-10-25 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181025133301.16578-23-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=agraf@suse.de \
--cc=alistair@alistair23.me \
--cc=amarkovic@wavecomp.com \
--cc=armbru@redhat.com \
--cc=atar4qemu@gmail.com \
--cc=aurelien@aurel32.net \
--cc=crosthwaite.peter@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=eblake@redhat.com \
--cc=edgar.iglesias@gmail.com \
--cc=imammedo@redhat.com \
--cc=jasowang@redhat.com \
--cc=jcmvbkbc@gmail.com \
--cc=libvir-list@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=michael@walle.cc \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=robh@kernel.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
--cc=xiaoguangrong.eric@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).