From: Han Cheng <hanc.fnst@cn.fujitsu.com>
Date: Tue, 9 Apr 2013 02:32:41 +0000 (+0800)
Subject: schemas: Move PortNumber and sourceinfoadapter to basictypes.rng
X-Git-Tag: v1.0.5-rc1~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f5837aac2c726dcfb83423c7c698b80f402b9ac;p=thirdparty%2Flibvirt.git

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 e6cf90753e..adaedd8794 100644
--- 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 7b3d6376af..2c31f76550 100644
--- 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 43283d2c52..eb56497ea2 100644
--- 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>