[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 23/45] memory-device: introduce separate config option
From: |
Eduardo Habkost |
Subject: |
[Qemu-ppc] [PULL 23/45] memory-device: introduce separate config option |
Date: |
Thu, 18 Oct 2018 17:04:00 -0300 |
From: David Hildenbrand <address@hidden>
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 <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Acked-by: David Gibson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
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 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/qapi/misc.json b/qapi/misc.json
index 3a68af9ca3..9b964644aa 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 a19c1417ed..58872e27e0 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
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-ppc] [PULL 16/45] hw/mips/malta: Remove unuseful code, (continued)
- [Qemu-ppc] [PULL 16/45] hw/mips/malta: Remove unuseful code, Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 17/45] machine: fix a typo, Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 18/45] memory-device: fix alignment error message, Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 19/45] memory-device: fix error message when hinted address is too small, Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 20/45] memory-device: improve "range conflicts" error message, Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 21/45] pc-dimm: pass PCDIMMDevice to pc_dimm_.*plug, Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 22/45] memory-device: use memory device terminology in error messages, Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 23/45] memory-device: introduce separate config option,
Eduardo Habkost <=
- [Qemu-ppc] [PULL 24/45] memory-device: forward errors in get_region_size()/get_plugged_size(), Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 25/45] memory-device: document MemoryDeviceClass, Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 26/45] memory-device: add and use memory_device_get_region_size(), Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 27/45] memory-device: factor out get_memory_region() from pc-dimm, Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 29/45] memory-device: add device class function set_addr(), Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 28/45] memory-device: drop get_region_size(), Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 31/45] memory-device: complete factoring out plug handling, Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 30/45] memory-device: complete factoring out pre_plug handling, Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 32/45] memory-device: complete factoring out unplug handling, Eduardo Habkost, 2018/10/18
- [Qemu-ppc] [PULL 33/45] memory-device: trace when pre_plugging/plugging/unplugging, Eduardo Habkost, 2018/10/18