schemas: Move PortNumber and sourceinfoadapter to basictypes.rng

The definiton of scsi adapter in storagespool.rng (sourceinfoadapter)
can be used by scsi hostdev in later patch. Move it to basictypes.rng.

PortNumber is defined in both domaincommon.rng and storagespool.rng,
simplify it by moving it to basictypes.rng.

Signed-off-by: Han Cheng <hanc.fnst@cn.fujitsu.com>

diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
index e6cf90753ec3508e214806dd555ab607c75ced4d..adaedd8794a1a1547ba1d292fe43b0f6b39fe26d 100644 (file)
--- a/docs/schemas/basictypes.rng
+++ b/docs/schemas/basictypes.rng
@@ -330,4 +330,46 @@
     </choice>
   </define>
 
+  <define name="PortNumber">
+    <data type="short">
+      <param name="minInclusive">-1</param>
+    </data>
+  </define>
+
+  <define name='sourceinfoadapter'>
+    <element name='adapter'>
+      <choice>
+        <group>
+          <!-- To keep back-compat, 'type' is not mandatory for
+           scsi_host adapter -->
+          <optional>
+            <attribute name='type'>
+              <value>scsi_host</value>
+            </attribute>
+          </optional>
+          <attribute name='name'>
+            <text/>
+          </attribute>
+        </group>
+        <group>
+          <attribute name='type'>
+            <value>fc_host</value>
+          </attribute>
+          <optional>
+            <attribute name='parent'>
+              <text/>
+            </attribute>
+          </optional>
+          <attribute name='wwnn'>
+            <ref name='wwn'/>
+          </attribute>
+          <attribute name='wwpn'>
+            <ref name='wwn'/>
+          </attribute>
+        </group>
+      </choice>
+      <empty/>
+    </element>
+  </define>
+
 </grammar>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 7b3d6376afceedd1d45273244c47b4744f93fb91..2c31f7655077c60174de10de894d79210203b14e 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -3873,11 +3873,6 @@
       <param name="minInclusive">-1</param>
     </data>
   </define>
-  <define name="PortNumber">
-    <data type="short">
-      <param name="minInclusive">-1</param>
-    </data>
-  </define>
   <!-- weight currently is in range [100, 1000] -->
   <define name="weight">
     <data type="unsignedInt">

diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index 43283d2c526fad9f1d0a0daa042b7ad1c5194cf9..eb56497ea235a9e3f135fb1e64ec654d8d413f09 100644 (file)
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -274,42 +274,6 @@
     </element>
   </define>
 
-  <define name='sourceinfoadapter'>
-    <element name='adapter'>
-      <choice>
-        <group>
-          <!-- To keep back-compat, 'type' is not mandatory for
-           scsi_host adapter -->
-          <optional>
-            <attribute name='type'>
-              <value>scsi_host</value>
-            </attribute>
-          </optional>
-          <attribute name='name'>
-            <text/>
-          </attribute>
-        </group>
-        <group>
-          <attribute name='type'>
-            <value>fc_host</value>
-          </attribute>
-          <optional>
-            <attribute name='parent'>
-              <text/>
-            </attribute>
-          </optional>
-          <attribute name='wwnn'>
-            <ref name='wwn'/>
-          </attribute>
-          <attribute name='wwpn'>
-            <ref name='wwn'/>
-          </attribute>
-        </group>
-      </choice>
-      <empty/>
-    </element>
-  </define>
-
   <define name='sourceinfoname'>
     <element name='name'>
       <text/>
@@ -552,10 +516,4 @@
     </data>
   </define>
 
-  <define name="PortNumber">
-    <data type="short">
-      <param name="minInclusive">-1</param>
-    </data>
-  </define>
-
 </grammar>