domain_capabilities: Report <vmcoreinfo> support

Report <features><vmcoreinfo supported='yes'/> if the guest config accepts <features><vmcoreinfo state='on'/> Reviewed-by: John Ferlan <jferlan@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
2018-04-17 13:54:28 -04:00 · 2018-04-17 13:54:28 -04:00 · 33455bc4ce
parent 217d2656a5
commit 33455bc4ce
30 changed files with 43 additions and 0 deletions
--- a/docs/formatdomaincaps.html.in
+++ b/docs/formatdomaincaps.html.in
@ -433,6 +433,7 @@
        &lt;value&gt;3&lt;/value&gt;
      &lt;/enum&gt;
    &lt;/gic&gt;
+    &lt;vmcoreinfo supported='yes'/&gt;
  &lt;/features&gt;
 &lt;/domainCapabilities&gt;
 </pre>
@ -457,5 +458,9 @@
      <code>gic</code> element.</dd>
    </dl>

+    <h4><a id="elementsvmcoreinfo">vmcoreinfo</a></h4>
+
+    <p>Reports whether the vmcoreinfo feature can be enabled</p>
+
  </body>
 </html>
--- a/docs/schemas/domaincaps.rng
+++ b/docs/schemas/domaincaps.rng
@ -183,6 +183,7 @@
    <element name='features'>
      <interleave>
        <ref name='gic'/>
+        <ref name='vmcoreinfo'/>
      </interleave>
    </element>
  </define>
@ -194,6 +195,12 @@
    </element>
  </define>

+  <define name='vmcoreinfo'>
+    <element name='vmcoreinfo'>
+      <ref name='supported'/>
+    </element>
+  </define>
+
  <define name='value'>
    <zeroOrMore>
      <element name='value'>
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@ -583,6 +583,8 @@ virDomainCapsFormat(virDomainCapsPtr const caps)
    virBufferAdjustIndent(&buf, 2);

    virDomainCapsFeatureGICFormat(&buf, &caps->gic);
+    virBufferAsprintf(&buf, "<vmcoreinfo supported='%s'/>\n",
+                      caps->vmcoreinfo ? "yes" : "no");

    virBufferAdjustIndent(&buf, -2);
    virBufferAddLit(&buf, "</features>\n");
--- a/src/conf/domain_capabilities.h
+++ b/src/conf/domain_capabilities.h
@ -158,6 +158,7 @@ struct _virDomainCaps {
    /* add new domain devices here */

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

--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -4881,6 +4881,9 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps,
        domCaps->maxvcpus = MIN(domCaps->maxvcpus, hostmaxvcpus);
    }

+    domCaps->vmcoreinfo = virQEMUCapsGet(qemuCaps,
+                                         QEMU_CAPS_DEVICE_VMCOREINFO);
+
    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
@ -18,5 +18,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/bhyve_basic.x86_64.xml
+++ b/tests/domaincapsschemadata/bhyve_basic.x86_64.xml
@ -27,5 +27,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml
+++ b/tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml
@ -44,5 +44,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/bhyve_uefi.x86_64.xml
+++ b/tests/domaincapsschemadata/bhyve_uefi.x86_64.xml
@ -36,5 +36,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/full.xml
+++ b/tests/domaincapsschemadata/full.xml
@ -108,5 +108,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/libxl-xenfv-usb.xml
+++ b/tests/domaincapsschemadata/libxl-xenfv-usb.xml
@ -70,5 +70,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/libxl-xenfv.xml
+++ b/tests/domaincapsschemadata/libxl-xenfv.xml
@ -70,5 +70,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/libxl-xenpv-usb.xml
+++ b/tests/domaincapsschemadata/libxl-xenpv-usb.xml
@ -60,5 +60,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/libxl-xenpv.xml
+++ b/tests/domaincapsschemadata/libxl-xenpv.xml
@ -60,5 +60,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml
@ -109,5 +109,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml
+++ b/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml
@ -116,5 +116,6 @@
        <value>3</value>
      </enum>
    </gic>
+    <vmcoreinfo supported='yes'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml
+++ b/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml
@ -78,5 +78,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
+++ b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
@ -75,5 +75,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
@ -140,5 +140,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='yes'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml
@ -113,5 +113,6 @@
        <value>2</value>
      </enum>
    </gic>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml
@ -109,5 +109,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml
@ -82,5 +82,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
@ -114,5 +114,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml
+++ b/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml
@ -75,5 +75,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo 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
@ -115,5 +115,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
+++ b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
@ -156,5 +156,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml
@ -115,5 +115,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo 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
@ -123,5 +123,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml
@ -147,5 +147,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>
--- a/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml
@ -124,5 +124,6 @@
  </devices>
  <features>
    <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
  </features>
 </domainCapabilities>