conf: move storage formats to common RNG file

We had incomplete RelaxNG support for storage formats listed
in virstoragefile.h: commit 027bf2e added 'vdi' but forgot
to update the <volume> and <domain> xml lists; the <volume>
list was also missing 'fat' and 'vhd'.  Maintaining two lists
is a recipe for them getting out of sync, so make the list
common so that both contexts benefit the next time we add a
format in a single location.

* docs/schemas/domaincommon.rng (storageFormat): Move...
* docs/schemas/storagecommon.rng: ...here, and add vdi.
* docs/schemas/storagevol.rng (formatfile): Use common list.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 7fc0cfffcb0bd0c631078cc724f532074b17a33e..59f3fdd525fef52edae66f0bfb23a52c0a84814b 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1500,24 +1500,7 @@
       </attribute>
     </optional>
   </define>
-  <define name='storageFormat'>
-    <choice>
-      <value>raw</value>
-      <value>dir</value>
-      <value>bochs</value>
-      <value>cloop</value>
-      <value>cow</value>
-      <value>dmg</value>
-      <value>iso</value>
-      <value>qcow</value>
-      <value>qcow2</value>
-      <value>qed</value>
-      <value>vmdk</value>
-      <value>vpc</value>
-      <value>fat</value>
-      <value>vhd</value>
-    </choice>
-  </define>
+
   <define name="driverCache">
     <attribute name="cache">
       <choice>

diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng
index 54cf6b42546dbcf515606a50c3a9d72641c31caf..37b43c64dd373ffa281bb31b769b7750c1af3fc0 100644 (file)
--- a/docs/schemas/storagecommon.rng
+++ b/docs/schemas/storagecommon.rng
@@ -52,4 +52,24 @@
     </element>
   </define>
 
+  <define name='storageFormat'>
+    <choice>
+      <value>raw</value>
+      <value>dir</value>
+      <value>bochs</value>
+      <value>cloop</value>
+      <value>cow</value>
+      <value>dmg</value>
+      <value>iso</value>
+      <value>qcow</value>
+      <value>qcow2</value>
+      <value>qed</value>
+      <value>vmdk</value>
+      <value>vpc</value>
+      <value>fat</value>
+      <value>vhd</value>
+      <value>vdi</value>
+    </choice>
+  </define>
+
 </grammar>

diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng
index df8c1eb7a53f9eea3033270d8b81909c2d2d6610..3798476f0354c48bcca4be5bc224c6b937018d29 100644 (file)
--- a/docs/schemas/storagevol.rng
+++ b/docs/schemas/storagevol.rng
@@ -212,18 +212,7 @@
   <define name='formatfile'>
     <choice>
       <value>unknown</value>
-      <value>raw</value>
-      <value>dir</value>
-      <value>bochs</value>
-      <value>cloop</value>
-      <value>cow</value>
-      <value>dmg</value>
-      <value>iso</value>
-      <value>qcow</value>
-      <value>qcow2</value>
-      <value>qed</value>
-      <value>vmdk</value>
-      <value>vpc</value>
+      <ref name='storageFormat'/>
     </choice>
   </define>