diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 9a204f845c..0189920a84 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -7092,7 +7092,6 @@ qemu-kvm -net nic,model=? /dev/null
guests' memory resource needs.
Some hypervisors may require NUMA configured for the guest.
- Since 1.2.14
@@ -7117,6 +7116,15 @@ qemu-kvm -net nic,model=? /dev/null
<node>1</node>
</target>
</memory>
+ <memory model='nvdimm'>
+ <source>
+ <path>/tmp/nvdimm</path>
+ </source>
+ <target>
+ <size unit='KiB'>524288</size>
+ <node>1</node>
+ </target>
+ </memory>
</devices>
...
@@ -7124,28 +7132,48 @@ qemu-kvm -net nic,model=? /dev/null
model
- Currently only the dimm model is supported in order to
- add a virtual DIMM module to the guest.
+ Provide dimm to add a virtual DIMM module to the guest.
+ Since 1.2.14
+ Provide nvdimm model adds a Non-Volatile DIMM
+ module. Since 3.2.0
source
- The optional source element allows to fine tune the source of the
- memory used for the given memory device. If the element is not
- provided defaults configured via numatune are used.
+ For model dimm this element is optional and allows to
+ fine tune the source of the memory used for the given memory device.
+ If the element is not provided defaults configured via
+ numatune are used. If dimm is provided,
+ then the following optional elements can be provided as well:
-
- pagesize can optionally be used to override the default
- host page size used for backing the memory device.
- The configured value must correspond to a page size supported by the
- host.
-
+
+ pagesize
+
+ This element can be used to override the default
+ host page size used for backing the memory device.
+ The configured value must correspond to a page size
+ supported by the host.
+
+
+
+ nodemask
+
+ This element can be used to override the default
+ set of NUMA nodes where the memory would be
+ allocated.
+
+
+
+
- nodemask can optionally be used to override the default
- set of NUMA nodes where the memory would be allocated.
+ For model nvdimm this element is mandatory and has a
+ single child element path that represents a path
+ in the host that backs the nvdimm module in the guest.
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 5e593285ef..2f6a6db8e8 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4747,6 +4747,7 @@
dimm
+ nvdimm
@@ -4766,18 +4767,27 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 88d419e27d..9713bfc402 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -859,8 +859,11 @@ VIR_ENUM_DECL(virDomainBlockJob)
VIR_ENUM_IMPL(virDomainBlockJob, VIR_DOMAIN_BLOCK_JOB_TYPE_LAST,
"", "", "copy", "", "active-commit")
-VIR_ENUM_IMPL(virDomainMemoryModel, VIR_DOMAIN_MEMORY_MODEL_LAST,
- "", "dimm")
+VIR_ENUM_IMPL(virDomainMemoryModel,
+ VIR_DOMAIN_MEMORY_MODEL_LAST,
+ "",
+ "dimm",
+ "nvdimm")
VIR_ENUM_IMPL(virDomainShmemModel, VIR_DOMAIN_SHMEM_MODEL_LAST,
"ivshmem",
@@ -2419,6 +2422,7 @@ void virDomainMemoryDefFree(virDomainMemoryDefPtr def)
if (!def)
return;
+ VIR_FREE(def->nvdimmPath);
virBitmapFree(def->sourceNodes);
virDomainDeviceInfoClear(&def->info);
VIR_FREE(def);
@@ -13716,20 +13720,36 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node,
xmlNodePtr save = ctxt->node;
ctxt->node = node;
- if (virDomainParseMemory("./pagesize", "./pagesize/@unit", ctxt,
- &def->pagesize, false, false) < 0)
- goto cleanup;
-
- if ((nodemask = virXPathString("string(./nodemask)", ctxt))) {
- if (virBitmapParse(nodemask, &def->sourceNodes,
- VIR_DOMAIN_CPUMASK_LEN) < 0)
+ switch ((virDomainMemoryModel) def->model) {
+ case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+ if (virDomainParseMemory("./pagesize", "./pagesize/@unit", ctxt,
+ &def->pagesize, false, false) < 0)
goto cleanup;
- if (virBitmapIsAllClear(def->sourceNodes)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("Invalid value of 'nodemask': %s"), nodemask);
+ if ((nodemask = virXPathString("string(./nodemask)", ctxt))) {
+ if (virBitmapParse(nodemask, &def->sourceNodes,
+ VIR_DOMAIN_CPUMASK_LEN) < 0)
+ goto cleanup;
+
+ if (virBitmapIsAllClear(def->sourceNodes)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Invalid value of 'nodemask': %s"), nodemask);
+ goto cleanup;
+ }
+ }
+ break;
+
+ case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+ if (!(def->nvdimmPath = virXPathString("string(./path)", ctxt))) {
+ virReportError(VIR_ERR_XML_DETAIL, "%s",
+ _("path is required for model nvdimm'"));
goto cleanup;
}
+ break;
+
+ case VIR_DOMAIN_MEMORY_MODEL_NONE:
+ case VIR_DOMAIN_MEMORY_MODEL_LAST:
+ break;
}
ret = 0;
@@ -15134,12 +15154,25 @@ virDomainMemoryFindByDefInternal(virDomainDefPtr def,
tmp->size != mem->size)
continue;
- /* source stuff -> match with device */
- if (tmp->pagesize != mem->pagesize)
- continue;
+ switch ((virDomainMemoryModel) mem->model) {
+ case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+ /* source stuff -> match with device */
+ if (tmp->pagesize != mem->pagesize)
+ continue;
- if (!virBitmapEqual(tmp->sourceNodes, mem->sourceNodes))
- continue;
+ if (!virBitmapEqual(tmp->sourceNodes, mem->sourceNodes))
+ continue;
+ break;
+
+ case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+ if (STRNEQ(tmp->nvdimmPath, mem->nvdimmPath))
+ continue;
+ break;
+
+ case VIR_DOMAIN_MEMORY_MODEL_NONE:
+ case VIR_DOMAIN_MEMORY_MODEL_LAST:
+ break;
+ }
break;
}
@@ -22532,23 +22565,35 @@ virDomainMemorySourceDefFormat(virBufferPtr buf,
char *bitmap = NULL;
int ret = -1;
- if (!def->pagesize && !def->sourceNodes)
+ if (!def->pagesize && !def->sourceNodes && !def->nvdimmPath)
return 0;
virBufferAddLit(buf, "\n");
virBufferAdjustIndent(buf, 2);
- if (def->sourceNodes) {
- if (!(bitmap = virBitmapFormat(def->sourceNodes)))
- goto cleanup;
+ switch ((virDomainMemoryModel) def->model) {
+ case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+ if (def->sourceNodes) {
+ if (!(bitmap = virBitmapFormat(def->sourceNodes)))
+ goto cleanup;
- virBufferAsprintf(buf, "%s \n", bitmap);
+ virBufferAsprintf(buf, "%s \n", bitmap);
+ }
+
+ if (def->pagesize)
+ virBufferAsprintf(buf, "%llu \n",
+ def->pagesize);
+ break;
+
+ case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+ virBufferEscapeString(buf, "%s \n", def->nvdimmPath);
+ break;
+
+ case VIR_DOMAIN_MEMORY_MODEL_NONE:
+ case VIR_DOMAIN_MEMORY_MODEL_LAST:
+ break;
}
- if (def->pagesize)
- virBufferAsprintf(buf, "%llu \n",
- def->pagesize);
-
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, " \n");
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index b788a82710..2eff9f74a4 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1997,6 +1997,7 @@ struct _virDomainRNGDef {
typedef enum {
VIR_DOMAIN_MEMORY_MODEL_NONE,
VIR_DOMAIN_MEMORY_MODEL_DIMM, /* dimm hotpluggable memory device */
+ VIR_DOMAIN_MEMORY_MODEL_NVDIMM, /* nvdimm memory device */
VIR_DOMAIN_MEMORY_MODEL_LAST
} virDomainMemoryModel;
@@ -2005,6 +2006,7 @@ struct _virDomainMemoryDef {
/* source */
virBitmapPtr sourceNodes;
unsigned long long pagesize; /* kibibytes */
+ char *nvdimmPath;
/* target */
int model; /* virDomainMemoryModel */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 16f5aa9098..b52be4bb69 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3515,6 +3515,12 @@ qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem)
break;
+ case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+ virReportError(VIR_ERR_NO_SUPPORT, "%s",
+ _("nvdimm not supported yet"));
+ return NULL;
+ break;
+
case VIR_DOMAIN_MEMORY_MODEL_NONE:
case VIR_DOMAIN_MEMORY_MODEL_LAST:
break;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 07ce22417a..b34ba7efbd 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5967,6 +5967,11 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem,
}
break;
+ case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("nvdimm hotplug not supported yet"));
+ return -1;
+
case VIR_DOMAIN_MEMORY_MODEL_NONE:
case VIR_DOMAIN_MEMORY_MODEL_LAST:
return -1;
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.xml b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.xml
new file mode 100644
index 0000000000..1578db4539
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.xml
@@ -0,0 +1,56 @@
+
+ QEMUGuest1
+ c7a5fdbd-edaf-9455-926a-d65c16db1809
+ 1099511627776
+ 1267710
+ 1267710
+ 2
+
+ hvm
+
+
+
+
+
+ |
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/bin/qemu
+
+
+
+
+
+
+
+
+
+
+ /tmp/nvdimm
+
+
+ 523264
+ 0
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml
new file mode 120000
index 0000000000..4cac477a9a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 4353ad2456..e1c341dd5c 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1078,6 +1078,7 @@ mymain(void)
DO_TEST("memory-hotplug", NONE);
DO_TEST("memory-hotplug-nonuma", NONE);
DO_TEST("memory-hotplug-dimm", NONE);
+ DO_TEST("memory-hotplug-nvdimm", NONE);
DO_TEST("net-udp", NONE);
DO_TEST("video-virtio-gpu-device", NONE);