qemu: Introduce QEMU_CAPS_OBJECT_MEMORY_FILE_PMEM capability

This capability tracks if memory-backend-file has the pmem
attribute or not.

Signed-off-by: Luyao Zhong <luyao.zhong@intel.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d4fac18337b8e61c2146284b9d495119aaa34139..1a1900b380f957a220132dbedb0725c37f77717e 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -516,6 +516,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "machine.pseries.cap-nested-hv",
               "egl-headless.rendernode",
               "memory-backend-file.align",
+
+              /* 325 */
+              "memory-backend-file.pmem",
     );
 
 
@@ -1367,6 +1370,7 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = {
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] = {
     { "discard-data", QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD },
     { "align", QEMU_CAPS_OBJECT_MEMORY_FILE_ALIGN },
+    { "pmem", QEMU_CAPS_OBJECT_MEMORY_FILE_PMEM },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendMemfd[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 9df4a873ff11b5ccc8941b58108f6281b7f9cec2..84c5404b16deecc49fcd7d171bee6465c6d89f1f 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -501,6 +501,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_EGL_HEADLESS_RENDERNODE, /* -display egl-headless,rendernode= */
     QEMU_CAPS_OBJECT_MEMORY_FILE_ALIGN, /* -object memory-backend-file,align= */
 
+    /* 325 */
+    QEMU_CAPS_OBJECT_MEMORY_FILE_PMEM, /* -object memory-backend-file,pmem= */
+
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
 

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index 48f4fdfcee04d3b31d2c6f48c5f69b3481fe17f8..175233aa09d4ec5b5c8d80dc471932dd6e615a0d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -167,6 +167,7 @@
   <flag name='iothread.poll-max-ns'/>
   <flag name='machine.pseries.cap-nested-hv'/>
   <flag name='memory-backend-file.align'/>
+  <flag name='memory-backend-file.pmem'/>
   <version>3000091</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>437731</microcodeVersion>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 6be80ce2db820a30a7910f11e0daef74155998ff..faafbcdaf04a7eb5f52c7e3989ae30c715d8b0df 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -210,6 +210,7 @@
   <flag name='iothread.poll-max-ns'/>
   <flag name='egl-headless.rendernode'/>
   <flag name='memory-backend-file.align'/>
+  <flag name='memory-backend-file.pmem'/>
   <version>3000092</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>440395</microcodeVersion>