fix storage volume inconsistencies in schema and doc

* docs/schemas/storagevol.rng docs/formatstorage.html[.in]
  tests/storagevolschemadata/vol-qcow2.xml: fix storage volume
  inconsistencies in schema and document, patch by Ryota Ozaki
daniel

diff --git a/ChangeLog b/ChangeLog
index 88277a0a2469ed40d0485a2596cde356ae7dd101..975e816360378d07ac421ce6fa902ca55c5bca26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri May 29 14:26:10 CEST 2009 Daniel Veillard <veillard@redhat.com>
+
+       * docs/schemas/storagevol.rng docs/formatstorage.html[.in]
+         tests/storagevolschemadata/vol-qcow2.xml: fix storage volume
+         inconsistencies in schema and document, patch by Ryota Ozaki
+
 Fri May 29 14:07:13 CEST 2009 Daniel Veillard <veillard@redhat.com>
 
        * po/*: update of many localizations, regenerate the po

diff --git a/docs/formatstorage.html b/docs/formatstorage.html
index fc479917ed71301c1e3303ad2960aedd456f8598..e96712db3d23e8ea1ec3b920ed43e5ace7e08e94 100644 (file)
--- a/docs/formatstorage.html
+++ b/docs/formatstorage.html
@@ -294,7 +294,7 @@
           <a name="StorageVolFirst" id="StorageVolFirst">General metadata</a>
         </h3>
         <pre>
-      &lt;volume type="file"&gt;
+      &lt;volume&gt;
        &lt;name&gt;sparse.img&lt;/name&gt;
        &lt;key&gt;/var/lib/xen/images/sparse.img&lt;/key&gt;
         &lt;allocation&gt;0&lt;/allocation&gt;
@@ -432,7 +432,7 @@
           <a name="exampleVol" id="exampleVol">Storage volume</a>
         </h3>
         <pre>
-      &lt;volume type="file"&gt;
+      &lt;volume&gt;
        &lt;name&gt;sparse.img&lt;/name&gt;
        &lt;allocation&gt;0&lt;/allocation&gt;
        &lt;capacity unit="T"&gt;1&lt;/capacity&gt;

diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in
index 60e2ebc3f0b3471155e342a4af609793e4d74c31..4878d729ebc70c89d8618c3ce2a427e80bf03d55 100644 (file)
--- a/docs/formatstorage.html.in
+++ b/docs/formatstorage.html.in
@@ -183,7 +183,7 @@
     <h3><a name="StorageVolFirst">General metadata</a></h3>
 
     <pre>
-      &lt;volume type="file"&gt;
+      &lt;volume&gt;
        &lt;name&gt;sparse.img&lt;/name&gt;
        &lt;key&gt;/var/lib/xen/images/sparse.img&lt;/key&gt;
         &lt;allocation&gt;0&lt;/allocation&gt;
@@ -353,7 +353,7 @@
     <h3><a name="exampleVol">Storage volume</a></h3>
 
     <pre>
-      &lt;volume type="file"&gt;
+      &lt;volume&gt;
        &lt;name&gt;sparse.img&lt;/name&gt;
        &lt;allocation&gt;0&lt;/allocation&gt;
        &lt;capacity unit="T"&gt;1&lt;/capacity&gt;

diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng
index c7bd3a70c74758127623816a34fa4244d0c9693d..7dc7876d9e660208d8c6cbeaa4e91586896edaf0 100644 (file)
--- a/docs/schemas/storagevol.rng
+++ b/docs/schemas/storagevol.rng
@@ -29,6 +29,11 @@
   <define name='sizing'>
     <optional>
       <element name='capacity'>
+        <optional>
+         <attribute name='unit'>
+           <ref name='unit'/>
+         </attribute>
+        </optional>
        <ref name='uint'/>
       </element>
     </optional>
@@ -183,5 +188,11 @@
     </data>
   </define>
 
+  <define name='unit'>
+    <data type='string'>
+      <param name="pattern">[kKmMgGtTpPyYzZ]</param>
+    </data>
+  </define>
+
 
 </grammar>

diff --git a/tests/storagevolschemadata/vol-qcow2.xml b/tests/storagevolschemadata/vol-qcow2.xml
index a3f5cca5094a3e98b1e8c9de789c06de92c87bb4..c1cf02f4616bd3727ff291e8f1c102da26ed6e8e 100644 (file)
--- a/tests/storagevolschemadata/vol-qcow2.xml
+++ b/tests/storagevolschemadata/vol-qcow2.xml
@@ -3,7 +3,7 @@
   <key>/var/lib/libvirt/images/OtherDemo.img</key>
   <source>
   </source>
-  <capacity>5242880000</capacity>
+  <capacity unit="G">5</capacity>
   <allocation>294912</allocation>
   <target>
     <path>/var/lib/libvirt/images/OtherDemo.img</path>