提交 0f358fcd 编写于 作者: J John Ferlan

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: NJohn Ferlan <jferlan@redhat.com>
ACKed-by: NMichal Privoznik <mprivozn@redhat.com>
上级 87973a45
...@@ -434,6 +434,7 @@ ...@@ -434,6 +434,7 @@
&lt;/enum&gt; &lt;/enum&gt;
&lt;/gic&gt; &lt;/gic&gt;
&lt;vmcoreinfo supported='yes'/&gt; &lt;vmcoreinfo supported='yes'/&gt;
&lt;genid supported='yes'/&gt;
&lt;/features&gt; &lt;/features&gt;
&lt;/domainCapabilities&gt; &lt;/domainCapabilities&gt;
</pre> </pre>
...@@ -460,7 +461,11 @@ ...@@ -460,7 +461,11 @@
<h4><a id="elementsvmcoreinfo">vmcoreinfo</a></h4> <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> </body>
</html> </html>
...@@ -184,6 +184,7 @@ ...@@ -184,6 +184,7 @@
<interleave> <interleave>
<ref name='gic'/> <ref name='gic'/>
<ref name='vmcoreinfo'/> <ref name='vmcoreinfo'/>
<ref name='vmgenid'/>
</interleave> </interleave>
</element> </element>
</define> </define>
...@@ -201,6 +202,12 @@ ...@@ -201,6 +202,12 @@
</element> </element>
</define> </define>
<define name='vmgenid'>
<element name='genid'>
<ref name='supported'/>
</element>
</define>
<define name='value'> <define name='value'>
<zeroOrMore> <zeroOrMore>
<element name='value'> <element name='value'>
......
...@@ -586,6 +586,9 @@ virDomainCapsFormat(virDomainCapsPtr const caps) ...@@ -586,6 +586,9 @@ virDomainCapsFormat(virDomainCapsPtr const caps)
virBufferAsprintf(&buf, "<vmcoreinfo supported='%s'/>\n", virBufferAsprintf(&buf, "<vmcoreinfo supported='%s'/>\n",
caps->vmcoreinfo ? "yes" : "no"); caps->vmcoreinfo ? "yes" : "no");
virBufferAsprintf(&buf, "<genid supported='%s'/>\n",
caps->genid ? "yes" : "no");
virBufferAdjustIndent(&buf, -2); virBufferAdjustIndent(&buf, -2);
virBufferAddLit(&buf, "</features>\n"); virBufferAddLit(&buf, "</features>\n");
......
...@@ -159,6 +159,7 @@ struct _virDomainCaps { ...@@ -159,6 +159,7 @@ struct _virDomainCaps {
virDomainCapsFeatureGIC gic; virDomainCapsFeatureGIC gic;
bool vmcoreinfo; bool vmcoreinfo;
bool genid;
/* add new domain features here */ /* add new domain features here */
}; };
......
...@@ -4943,6 +4943,8 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps, ...@@ -4943,6 +4943,8 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps,
domCaps->vmcoreinfo = virQEMUCapsGet(qemuCaps, domCaps->vmcoreinfo = virQEMUCapsGet(qemuCaps,
QEMU_CAPS_DEVICE_VMCOREINFO); QEMU_CAPS_DEVICE_VMCOREINFO);
domCaps->genid = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMGENID);
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 ||
......
...@@ -19,5 +19,6 @@ ...@@ -19,5 +19,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -29,5 +29,6 @@ ...@@ -29,5 +29,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -46,5 +46,6 @@ ...@@ -46,5 +46,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -38,5 +38,6 @@ ...@@ -38,5 +38,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -109,5 +109,6 @@ ...@@ -109,5 +109,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -72,5 +72,6 @@ ...@@ -72,5 +72,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -71,5 +71,6 @@ ...@@ -71,5 +71,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -62,5 +62,6 @@ ...@@ -62,5 +62,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -61,5 +61,6 @@ ...@@ -61,5 +61,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -110,5 +110,6 @@ ...@@ -110,5 +110,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -117,5 +117,6 @@ ...@@ -117,5 +117,6 @@
</enum> </enum>
</gic> </gic>
<vmcoreinfo supported='yes'/> <vmcoreinfo supported='yes'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -79,5 +79,6 @@ ...@@ -79,5 +79,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -171,5 +171,6 @@ ...@@ -171,5 +171,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -141,5 +141,6 @@ ...@@ -141,5 +141,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='yes'/> <vmcoreinfo supported='yes'/>
<genid supported='yes'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -114,5 +114,6 @@ ...@@ -114,5 +114,6 @@
</enum> </enum>
</gic> </gic>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -110,5 +110,6 @@ ...@@ -110,5 +110,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -83,5 +83,6 @@ ...@@ -83,5 +83,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -115,5 +115,6 @@ ...@@ -115,5 +115,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -76,5 +76,6 @@ ...@@ -76,5 +76,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -116,5 +116,6 @@ ...@@ -116,5 +116,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -157,5 +157,6 @@ ...@@ -157,5 +157,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -116,5 +116,6 @@ ...@@ -116,5 +116,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='no'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -124,5 +124,6 @@ ...@@ -124,5 +124,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='yes'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -148,5 +148,6 @@ ...@@ -148,5 +148,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='yes'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
...@@ -125,5 +125,6 @@ ...@@ -125,5 +125,6 @@
<features> <features>
<gic supported='no'/> <gic supported='no'/>
<vmcoreinfo supported='no'/> <vmcoreinfo supported='no'/>
<genid supported='yes'/>
</features> </features>
</domainCapabilities> </domainCapabilities>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册