NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

schema: Don't enforce ordering of hostcpu capabilities elements

Browse Source 
The change to caps-test.xml demonstrates the need for the change to
cputypes.rng.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Jim Fehlig 2022-08-11 16:31:13 -06:00
parent b5f63691a6
commit 65e8ac6f92
2 changed files with 85 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
src/conf/schemas/cputypes.rng
View File

@ -326,90 +326,92 @@
<element name="arch"> <element name="arch">
<ref name="archnames"/> <ref name="archnames"/>
</element> </element>
<optional> <interleave>
<element name="features"> <optional>
<optional> <element name="features">
<element name="pae"><empty/></element> <optional>
</optional> <element name="pae"><empty/></element>
<optional> </optional>
<element name="nonpae"><empty/></element> <optional>
</optional> <element name="nonpae"><empty/></element>
<optional> </optional>
<element name="vmx"><empty/></element> <optional>
</optional> <element name="vmx"><empty/></element>
<optional> </optional>
<element name="svm"><empty/></element> <optional>
</optional> <element name="svm"><empty/></element>
</element> </optional>
</optional> </element>
<optional> </optional>
<element name="model"> <optional>
<text/> <element name="model">
</element>
</optional>
<optional>
<element name="vendor">
<text/>
</element>
</optional>
<optional>
<element name="microcode">
<attribute name="version">
<ref name="positiveInteger"/>
</attribute>
</element>
</optional>
<optional>
<element name="signature">
<attribute name="family">
<ref name="positiveInteger"/>
</attribute>
<attribute name="model">
<ref name="unsignedInt"/>
</attribute>
<attribute name="stepping">
<ref name="unsignedInt"/>
</attribute>
</element>
</optional>
<optional>
<element name="counter">
<attribute name="name">
<text/> <text/>
</attribute> </element>
<attribute name="frequency"> </optional>
<ref name="positiveInteger"/> <optional>
</attribute> <element name="vendor">
<attribute name="scaling"> <text/>
<ref name="virYesNo"/> </element>
</attribute> </optional>
</element> <optional>
</optional> <element name="microcode">
<optional> <attribute name="version">
<ref name="cpuTopology"/> <ref name="positiveInteger"/>
</optional>
<zeroOrMore>
<element name="feature">
<attribute name="name">
<data type="string">
<param name="pattern">[a-zA-Z0-9\-_]+</param>
</data>
</attribute>
<empty/>
</element>
</zeroOrMore>
<zeroOrMore>
<element name="pages">
<optional>
<attribute name="unit">
<ref name="unit"/>
</attribute> </attribute>
</optional> </element>
<attribute name="size"> </optional>
<ref name="unsignedInt"/> <optional>
</attribute> <element name="signature">
</element> <attribute name="family">
</zeroOrMore> <ref name="positiveInteger"/>
</attribute>
<attribute name="model">
<ref name="unsignedInt"/>
</attribute>
<attribute name="stepping">
<ref name="unsignedInt"/>
</attribute>
</element>
</optional>
<optional>
<element name="counter">
<attribute name="name">
<text/>
</attribute>
<attribute name="frequency">
<ref name="positiveInteger"/>
</attribute>
<attribute name="scaling">
<ref name="virYesNo"/>
</attribute>
</element>
</optional>
<optional>
<ref name="cpuTopology"/>
</optional>
<zeroOrMore>
<element name="feature">
<attribute name="name">
<data type="string">
<param name="pattern">[a-zA-Z0-9\-_]+</param>
</data>
</attribute>
<empty/>
</element>
</zeroOrMore>
<zeroOrMore>
<element name="pages">
<optional>
<attribute name="unit">
<ref name="unit"/>
</attribute>
</optional>
<attribute name="size">
<ref name="unsignedInt"/>
</attribute>
</element>
</zeroOrMore>
</interleave>
</element> </element>
</define> </define>

1
tests/capabilityschemadata/caps-test.xml
View File

@ -3,6 +3,7 @@
<host> <host>
<cpu> <cpu>
<arch>i686</arch> <arch>i686</arch>
<vendor>Intel</vendor>
<features> <features>
<pae/> <pae/>
<nonpae/> <nonpae/>