External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

schema: rename uint8range/uint24range to uint8/uint24

Browse Source 
nwfilter.rng defines uint16range and uint32range, but in a different
manner (it also allows a variable name as the value, rather than just
a decimal or hex number). I wanted to add uint16range to
basictypes.rng, but my desired definition was parallel to those for
uint8range and uint24range which are defined in basictypes.rng - they
*don't* allow a variable name for the value.

The simplest path to make everyone happy is to make the "plain"
versions in basictypes.rng have simpler names - "uint8", "uint16", and
"uint24". This patch renames uint8range and uint24range to uint8 and
uint24, while the next patch will add uint16.
This commit is contained in:
Laine Stump 2016-03-22 12:00:40 -04:00
parent 51156bcff3
commit f97a03e70c
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/schemas/basictypes.rng
View File

@ -32,7 +32,7 @@
</data> </data>
</define> </define>
<define name="uint8range"> <define name="uint8">
<choice> <choice>
<data type="string"> <data type="string">
<param name="pattern">0x[0-9a-fA-F]{1,2}</param> <param name="pattern">0x[0-9a-fA-F]{1,2}</param>
@ -43,7 +43,7 @@
</data> </data>
</choice> </choice>
</define> </define>
<define name="uint24range"> <define name="uint24">
<choice> <choice>
<data type="string"> <data type="string">
<param name="pattern">0x[0-9a-fA-F]{1,6}</param> <param name="pattern">0x[0-9a-fA-F]{1,6}</param>

6
docs/schemas/domaincommon.rng
View File

@ -1795,17 +1795,17 @@
<element name="target"> <element name="target">
<optional> <optional>
<attribute name='chassisNr'> <attribute name='chassisNr'>
<ref name='uint8range'/> <ref name='uint8'/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
<attribute name="chassis"> <attribute name="chassis">
<ref name='uint8range'/> <ref name='uint8'/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
<attribute name="port"> <attribute name="port">
<ref name='uint8range'/> <ref name='uint8'/>
</attribute> </attribute>
</optional> </optional>
<empty/> <empty/>

12
docs/schemas/networkcommon.rng
View File

@ -19,17 +19,17 @@
<element name="parameters"> <element name="parameters">
<optional> <optional>
<attribute name="managerid"> <attribute name="managerid">
<ref name="uint8range"/> <ref name="uint8"/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
<attribute name="typeid"> <attribute name="typeid">
<ref name="uint24range"/> <ref name="uint24"/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
<attribute name="typeidversion"> <attribute name="typeidversion">
<ref name="uint8range"/> <ref name="uint8"/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
@ -97,17 +97,17 @@
<element name="parameters"> <element name="parameters">
<optional> <optional>
<attribute name="managerid"> <attribute name="managerid">
<ref name="uint8range"/> <ref name="uint8"/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
<attribute name="typeid"> <attribute name="typeid">
<ref name="uint24range"/> <ref name="uint24"/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
<attribute name="typeidversion"> <attribute name="typeidversion">
<ref name="uint8range"/> <ref name="uint8"/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>

16
docs/schemas/nwfilter.rng
View File

@ -578,12 +578,12 @@
<interleave> <interleave>
<optional> <optional>
<attribute name="type"> <attribute name="type">
<ref name="uint8range"/> <ref name="uint8"/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
<attribute name="code"> <attribute name="code">
<ref name="uint8range"/> <ref name="uint8"/>
</attribute> </attribute>
</optional> </optional>
</interleave> </interleave>
@ -593,22 +593,22 @@
<interleave> <interleave>
<optional> <optional>
<attribute name="type"> <attribute name="type">
<ref name="uint8range"/> <ref name="uint8"/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
<attribute name="typeend"> <attribute name="typeend">
<ref name="uint8range"/> <ref name="uint8"/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
<attribute name="code"> <attribute name="code">
<ref name="uint8range"/> <ref name="uint8"/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
<attribute name="codeend"> <attribute name="codeend">
<ref name="uint8range"/> <ref name="uint8"/>
</attribute> </attribute>
</optional> </optional>
</interleave> </interleave>
@ -642,12 +642,12 @@
<define name="stp-attributes"> <define name="stp-attributes">
<optional> <optional>
<attribute name="type"> <attribute name="type">
<ref name="uint8range"/> <ref name="uint8"/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
<attribute name="flags"> <attribute name="flags">
<ref name="uint8range"/> <ref name="uint8"/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>