Introduce <current/> property to virtio-mem

The virtio-mem has another property that isn't exposed yet:
current size exposed to the guest. Please note, that this is
different to <requested/> because esp. on sizing the memory
down guest may refuse to release some blocks. Therefore, let's
have another size to report in the XML. But because of its
nature, the <current/> won't be parsed and is report only (for
live XMLs).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 06d16b2c23f43125f4c9b676427e42161cc3f418..526727f98ede618f9e32627f7cf366f1049055c5 100644 (file)
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -7802,6 +7802,7 @@ Example: usage of the memory devices
          <node>0</node>
          <block unit='KiB'>2048</block>
          <requested unit='KiB'>1048576</requested>
+         <current unit='KiB'>524288</current>
        </target>
      </memory>
    </devices>
@@ -7917,6 +7918,12 @@ Example: usage of the memory devices
      The total size exposed to the guest. Must respect ``block`` granularity
      and be smaller than or equal to ``size``.
 
+   ``current``
+     Active XML for ``virtio-mem`` model may contain ``current`` element that
+     reflects the current size of the corresponding virtio memory device. The
+     element is formatted into live XML and never parsed, i.e. it is
+     output-only element.
+
 :anchor:`<a id="elementsIommu"/>`
 
 IOMMU devices

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 9e7d74d43ecfbc698d1a49f28a9ae750de87d9d9..ec5bd9174003c211368407c1c4e3ed1346f04119 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -6698,6 +6698,11 @@
             <ref name="scaledInteger"/>
           </element>
         </optional>
+        <optional>
+          <element name="current">
+            <ref name="scaledInteger"/>
+          </element>
+        </optional>
         <optional>
           <element name="label">
             <element name="size">

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 96d85a7610936204c032c61b76639e6eb73b1a5c..4a46f30610f637d93cfa4ee29d28a4ec60befe64 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -25921,7 +25921,8 @@ virDomainMemorySourceDefFormat(virBuffer *buf,
 
 static void
 virDomainMemoryTargetDefFormat(virBuffer *buf,
-                               virDomainMemoryDef *def)
+                               virDomainMemoryDef *def,
+                               unsigned int flags)
 {
     g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
 
@@ -25943,6 +25944,10 @@ virDomainMemoryTargetDefFormat(virBuffer *buf,
 
         virBufferAsprintf(&childBuf, "<requested unit='KiB'>%llu</requested>\n",
                           def->requestedsize);
+        if (!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE)) {
+            virBufferAsprintf(&childBuf, "<current unit='KiB'>%llu</current>\n",
+                              def->currentsize);
+        }
     }
 
     virXMLFormatElement(buf, "target", NULL, &childBuf);
@@ -25975,7 +25980,7 @@ virDomainMemoryDefFormat(virBuffer *buf,
     if (virDomainMemorySourceDefFormat(buf, def) < 0)
         return -1;
 
-    virDomainMemoryTargetDefFormat(buf, def);
+    virDomainMemoryTargetDefFormat(buf, def, flags);
 
     virDomainDeviceInfoFormat(buf, &def->info, flags);
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 9db15a87fbb08d4122772f8683151b61a5aaffe5..b7f9e66487757c0e43a697b4a5c3f92cf1b781db 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2496,6 +2496,9 @@ struct _virDomainMemoryDef {
     unsigned long long labelsize; /* kibibytes; valid only for NVDIMM */
     unsigned long long blocksize; /* kibibytes; valid only for VIRTIO_MEM */
     unsigned long long requestedsize; /* kibibytes; valid only for VIRTIO_MEM */
+    unsigned long long currentsize; /* kibibytes, valid for VIRTIO_MEM and
+                                       active domain only, only to report never
+                                       parse */
     bool readonly; /* valid only for NVDIMM */
 
     /* required for QEMU NVDIMM ppc64 support */