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>

diff --git a/docs/formatdomaincaps.html.in b/docs/formatdomaincaps.html.in
index f8724a24578e78d39a9db6df5a967b22689b1b64..86c9ce8c5c23d7eed5f918bed6175e33300fb2ad 100644 (file)
--- a/docs/formatdomaincaps.html.in
+++ b/docs/formatdomaincaps.html.in
@@ -433,6 +433,7 @@
         <value>3</value>
       </enum>
     </gic>
+    <vmcoreinfo supported='yes'/>
   </features>
 </domainCapabilities>
 </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>

diff --git a/docs/schemas/domaincaps.rng b/docs/schemas/domaincaps.rng
index 049b2ae7b64f9979c89e84131d46467f7d731cb0..5913d711a3fe751f0beca2862eab65ef17c95335 100644 (file)
--- 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'>

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index f18bea99d63ffeec2ebb6c327171e84e414ee2d9..6e2ab0a2879689502906003142a035281dfe76a5 100644 (file)
--- 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");

diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index 3b5ce214d636d29d904012f7b5a6468b23f3c826..9b852e8649bf39da3ee83f66a0aeac3270c77f1d 100644 (file)
--- 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 */
 };
 

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index e80a2b49d63eba3a85da3b519e407140d039f302..0265d83028433156833d90e650e6744d91211a38 100644 (file)
--- 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 ||

diff --git a/tests/domaincapsschemadata/basic.xml b/tests/domaincapsschemadata/basic.xml
index 7f9582430a7a93836a0f954227170ab20fb39844..09e9376585ef2a303f4baed6695816d1403e2b1e 100644 (file)
--- a/tests/domaincapsschemadata/basic.xml
+++ b/tests/domaincapsschemadata/basic.xml
@@ -18,5 +18,6 @@
   </devices>
   <features>
     <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
   </features>
 </domainCapabilities>

diff --git a/tests/domaincapsschemadata/bhyve_basic.x86_64.xml b/tests/domaincapsschemadata/bhyve_basic.x86_64.xml
index 95a8038c279a2b4df283678493b78884f6c2738a..70e36e97e9ac236244e7766e79492a34f22265a0 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml b/tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml
index 662d0db9a2d1762b0ebdb6b16612f8e1706bcd3e..19b76da456f3e232f520e042fd46b738be1f163e 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/bhyve_uefi.x86_64.xml b/tests/domaincapsschemadata/bhyve_uefi.x86_64.xml
index f8c79b99b103ccf6887ac87c44fe0c777494d761..c278df038a1ab6f54ba1eb28ca9f0e40685f7522 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/full.xml b/tests/domaincapsschemadata/full.xml
index b97bc883262a7ba78453fcd600399f41b4a388be..47017c6fd190c815726d94c3267213e31694d44f 100644 (file)
--- a/tests/domaincapsschemadata/full.xml
+++ b/tests/domaincapsschemadata/full.xml
@@ -108,5 +108,6 @@
   </devices>
   <features>
     <gic supported='no'/>
+    <vmcoreinfo supported='no'/>
   </features>
 </domainCapabilities>

diff --git a/tests/domaincapsschemadata/libxl-xenfv-usb.xml b/tests/domaincapsschemadata/libxl-xenfv-usb.xml
index 6a9e3d96f09465623d0cdf90087fab49f578cc36..dfa992cb71b54ef9a9205f5412d5592e274fe1b4 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/libxl-xenfv.xml b/tests/domaincapsschemadata/libxl-xenfv.xml
index 68a942989b11570b5da56e9ffac4644a8844112e..a81ce3310c8c3e94cb5e348a8b726fba1977885d 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/libxl-xenpv-usb.xml b/tests/domaincapsschemadata/libxl-xenpv-usb.xml
index d1a3918ef2eab820f3dcc4a4f996a5cfe2536119..8277a9efdd832bb6987e54d61b3c5c9d43613d92 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/libxl-xenpv.xml b/tests/domaincapsschemadata/libxl-xenpv.xml
index 40a0b0e12b5db53ee16da7fc9a78da3bc4206851..e856ed00c635f8cdf2d29f58629224cd66adef16 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml
index d71d948477ef59e721ecbb1cab1e6a7a1e373453..88c087549da388f63d2b3da4bcbab281276ac4f4 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml
index 9feceeea74c649ea3208fb4ba842d3cb1fa0e3f0..69d996806460309805b861a43529d20a361da298 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml b/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml
index 62f2d4f78a6e7cc6380336534c612b2c52857f2a..5fac2ed772b2a19c426ed9d6540063102b4bfbcd 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
index be505ee331a43e43f85f2f91d299ad9cd2d5b671..4bacb879feaefe9fb619b6342b2be49f1ac8959c 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
index 84a83551ad4270e84845d67704da95525381d2a8..d0e2866c4910798a47d103363dafeef62808a434 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml
index b3dc0dd8004b94efe18a40348772c21bae7297ea..a4290ddc22dc090b3169507c92970bd895f94c90 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml
index 13bb19198d386d0c70c7b2492d47a50e714a2e0d..943d9786826cb1ffb37d955a7dbdaf99ebeeb521 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml b/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml
index d9a243d9d573617594d33f484aa974e7e11cbdbe..86985a5856311d55bd41affb20fa52394f6d9a30 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
index 7eabf6756b8904f18dc968d6f8fe0c0038f9c7b9..04be214659e5998040e71342a3db333773777432 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml
index c2045263530f48b1b9cfe0d4c150a55eec5c3880..6b2d81520eaf8be0654316ed460867537c2c1584 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml b/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml
index 93e0a610f6ce586815419f14f24c7d1d02204950..eadcc3c8e4e7c10f22d1ab69c8a2bbb8cabd3340 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
index 6555e99c68a3e37f24d75a73e445a397376151f8..0a71be4244506822648f8ffecb0d565576b3cd5c 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml
index 2a6edd9a0f80400028ae3793b81033f618402c50..243d84fd0d6385e33706f3e58414ea473d1cce04 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml b/tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml
index aef8a90f39304ca328db8cef7063d74dd248f765..d7cb1dc5ee6982c249286696c302e4bbf0fa0456 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml b/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml
index e4afdeedc4e62f8339156989dca243af64d00be2..09457e4be6ed5832a2aa7458b790831a70281927 100644 (file)
--- 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>

diff --git a/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml
index 8f0f4fb7369b6e710f9eccc8a9d9e741053757a1..f8337d8dd417bcb80f962dd83796ed003296b032 100644 (file)
--- 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>