[libvirt] [PATCH 2/2] schema: Indent interface properly

Martin Kletzander mkletzan at redhat.com
Fri Jan 30 05:55:07 UTC 2015


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 at 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




More information about the libvir-list mailing list