The definiton of scsi adapter in storagespool.rng (sourceinfoadapter)
can be used by scsi hostdev. 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@xxxxxxxxxxxxxx>
---
docs/schemas/basictypes.rng | 42 +++++++++++++++++++++++++++++++++++++++++
docs/schemas/domaincommon.rng | 5 ----
docs/schemas/storagepool.rng | 42 -----------------------------------------
3 files changed, 42 insertions(+), 47 deletions(-)
diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
index e6cf907..adaedd8 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 7b3d637..2c31f76 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 43283d2..eb56497 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>
--
1.7.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list