[PATCH 1/2] schema: Remove unnecessary interface-options

[Martin Kletzander <mkletzan@xxxxxxxxxx>]

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@xxxxxxxxxx>
---
 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

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list