1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00

schema: Remove optional nesting in hostcpu rng

The hostcpu rng has an optional "model" element, with the remaining
elements each within a nested optional. Remove the optional nesting
and have each element explicitly listed as optional

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:13:36 -06:00
parent 9833f6ee1e
commit b5f63691a6

View File

@ -346,70 +346,70 @@
<element name="model">
<text/>
</element>
<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/>
</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>
</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/>
</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>
</element>
</define>