domcaps: Add 'genid' to domain capabilities

Report domaincaps <features><genid supported='yes'/> if the guest config accepts <genid/> or <genid>$GUID</genid>. Signed-off-by: John Ferlan <jferlan@redhat.com> ACKed-by: Michal Privoznik <mprivozn@redhat.com>
2025-01-08 07:03:19 -06:00 · 2018-04-27 08:16:40 -04:00 · 2018-04-27 08:16:40 -04:00 · 0f358fcdca
commit 0f358fcdca
parent 87973a45f9
30 changed files with 44 additions and 1 deletions
--- a/docs/formatdomaincaps.html.in
+++ b/docs/formatdomaincaps.html.in
@ -434,6 +434,7 @@
      &lt;/enum&gt;
    &lt;/gic&gt;
    &lt;vmcoreinfo supported='yes'/&gt;
+    &lt;genid supported='yes'/&gt;
  &lt;/features&gt;
 &lt;/domainCapabilities&gt;
 </pre>
@ -460,7 +461,11 @@

    <h4><a id="elementsvmcoreinfo">vmcoreinfo</a></h4>

-    <p>Reports whether the vmcoreinfo feature can be enabled</p>
+    <p>Reports whether the vmcoreinfo feature can be enabled.</p>
+
+    <h4><a id="elementsgenid">genid</a></h4>
+
+    <p>Reports whether the genid feature can be used by the domain.</p>

  </body>
 </html>
--- a/docs/schemas/domaincaps.rng
+++ b/docs/schemas/domaincaps.rng
@ -184,6 +184,7 @@
      <interleave>
        <ref name='gic'/>
        <ref name='vmcoreinfo'/>
+        <ref name='vmgenid'/>
      </interleave>
    </element>
  </define>
@ -201,6 +202,12 @@
    </element>
  </define>

+  <define name='vmgenid'>
+    <element name='genid'>
+      <ref name='supported'/>
+    </element>
+  </define>
+
  <define name='value'>
    <zeroOrMore>
      <element name='value'>
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@ -586,6 +586,9 @@ virDomainCapsFormat(virDomainCapsPtr const caps)
    virBufferAsprintf(&buf, "<vmcoreinfo supported='%s'/>\n",
                      caps->vmcoreinfo ? "yes" : "no");

+    virBufferAsprintf(&buf, "<genid supported='%s'/>\n",
+                      caps->genid ? "yes" : "no");
+
    virBufferAdjustIndent(&buf, -2);
    virBufferAddLit(&buf, "</features>\n");

--- a/src/conf/domain_capabilities.h
+++ b/src/conf/domain_capabilities.h
@ -159,6 +159,7 @@ struct _virDomainCaps {

    virDomainCapsFeatureGIC gic;
    bool vmcoreinfo;
+    bool genid;
    /* add new domain features here */
 };

--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -4943,6 +4943,8 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps,
    domCaps->vmcoreinfo = virQEMUCapsGet(qemuCaps,
                                         QEMU_CAPS_DEVICE_VMCOREINFO);

+    domCaps->genid = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMGENID);
+
    if (virQEMUCapsFillDomainOSCaps(os, firmwares, nfirmwares) < 0 ||
        virQEMUCapsFillDomainCPUCaps(caps, qemuCaps, domCaps) < 0 ||
        virQEMUCapsFillDomainIOThreadCaps(qemuCaps, domCaps) < 0 ||
--- a/tests/domaincapsschemadata/basic.xml
+++ b/tests/domaincapsschemadata/basic.xml
@ -19,5 +19,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/bhyve_basic.x86_64.xml
+++ b/tests/domaincapsschemadata/bhyve_basic.x86_64.xml
@ -29,5 +29,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml
+++ b/tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml
@ -46,5 +46,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/bhyve_uefi.x86_64.xml
+++ b/tests/domaincapsschemadata/bhyve_uefi.x86_64.xml
@ -38,5 +38,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/full.xml
+++ b/tests/domaincapsschemadata/full.xml
@ -109,5 +109,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/libxl-xenfv-usb.xml
+++ b/tests/domaincapsschemadata/libxl-xenfv-usb.xml
@ -72,5 +72,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/libxl-xenfv.xml
+++ b/tests/domaincapsschemadata/libxl-xenfv.xml
@ -71,5 +71,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/libxl-xenpv-usb.xml
+++ b/tests/domaincapsschemadata/libxl-xenpv-usb.xml
@ -62,5 +62,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/libxl-xenpv.xml
+++ b/tests/domaincapsschemadata/libxl-xenpv.xml
@ -61,5 +61,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml
@ -110,5 +110,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml
+++ b/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml
@ -117,5 +117,6 @@
      </enum>
    </gic>
    <vmcoreinfo supported='yes'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml
+++ b/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml
@ -79,5 +79,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
+++ b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
@ -171,5 +171,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
@ -141,5 +141,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='yes'/>
+    <genid supported='yes'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml
@ -114,5 +114,6 @@
      </enum>
    </gic>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml
@ -110,5 +110,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml
@ -83,5 +83,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
@ -115,5 +115,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml
+++ b/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml
@ -76,5 +76,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml
@ -116,5 +116,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
+++ b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
@ -157,5 +157,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml
@ -116,5 +116,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml
@ -124,5 +124,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='yes'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml
@ -148,5 +148,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='yes'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml
@ -125,5 +125,6 @@
  <features>
    <gic supported='no'/>
    <vmcoreinfo supported='no'/>
+    <genid supported='yes'/>
  </features>
 </domainCapabilities>