“4f35e2e00a0a606276c8032e2710de651a8f0d2f”上不存在“PaddleNLP/preprocess/ernie/__init__.py”
提交 33455bc4 编写于 作者: C Cole Robinson

domain_capabilities: Report <vmcoreinfo> support

Report <features><vmcoreinfo supported='yes'/> if the guest config
accepts <features><vmcoreinfo state='on'/>
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>
Signed-off-by: NCole Robinson <crobinso@redhat.com>
上级 217d2656
...@@ -433,6 +433,7 @@ ...@@ -433,6 +433,7 @@
&lt;value&gt;3&lt;/value&gt; &lt;value&gt;3&lt;/value&gt;
&lt;/enum&gt; &lt;/enum&gt;
&lt;/gic&gt; &lt;/gic&gt;
&lt;vmcoreinfo supported='yes'/&gt;
&lt;/features&gt; &lt;/features&gt;
&lt;/domainCapabilities&gt; &lt;/domainCapabilities&gt;
</pre> </pre>
...@@ -457,5 +458,9 @@ ...@@ -457,5 +458,9 @@
<code>gic</code> element.</dd> <code>gic</code> element.</dd>
</dl> </dl>
<h4><a id="elementsvmcoreinfo">vmcoreinfo</a></h4>
<p>Reports whether the vmcoreinfo feature can be enabled</p>
</body> </body>
</html> </html>
...@@ -183,6 +183,7 @@ ...@@ -183,6 +183,7 @@
<element name='features'> <element name='features'>
<interleave> <interleave>
<ref name='gic'/> <ref name='gic'/>
<ref name='vmcoreinfo'/>
</interleave> </interleave>
</element> </element>
</define> </define>
...@@ -194,6 +195,12 @@ ...@@ -194,6 +195,12 @@
</element> </element>
</define> </define>
<define name='vmcoreinfo'>
<element name='vmcoreinfo'>
<ref name='supported'/>
</element>
</define>
<define name='value'> <define name='value'>
<zeroOrMore> <zeroOrMore>
<element name='value'> <element name='value'>
......
...@@ -583,6 +583,8 @@ virDomainCapsFormat(virDomainCapsPtr const caps) ...@@ -583,6 +583,8 @@ virDomainCapsFormat(virDomainCapsPtr const caps)
virBufferAdjustIndent(&buf, 2); virBufferAdjustIndent(&buf, 2);
virDomainCapsFeatureGICFormat(&buf, &caps->gic); virDomainCapsFeatureGICFormat(&buf, &caps->gic);
virBufferAsprintf(&buf, "<vmcoreinfo supported='%s'/>\n",
caps->vmcoreinfo ? "yes" : "no");
virBufferAdjustIndent(&buf, -2); virBufferAdjustIndent(&buf, -2);
virBufferAddLit(&buf, "</features>\n"); virBufferAddLit(&buf, "</features>\n");
......
...@@ -158,6 +158,7 @@ struct _virDomainCaps { ...@@ -158,6 +158,7 @@ struct _virDomainCaps {
/* add new domain devices here */ /* add new domain devices here */
virDomainCapsFeatureGIC gic; virDomainCapsFeatureGIC gic;
bool vmcoreinfo;
/* add new domain features here */ /* add new domain features here */
}; };
......
...@@ -4881,6 +4881,9 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps, ...@@ -4881,6 +4881,9 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps,
domCaps->maxvcpus = MIN(domCaps->maxvcpus, hostmaxvcpus); domCaps->maxvcpus = MIN(domCaps->maxvcpus, hostmaxvcpus);
} }
domCaps->vmcoreinfo = virQEMUCapsGet(qemuCaps,
QEMU_CAPS_DEVICE_VMCOREINFO);
if (virQEMUCapsFillDomainOSCaps(os, firmwares, nfirmwares) < 0 || if (virQEMUCapsFillDomainOSCaps(os, firmwares, nfirmwares) < 0 ||
virQEMUCapsFillDomainCPUCaps(caps, qemuCaps, domCaps) < 0 || virQEMUCapsFillDomainCPUCaps(caps, qemuCaps, domCaps) < 0 ||
virQEMUCapsFillDomainIOThreadCaps(qemuCaps, domCaps) < 0 || virQEMUCapsFillDomainIOThreadCaps(qemuCaps, domCaps) < 0 ||
......
...@@ -18,5 +18,6 @@ ...@@ -18,5 +18,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -27,5 +27,6 @@ ...@@ -27,5 +27,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -44,5 +44,6 @@ ...@@ -44,5 +44,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -36,5 +36,6 @@ ...@@ -36,5 +36,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -108,5 +108,6 @@ ...@@ -108,5 +108,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -70,5 +70,6 @@ ...@@ -70,5 +70,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -70,5 +70,6 @@ ...@@ -70,5 +70,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -60,5 +60,6 @@ ...@@ -60,5 +60,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -60,5 +60,6 @@ ...@@ -60,5 +60,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -109,5 +109,6 @@ ...@@ -109,5 +109,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -116,5 +116,6 @@ ...@@ -116,5 +116,6 @@
<value>3</value> <value>3</value>
</enum> </enum>
</gic> </gic>
<vmcoreinfo supported='yes'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -78,5 +78,6 @@ ...@@ -78,5 +78,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -75,5 +75,6 @@ ...@@ -75,5 +75,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -140,5 +140,6 @@ ...@@ -140,5 +140,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='yes'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -113,5 +113,6 @@ ...@@ -113,5 +113,6 @@
<value>2</value> <value>2</value>
</enum> </enum>
</gic> </gic>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -109,5 +109,6 @@ ...@@ -109,5 +109,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -82,5 +82,6 @@ ...@@ -82,5 +82,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -114,5 +114,6 @@ ...@@ -114,5 +114,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -75,5 +75,6 @@ ...@@ -75,5 +75,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -115,5 +115,6 @@ ...@@ -115,5 +115,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -156,5 +156,6 @@ ...@@ -156,5 +156,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -115,5 +115,6 @@ ...@@ -115,5 +115,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -123,5 +123,6 @@ ...@@ -123,5 +123,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -147,5 +147,6 @@ ...@@ -147,5 +147,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -124,5 +124,6 @@ ...@@ -124,5 +124,6 @@
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册