11:55 p.m.
Let's save 21 lines just because I've found out a way how to convince
xmllint to do something we thought it can't. The first patch is the
brains of this operation, the second one is just a cleaner guy; best
served with '-w'.
Martin Kletzander (2):
schema: Remove unnecessary interface-options
schema: Indent interface properly
docs/schemas/domaincommon.rng | 787 ++++++++++++++++++++----------------------
1 file changed, 383 insertions(+), 404 deletions(-)
--
2.2.2
11:55 p.m.
New subject: [libvirt] [PATCH 1/2] schema: Remove unnecessary interface-options
Recent commit 52222568 added 'interface-options' to all interface types
rendering the definition useless. Moreover the usage was redundant and
this patch aims to fix that.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
docs/schemas/domaincommon.rng | 37 ++++++++-----------------------------
1 file changed, 8 insertions(+), 29 deletions(-)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index d467dce..4ed9845 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2029,6 +2029,7 @@
-->
<define name="interface">
<element name="interface">
+ <interleave>
<choice>
<group>
<attribute name="type">
@@ -2046,7 +2047,6 @@
<optional>
<ref name="virtualPortProfile"/>
</optional>
- <ref name="interface-options"/>
</interleave>
</group>
<group>
@@ -2062,7 +2062,6 @@
<empty/>
</element>
</optional>
- <ref name="interface-options"/>
</interleave>
</group>
<group>
@@ -2087,7 +2086,6 @@
</attribute>
<empty/>
</element>
- <ref name="interface-options"/>
</interleave>
</group>
<group>
@@ -2109,7 +2107,6 @@
<optional>
<ref name="virtualPortProfile"/>
</optional>
- <ref name="interface-options"/>
</interleave>
</group>
<group>
@@ -2131,16 +2128,12 @@
<optional>
<ref name="virtualPortProfile"/>
</optional>
- <ref name="interface-options"/>
</interleave>
</group>
<group>
<attribute name="type">
<value>user</value>
</attribute>
- <interleave>
- <ref name="interface-options"/>
- </interleave>
</group>
<group>
<attribute name="type">
@@ -2153,7 +2146,6 @@
</attribute>
<empty/>
</element>
- <ref name="interface-options"/>
</interleave>
</group>
<group>
@@ -2173,7 +2165,6 @@
</attribute>
<empty/>
</element>
- <ref name="interface-options"/>
</interleave>
</group>
<group>
@@ -2192,7 +2183,6 @@
</attribute>
<empty/>
</element>
- <ref name="interface-options"/>
</interleave>
</group>
<group>
@@ -2244,28 +2234,10 @@
<optional>
<ref name="virtualPortProfile"/>
</optional>
- <ref name="interface-options"/>
</interleave>
</group>
</choice>
<optional>
- <attribute name="trustGuestRxFilters">
- <ref name="virYesNo"/>
- </attribute>
- </optional>
- </element>
- </define>
- <!--
- The interface options possible are:
- - the MAC address
- - the IP address bound to the interface
- - the name of the script used to set up the binding
- - the target device used
- - boot order
- -->
- <define name="interface-options">
- <interleave>
- <optional>
<element name="target">
<attribute name="dev">
<ref name="deviceName"/>
@@ -2492,8 +2464,15 @@
<optional>
<ref name="vlan"/>
</optional>
+ <optional>
+ <attribute name="trustGuestRxFilters">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
</interleave>
+ </element>
</define>
+
<!--
An emulator description is just a path to the binary used for the task
-->
--
2.2.2
11:55 p.m.
New subject: [libvirt] [PATCH 2/2] schema: Indent interface properly
After recent change, the indentation for interface definition in the
Relax-NG schema is off. This whitespace-only patch fixes that in order
for the previous patch to be cleaner and more readable.
To be viewed with '-w' (ignoring whitespaces).
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
docs/schemas/domaincommon.rng | 762 +++++++++++++++++++++---------------------
1 file changed, 381 insertions(+), 381 deletions(-)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 4ed9845..b8c3e0e 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2029,46 +2029,46 @@
-->
<define name="interface">
<element name="interface">
- <interleave>
- <choice>
- <group>
- <attribute name="type">
- <value>bridge</value>
- </attribute>
- <interleave>
- <optional>
- <element name="source">
- <attribute name="bridge">
- <ref name="deviceName"/>
- </attribute>
- <empty/>
- </element>
- </optional>
- <optional>
- <ref name="virtualPortProfile"/>
- </optional>
- </interleave>
- </group>
- <group>
- <attribute name="type">
- <value>ethernet</value>
- </attribute>
- <interleave>
- <optional>
- <element name="source">
- <attribute name="dev">
- <ref name="deviceName"/>
- </attribute>
- <empty/>
- </element>
- </optional>
- </interleave>
- </group>
- <group>
- <attribute name="type">
- <value>vhostuser</value>
- </attribute>
- <interleave>
+ <interleave>
+ <choice>
+ <group>
+ <attribute name="type">
+ <value>bridge</value>
+ </attribute>
+ <interleave>
+ <optional>
+ <element name="source">
+ <attribute name="bridge">
+ <ref name="deviceName"/>
+ </attribute>
+ <empty/>
+ </element>
+ </optional>
+ <optional>
+ <ref name="virtualPortProfile"/>
+ </optional>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>ethernet</value>
+ </attribute>
+ <interleave>
+ <optional>
+ <element name="source">
+ <attribute name="dev">
+ <ref name="deviceName"/>
+ </attribute>
+ <empty/>
+ </element>
+ </optional>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>vhostuser</value>
+ </attribute>
+ <interleave>
<element name="source">
<attribute name="type">
<choice>
@@ -2086,390 +2086,390 @@
</attribute>
<empty/>
</element>
- </interleave>
- </group>
- <group>
- <attribute name="type">
- <value>network</value>
- </attribute>
- <interleave>
- <element name="source">
- <attribute name="network">
- <ref name="deviceName"/>
- </attribute>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>network</value>
+ </attribute>
+ <interleave>
+ <element name="source">
+ <attribute name="network">
+ <ref name="deviceName"/>
+ </attribute>
+ <optional>
+ <attribute name="portgroup">
+ <ref name="deviceName"/>
+ </attribute>
+ </optional>
+ <empty/>
+ </element>
<optional>
- <attribute name="portgroup">
+ <ref name="virtualPortProfile"/>
+ </optional>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>direct</value>
+ </attribute>
+ <interleave>
+ <element name="source">
+ <attribute name="dev">
<ref name="deviceName"/>
</attribute>
+ <optional>
+ <attribute name="mode">
+ <ref name="bridgeMode"/>
+ </attribute>
+ </optional>
+ <empty/>
+ </element>
+ <optional>
+ <ref name="virtualPortProfile"/>
</optional>
- <empty/>
- </element>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>user</value>
+ </attribute>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>internal</value>
+ </attribute>
+ <interleave>
+ <element name="source">
+ <attribute name="name">
+ <ref name="deviceName"/>
+ </attribute>
+ <empty/>
+ </element>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <choice>
+ <value>mcast</value>
+ <value>client</value>
+ </choice>
+ </attribute>
+ <interleave>
+ <element name="source">
+ <attribute name="address">
+ <ref name="ipv4Addr"/>
+ </attribute>
+ <attribute name="port">
+ <ref name="PortNumber"/>
+ </attribute>
+ <empty/>
+ </element>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>server</value>
+ </attribute>
+ <interleave>
+ <element name="source">
+ <optional>
+ <attribute name="address">
+ <ref name="ipv4Addr"/>
+ </attribute>
+ </optional>
+ <attribute name="port">
+ <ref name="PortNumber"/>
+ </attribute>
+ <empty/>
+ </element>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>hostdev</value>
+ </attribute>
<optional>
- <ref name="virtualPortProfile"/>
- </optional>
- </interleave>
- </group>
- <group>
- <attribute name="type">
- <value>direct</value>
- </attribute>
- <interleave>
- <element name="source">
- <attribute name="dev">
- <ref name="deviceName"/>
+ <attribute name="managed">
+ <ref name="virYesNo"/>
</attribute>
+ </optional>
+ <interleave>
+ <element name="source">
+ <optional>
+ <attribute name="missing">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
+ <choice>
+ <group>
+ <ref name="usbproduct"/>
+ <optional>
+ <ref name="usbaddress"/>
+ </optional>
+ </group>
+ <element name="address">
+ <choice>
+ <group>
+ <attribute name="type">
+ <value>pci</value>
+ </attribute>
+ <ref name="pciaddress"/>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>usb</value>
+ </attribute>
+ <attribute name="bus">
+ <ref name="usbAddr"/>
+ </attribute>
+ <attribute name="device">
+ <ref name="usbPort"/>
+ </attribute>
+ </group>
+ </choice>
+ </element>
+ </choice>
+ </element>
<optional>
- <attribute name="mode">
- <ref name="bridgeMode"/>
- </attribute>
+ <ref name="virtualPortProfile"/>
</optional>
- <empty/>
- </element>
- <optional>
- <ref name="virtualPortProfile"/>
- </optional>
- </interleave>
- </group>
- <group>
- <attribute name="type">
- <value>user</value>
- </attribute>
- </group>
- <group>
- <attribute name="type">
- <value>internal</value>
- </attribute>
- <interleave>
- <element name="source">
- <attribute name="name">
- <ref name="deviceName"/>
- </attribute>
- <empty/>
- </element>
- </interleave>
- </group>
- <group>
- <attribute name="type">
- <choice>
- <value>mcast</value>
- <value>client</value>
- </choice>
- </attribute>
- <interleave>
- <element name="source">
- <attribute name="address">
- <ref name="ipv4Addr"/>
- </attribute>
- <attribute name="port">
- <ref name="PortNumber"/>
- </attribute>
- <empty/>
- </element>
- </interleave>
- </group>
- <group>
- <attribute name="type">
- <value>server</value>
- </attribute>
- <interleave>
- <element name="source">
+ </interleave>
+ </group>
+ </choice>
+ <optional>
+ <element name="target">
+ <attribute name="dev">
+ <ref name="deviceName"/>
+ </attribute>
+ <empty/>
+ </element>
+ </optional>
+ <optional>
+ <element name="guest">
+ <interleave>
<optional>
- <attribute name="address">
- <ref name="ipv4Addr"/>
+ <attribute name="dev">
+ <ref name="deviceName"/>
</attribute>
</optional>
- <attribute name="port">
- <ref name="PortNumber"/>
- </attribute>
- <empty/>
- </element>
- </interleave>
- </group>
- <group>
- <attribute name="type">
- <value>hostdev</value>
- </attribute>
- <optional>
- <attribute name="managed">
- <ref name="virYesNo"/>
- </attribute>
- </optional>
- <interleave>
- <element name="source">
<optional>
- <attribute name="missing">
- <ref name="virYesNo"/>
+ <attribute name="actual">
+ <ref name="deviceName"/>
</attribute>
</optional>
- <choice>
- <group>
- <ref name="usbproduct"/>
- <optional>
- <ref name="usbaddress"/>
- </optional>
- </group>
- <element name="address">
- <choice>
- <group>
- <attribute name="type">
- <value>pci</value>
- </attribute>
- <ref name="pciaddress"/>
- </group>
- <group>
- <attribute name="type">
- <value>usb</value>
- </attribute>
- <attribute name="bus">
- <ref name="usbAddr"/>
- </attribute>
- <attribute name="device">
- <ref name="usbPort"/>
- </attribute>
- </group>
- </choice>
- </element>
- </choice>
- </element>
- <optional>
- <ref name="virtualPortProfile"/>
- </optional>
- </interleave>
- </group>
- </choice>
- <optional>
- <element name="target">
- <attribute name="dev">
- <ref name="deviceName"/>
- </attribute>
- <empty/>
- </element>
- </optional>
- <optional>
- <element name="guest">
- <interleave>
+ </interleave>
+ <empty/>
+ </element>
+ </optional>
+ <optional>
+ <element name="mac">
+ <attribute name="address">
+ <ref name="uniMacAddr"/>
+ </attribute>
+ <empty/>
+ </element>
+ </optional>
+ <zeroOrMore>
+ <element name="ip">
+ <attribute name="address">
+ <ref name="ipAddr"/>
+ </attribute>
<optional>
- <attribute name="dev">
- <ref name="deviceName"/>
+ <attribute name="family">
+ <ref name="addr-family"/>
</attribute>
</optional>
<optional>
- <attribute name="actual">
- <ref name="deviceName"/>
+ <attribute name="prefix">
+ <ref name="ipPrefix"/>
</attribute>
</optional>
- </interleave>
- <empty/>
- </element>
- </optional>
- <optional>
- <element name="mac">
- <attribute name="address">
- <ref name="uniMacAddr"/>
- </attribute>
- <empty/>
- </element>
- </optional>
- <zeroOrMore>
- <element name="ip">
- <attribute name="address">
- <ref name="ipAddr"/>
- </attribute>
- <optional>
- <attribute name="family">
- <ref name="addr-family"/>
+ <empty/>
+ </element>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="route"/>
+ </zeroOrMore>
+ <optional>
+ <element name="script">
+ <attribute name="path">
+ <ref name="filePath"/>
</attribute>
- </optional>
- <optional>
- <attribute name="prefix">
- <ref name="ipPrefix"/>
+ <empty/>
+ </element>
+ </optional>
+ <optional>
+ <element name="model">
+ <attribute name="type">
+ <data type="string">
+ <param name='pattern'>[a-zA-Z0-9\-_]+</param>
+ </data>
</attribute>
- </optional>
- <empty/>
- </element>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="route"/>
- </zeroOrMore>
- <optional>
- <element name="script">
- <attribute name="path">
- <ref name="filePath"/>
- </attribute>
- <empty/>
- </element>
- </optional>
- <optional>
- <element name="model">
- <attribute name="type">
- <data type="string">
- <param name='pattern'>[a-zA-Z0-9\-_]+</param>
- </data>
- </attribute>
- <empty/>
- </element>
- </optional>
- <optional>
- <element name="backend">
- <optional>
- <attribute name='tap'>
- <ref name='absFilePath'/>
- </attribute>
- </optional>
- <optional>
- <attribute name='vhost'>
- <ref name='absFilePath'/>
- </attribute>
- </optional>
- </element>
- </optional>
- <optional>
- <element name="driver">
- <choice>
- <group>
- <attribute name="name">
- <choice>
- <value>kvm</value>
- <value>vfio</value>
- </choice>
+ <empty/>
+ </element>
+ </optional>
+ <optional>
+ <element name="backend">
+ <optional>
+ <attribute name='tap'>
+ <ref name='absFilePath'/>
</attribute>
- </group>
- <group>
- <optional>
+ </optional>
+ <optional>
+ <attribute name='vhost'>
+ <ref name='absFilePath'/>
+ </attribute>
+ </optional>
+ </element>
+ </optional>
+ <optional>
+ <element name="driver">
+ <choice>
+ <group>
<attribute name="name">
<choice>
- <value>qemu</value>
- <value>vhost</value>
+ <value>kvm</value>
+ <value>vfio</value>
</choice>
</attribute>
- </optional>
- <optional>
- <attribute name='queues'>
- <ref name="positiveInteger"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="txmode">
- <choice>
- <value>iothread</value>
- <value>timer</value>
- </choice>
- </attribute>
- </optional>
- <optional>
- <ref name="ioeventfd"/>
- </optional>
- <optional>
- <ref name="event_idx"/>
- </optional>
- </group>
- </choice>
- <interleave>
- <optional>
- <element name='host'>
- <optional>
- <attribute name='csum'>
- <ref name="virOnOff"/>
- </attribute>
- </optional>
+ </group>
+ <group>
<optional>
- <attribute name='gso'>
- <ref name="virOnOff"/>
+ <attribute name="name">
+ <choice>
+ <value>qemu</value>
+ <value>vhost</value>
+ </choice>
</attribute>
</optional>
<optional>
- <attribute name='tso4'>
- <ref name="virOnOff"/>
+ <attribute name='queues'>
+ <ref name="positiveInteger"/>
</attribute>
</optional>
<optional>
- <attribute name='tso6'>
- <ref name="virOnOff"/>
+ <attribute name="txmode">
+ <choice>
+ <value>iothread</value>
+ <value>timer</value>
+ </choice>
</attribute>
</optional>
<optional>
- <attribute name='ecn'>
- <ref name="virOnOff"/>
- </attribute>
+ <ref name="ioeventfd"/>
</optional>
<optional>
- <attribute name='ufo'>
- <ref name="virOnOff"/>
- </attribute>
+ <ref name="event_idx"/>
</optional>
- </element>
- </optional>
+ </group>
+ </choice>
+ <interleave>
+ <optional>
+ <element name='host'>
+ <optional>
+ <attribute name='csum'>
+ <ref name="virOnOff"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name='gso'>
+ <ref name="virOnOff"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name='tso4'>
+ <ref name="virOnOff"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name='tso6'>
+ <ref name="virOnOff"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name='ecn'>
+ <ref name="virOnOff"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name='ufo'>
+ <ref name="virOnOff"/>
+ </attribute>
+ </optional>
+ </element>
+ </optional>
+ <optional>
+ <element name='guest'>
+ <optional>
+ <attribute name='csum'>
+ <ref name="virOnOff"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name='tso4'>
+ <ref name="virOnOff"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name='tso6'>
+ <ref name="virOnOff"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name='ecn'>
+ <ref name="virOnOff"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name='ufo'>
+ <ref name="virOnOff"/>
+ </attribute>
+ </optional>
+ </element>
+ </optional>
+ </interleave>
+ </element>
+ </optional>
+ <optional>
+ <ref name="alias"/>
+ </optional>
+ <optional>
+ <ref name="address"/>
+ </optional>
+ <optional>
+ <element name="filterref">
+ <ref name="filterref-node-attributes"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="tune">
<optional>
- <element name='guest'>
- <optional>
- <attribute name='csum'>
- <ref name="virOnOff"/>
- </attribute>
- </optional>
- <optional>
- <attribute name='tso4'>
- <ref name="virOnOff"/>
- </attribute>
- </optional>
- <optional>
- <attribute name='tso6'>
- <ref name="virOnOff"/>
- </attribute>
- </optional>
- <optional>
- <attribute name='ecn'>
- <ref name="virOnOff"/>
- </attribute>
- </optional>
- <optional>
- <attribute name='ufo'>
- <ref name="virOnOff"/>
- </attribute>
- </optional>
+ <!-- size of send buffer for network tap devices -->
+ <element name="sndbuf">
+ <ref name="unsignedInt"/>
</element>
</optional>
- </interleave>
- </element>
- </optional>
- <optional>
- <ref name="alias"/>
- </optional>
- <optional>
- <ref name="address"/>
- </optional>
- <optional>
- <element name="filterref">
- <ref name="filterref-node-attributes"/>
- </element>
- </optional>
- <optional>
- <element name="tune">
- <optional>
- <!-- size of send buffer for network tap devices -->
- <element name="sndbuf">
- <ref name="unsignedInt"/>
- </element>
- </optional>
- </element>
- </optional>
- <optional>
- <ref name="deviceBoot"/>
- </optional>
- <optional>
- <ref name="rom"/>
- </optional>
- <optional>
- <ref name="bandwidth"/>
- </optional>
- <optional>
- <ref name="vlan"/>
- </optional>
- <optional>
- <attribute name="trustGuestRxFilters">
- <ref name="virYesNo"/>
- </attribute>
- </optional>
- </interleave>
+ </element>
+ </optional>
+ <optional>
+ <ref name="deviceBoot"/>
+ </optional>
+ <optional>
+ <ref name="rom"/>
+ </optional>
+ <optional>
+ <ref name="bandwidth"/>
+ </optional>
+ <optional>
+ <ref name="vlan"/>
+ </optional>
+ <optional>
+ <attribute name="trustGuestRxFilters">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
+ </interleave>
</element>
</define>
--
2.2.2
12:50 a.m.
On Fri, Jan 30, 2015 at 06:55:05AM +0100, Martin Kletzander wrote:
Let's save 21 lines just because I've found out a way how to
convince
xmllint to do something we thought it can't. The first patch is the
brains of this operation, the second one is just a cleaner guy; best
served with '-w'.
Oh, never mind, NACK this. The problem is one story deeper. For
those interested:
With these patches, one type of XML still fails to validate; those
where e.g. <vlan/> comes before <virtualport/>. That is most likely
caused by virtualPortProfile being enclosed in <interleave/> with
<source/>. If I were to remove that, we'd be validating perfectly,
*but* it would be invalid to have <source/> after <virtualport/>.
In other words, if you have a group and elements in that group can
interleave, the group can interleave with other options only as a
group (no element it can interleave with can be placed inside that
group) -- that makes sense, until...
If, however, elements in that group cannot interleave, it means that
those elements must be specified in the same exact order, *but*
elements the whole group can interleave with *can* be specified inside
that group without any problems.
I should've just listened to Michal and leave it like that. xmllint-- rng--
Martin Kletzander (2):
schema: Remove unnecessary interface-options
schema: Indent interface properly
docs/schemas/domaincommon.rng | 787 ++++++++++++++++++++----------------------
1 file changed, 383 insertions(+), 404 deletions(-)
--
2.2.2
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
2:49 p.m.
On 01/29/2015 11:50 PM, Martin Kletzander wrote:
In other words, if you have a group and elements in that group can
interleave, the group can interleave with other options only as a
group (no element it can interleave with can be placed inside that
group) -- that makes sense, until...
If, however, elements in that group cannot interleave, it means that
those elements must be specified in the same exact order, *but*
elements the whole group can interleave with *can* be specified inside
that group without any problems.
I'm pretty sure that I've mixed interleaved defines together, with full
flexibility. You just have to remember to have multiple layers of
<interleave> - both at the parent that is using the reference to the
define, and in the define that defines elements to be interleaved.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
3584
days inactive
3584
days old
4 comments
2 participants
participants (2)
-
Eric Blake -
Martin Kletzander