[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH 2/6] Add new clock mode allowing variable adjustments



Daniel P. Berrange wrote:
...
>> > diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
>> > index 1ff0944..d295bfe 100644
>> > --- a/docs/schemas/domain.rng
>> > +++ b/docs/schemas/domain.rng
>> > @@ -297,12 +297,24 @@
>> >    <define name="clock">
>> >      <optional>
>> >        <element name="clock">
>> > -        <attribute name="offset">
>> > -          <choice>
>> > +	<choice>
>> > +          <attribute name="offset">
>>
>>   hum isn't that inserting tabs in the XML that we remove from time to
>>   time :-) ?
>
> Hmm, our syntax-check only seems to validate no-TABS for source
> code files, not schemas/docs

Here's the change to the syntax-check rule,
followed by the change to the code to make those files comply.
If everyone agrees, I'll reverse the order before pushing,
so that make syntax-check passes after each commit.

>From a5a73e3ec03deed1e411b05e3e32ef4194acbf16 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering redhat com>
Date: Mon, 1 Mar 2010 20:05:06 +0100
Subject: [PATCH 1/2] maint: disallow TAB-in-indentation also in *.rng files

* cfg.mk (sc_TAB_in_indentation): Also check .rng files.
---
 cfg.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 8317ae2..680c312 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -132,7 +132,7 @@ sc_prohibit_ctype_h:
 sc_TAB_in_indentation:
 	@grep -lE '^ *	' /dev/null					\
 	     $$($(VC_LIST_EXCEPT)					\
-		| grep -E '\.[ch](\.in)?$$'				\
+		| grep -E '\.(rng|[ch](\.in)?)$$'			\
 		| grep -v '^gnulib/') &&				\
 	  { echo '$(ME): found TAB(s) used for indentation in C sources;'\
 	      'use spaces' 1>&2; exit 1; } || :
--
1.7.0.1.414.g89213d


>From 87e8002f2f18a0295f2c2dd7c39c5e937585ffea Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering redhat com>
Date: Mon, 1 Mar 2010 20:09:26 +0100
Subject: [PATCH 2/2] maint: convert leading TABs in *.rng files to equivalent spaces

* docs/schemas/capability.rng: Likewise.
* docs/schemas/network.rng: Likewise.
* docs/schemas/nodedev.rng: Likewise.
* docs/schemas/storagepool.rng: Likewise.
* docs/schemas/storagevol.rng: Likewise.
Use these commands:
t=$'\t'
git ls-files | grep '\.rng$' | xargs grep -lE "^ *$t" \
  | xargs perl -MText::Tabs -ni -le \
    '$m=/^( *\t[ \t]*)(.*)/; print $m ? expand($1) . $2 : $_'
---
 docs/schemas/capability.rng  |  188 +++++++++++++++++++++---------------------
 docs/schemas/network.rng     |   16 ++--
 docs/schemas/nodedev.rng     |   94 +++++++++++-----------
 docs/schemas/storagepool.rng |  172 +++++++++++++++++++-------------------
 docs/schemas/storagevol.rng  |   88 ++++++++++----------
 5 files changed, 279 insertions(+), 279 deletions(-)

diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
index 378652e..eb3c50a 100644
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -11,7 +11,7 @@
       <ref name='hostcaps'/>

       <zeroOrMore>
-	<ref name='guestcaps'/>
+        <ref name='guestcaps'/>
       </zeroOrMore>
     </element>
   </define>
@@ -19,24 +19,24 @@
   <define name='hostcaps'>
     <element name='host'>
       <element name='cpu'>
-	<element name='arch'>
-	  <ref name='archnames'/>
-	</element>
-	<optional>
-	  <ref name='cpufeatures'/>
-	</optional>
-	<optional>
-	  <ref name='cpuspec'/>
-	</optional>
+        <element name='arch'>
+          <ref name='archnames'/>
+        </element>
+        <optional>
+          <ref name='cpufeatures'/>
+        </optional>
+        <optional>
+          <ref name='cpuspec'/>
+        </optional>
       </element>
       <optional>
-	<ref name='migration'/>
+        <ref name='migration'/>
       </optional>
       <optional>
-	<ref name='topology'/>
+        <ref name='topology'/>
       </optional>
       <optional>
-	<ref name='secmodel'/>
+        <ref name='secmodel'/>
       </optional>
     </element>
   </define>
@@ -56,16 +56,16 @@
   <define name='cpufeatures'>
     <element name='features'>
       <optional>
-	<element name='pae'><empty/></element>
+        <element name='pae'><empty/></element>
       </optional>
       <optional>
-	<element name='nonpae'><empty/></element>
+        <element name='nonpae'><empty/></element>
       </optional>
       <optional>
-	<element name='vmx'><empty/></element>
+        <element name='vmx'><empty/></element>
       </optional>
       <optional>
-	<element name='svm'><empty/></element>
+        <element name='svm'><empty/></element>
       </optional>
     </element>
   </define>
@@ -98,22 +98,22 @@
   <define name='migration'>
     <element name='migration_features'>
       <optional>
-	<element name='live'>
-	  <empty/>
-	</element>
+        <element name='live'>
+          <empty/>
+        </element>
       </optional>
       <optional>
-	<element name='uri_transports'>
-	  <oneOrMore>
-	    <element name='uri_transport'>
-	      <choice>
-		<value>esx</value>
-		<value>tcp</value>
-		<value>xenmigr</value>
-	      </choice>
-	    </element>
-	  </oneOrMore>
-	</element>
+        <element name='uri_transports'>
+          <oneOrMore>
+            <element name='uri_transport'>
+              <choice>
+                <value>esx</value>
+                <value>tcp</value>
+                <value>xenmigr</value>
+              </choice>
+            </element>
+          </oneOrMore>
+        </element>
       </optional>
     </element>
   </define>
@@ -121,12 +121,12 @@
   <define name='topology'>
     <element name='topology'>
       <element name='cells'>
-	<attribute name='num'>
-	  <ref name='uint'/>
-	</attribute>
-	<oneOrMore>
-	  <ref name='cell'/>
-	</oneOrMore>
+        <attribute name='num'>
+          <ref name='uint'/>
+        </attribute>
+        <oneOrMore>
+          <ref name='cell'/>
+        </oneOrMore>
       </element>
     </element>
   </define>
@@ -134,18 +134,18 @@
   <define name='cell'>
     <element name='cell'>
       <attribute name='id'>
-	<ref name='uint'/>
+        <ref name='uint'/>
       </attribute>

       <optional>
-	<element name='cpus'>
-	  <attribute name='num'>
-	    <ref name='uint'/>
-	  </attribute>
-	  <oneOrMore>
-	    <ref name='cpu'/>
-	  </oneOrMore>
-	</element>
+        <element name='cpus'>
+          <attribute name='num'>
+            <ref name='uint'/>
+          </attribute>
+          <oneOrMore>
+            <ref name='cpu'/>
+          </oneOrMore>
+        </element>
       </optional>
     </element>
   </define>
@@ -153,7 +153,7 @@
   <define name='cpu'>
     <element name='cpu'>
       <attribute name='id'>
-	<ref name='uint'/>
+        <ref name='uint'/>
       </attribute>
     </element>
   </define>
@@ -163,7 +163,7 @@
       <ref name='ostype'/>
       <ref name='arch'/>
       <optional>
-	<ref name='features'/>
+        <ref name='features'/>
       </optional>
     </element>
   </define>
@@ -171,11 +171,11 @@
   <define name='ostype'>
     <element name='os_type'>
       <choice>
-	<value>xen</value> <!-- Xen 3.0 pv -->
-	<value>linux</value> <!-- same as 'xen' - legacy -->
-	<value>hvm</value> <!-- unmodified OS -->
-	<value>exe</value> <!-- For container based virt -->
-	<value>uml</value> <!-- user mode linux -->
+        <value>xen</value> <!-- Xen 3.0 pv -->
+        <value>linux</value> <!-- same as 'xen' - legacy -->
+        <value>hvm</value> <!-- unmodified OS -->
+        <value>exe</value> <!-- For container based virt -->
+        <value>uml</value> <!-- user mode linux -->
       </choice>
     </element>
   </define>
@@ -183,20 +183,20 @@
   <define name='arch'>
     <element name='arch'>
       <attribute name='name'>
-	<ref name='archnames'/>
+        <ref name='archnames'/>
       </attribute>
       <ref name='wordsize'/>
       <optional>
-	<ref name='emulator'/>
+        <ref name='emulator'/>
       </optional>
       <optional>
-	<ref name='loader'/>
+        <ref name='loader'/>
       </optional>
       <zeroOrMore>
-	<ref name='machine'/>
+        <ref name='machine'/>
       </zeroOrMore>
       <oneOrMore>
-	<ref name='domain'/>
+        <ref name='domain'/>
       </oneOrMore>
     </element>
   </define>
@@ -216,9 +216,9 @@
   <define name='wordsize'>
     <element name='wordsize'>
       <choice>
-	<value>31</value>
-	<value>32</value>
-	<value>64</value>
+        <value>31</value>
+        <value>32</value>
+        <value>64</value>
       </choice>
     </element>
   </define>
@@ -237,23 +237,23 @@
   <define name='domain'>
     <element name='domain'>
       <attribute name='type'>
-	<choice>
-	  <value>qemu</value>
-	  <value>kqemu</value>
-	  <value>kvm</value>
-	  <value>xen</value>
-	  <value>uml</value>
-	  <value>lxc</value>
-	  <value>openvz</value>
-	  <value>test</value>
-	</choice>
+        <choice>
+          <value>qemu</value>
+          <value>kqemu</value>
+          <value>kvm</value>
+          <value>xen</value>
+          <value>uml</value>
+          <value>lxc</value>
+          <value>openvz</value>
+          <value>test</value>
+        </choice>
       </attribute>

       <optional>
-	<ref name='emulator'/>
+        <ref name='emulator'/>
       </optional>
       <zeroOrMore>
-	<ref name='machine'/>
+        <ref name='machine'/>
       </zeroOrMore>
     </element>
   </define>
@@ -261,31 +261,31 @@
   <define name='features'>
     <element name='features'>
       <optional>
-	<element name='pae'>
-	  <empty/>
-	</element>
+        <element name='pae'>
+          <empty/>
+        </element>
       </optional>
       <optional>
-	<element name='nonpae'>
-	  <empty/>
-	</element>
+        <element name='nonpae'>
+          <empty/>
+        </element>
       </optional>
       <optional>
-	<element name='ia64_be'>
-	  <empty/>
-	</element>
+        <element name='ia64_be'>
+          <empty/>
+        </element>
       </optional>
       <optional>
-	<element name='acpi'>
-	  <ref name='featuretoggle'/>
-	  <empty/>
-	</element>
+        <element name='acpi'>
+          <ref name='featuretoggle'/>
+          <empty/>
+        </element>
       </optional>
       <optional>
-	<element name='apic'>
-	  <ref name='featuretoggle'/>
-	  <empty/>
-	</element>
+        <element name='apic'>
+          <ref name='featuretoggle'/>
+          <empty/>
+        </element>
       </optional>
       <optional>
         <element name='cpuselection'>
@@ -298,14 +298,14 @@
   <define name='featuretoggle'>
     <attribute name='toggle'>
       <choice>
-	<value>yes</value>
-	<value>no</value>
+        <value>yes</value>
+        <value>no</value>
       </choice>
     </attribute>
     <attribute name='default'>
       <choice>
-	<value>on</value>
-	<value>off</value>
+        <value>on</value>
+        <value>off</value>
       </choice>
     </attribute>
   </define>
diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index adef792..33994bc 100644
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -86,9 +86,9 @@
         <attribute name="netmask"><text/></attribute>
       </optional>
       <optional>
-	<element name="tftp">
-	  <attribute name="root"><text/></attribute>
-	</element>
+        <element name="tftp">
+          <attribute name="root"><text/></attribute>
+        </element>
       </optional>
       <!-- Define the range(s) of IP addresses that the DHCP
            server should hand out -->
@@ -106,14 +106,14 @@
             <attribute name="ip"><text/></attribute>
           </element>
         </zeroOrMore>
-	<optional>
-	  <element name="bootp">
-	    <attribute name="file"><text/></attribute>
+        <optional>
+          <element name="bootp">
+            <attribute name="file"><text/></attribute>
             <optional>
               <attribute name="server"><text/></attribute>
             </optional>
-	  </element>
-	</optional>
+          </element>
+        </optional>
       </element>
     </element>
   </optional>
diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng
index 797b1af..55191d9 100644
--- a/docs/schemas/nodedev.rng
+++ b/docs/schemas/nodedev.rng
@@ -15,7 +15,7 @@
       </optional>

       <zeroOrMore>
-	<ref name="capability"/>
+        <ref name="capability"/>
       </zeroOrMore>
     </element>
   </define>
@@ -23,14 +23,14 @@
   <define name='capability'>
     <element name="capability">
       <choice>
-	<ref name="capsystem"/>
-	<ref name="cappcidev"/>
-	<ref name="capusbdev"/>
-	<ref name="capusbinterface"/>
-	<ref name="capnet"/>
-	<ref name="capscsihost"/>
-	<ref name="capscsi"/>
-	<ref name="capstorage"/>
+        <ref name="capsystem"/>
+        <ref name="cappcidev"/>
+        <ref name="capusbdev"/>
+        <ref name="capusbinterface"/>
+        <ref name="capnet"/>
+        <ref name="capscsihost"/>
+        <ref name="capscsi"/>
+        <ref name="capstorage"/>
       </choice>
     </element>
   </define>
@@ -46,30 +46,30 @@

     <element name='hardware'>
       <optional>
-	<element name='vendor'><text/></element>
+        <element name='vendor'><text/></element>
       </optional>
       <optional>
-	<element name='version'><text/></element>
+        <element name='version'><text/></element>
       </optional>
       <optional>
-	<element name='serial'><text/></element>
+        <element name='serial'><text/></element>
       </optional>

       <element name='uuid'>
-	<ref name='uuid'/>
+        <ref name='uuid'/>
       </element>
     </element>


     <element name='firmware'>
       <optional>
-	<element name='vendor'><text/></element>
+        <element name='vendor'><text/></element>
       </optional>
       <optional>
-	<element name='version'><text/></element>
+        <element name='version'><text/></element>
       </optional>
       <optional>
-	<element name='release_date'><text/></element>
+        <element name='release_date'><text/></element>
       </optional>
     </element>
   </define>
@@ -94,23 +94,23 @@

     <element name='product'>
       <attribute name='id'>
-	<ref name='hexuint'/>
+        <ref name='hexuint'/>
       </attribute>

       <choice>
-	<text/>
-	<empty/>
+        <text/>
+        <empty/>
       </choice>
     </element>

     <element name='vendor'>
       <attribute name='id'>
-	<ref name='hexuint'/>
+        <ref name='hexuint'/>
       </attribute>

       <choice>
-	<text/>
-	<empty/>
+        <text/>
+        <empty/>
       </choice>
     </element>

@@ -130,23 +130,23 @@

     <element name='product'>
       <attribute name='id'>
-	<ref name='hexuint'/>
+        <ref name='hexuint'/>
       </attribute>

       <choice>
-	<text/>
-	<empty/>
+        <text/>
+        <empty/>
       </choice>
     </element>

     <element name='vendor'>
       <attribute name='id'>
-	<ref name='hexuint'/>
+        <ref name='hexuint'/>
       </attribute>

       <choice>
-	<text/>
-	<empty/>
+        <text/>
+        <empty/>
       </choice>
     </element>
   </define>
@@ -171,7 +171,7 @@

     <optional>
       <element name='description'>
-	<text/>
+        <text/>
       </element>
     </optional>
   </define>
@@ -186,7 +186,7 @@
     </element>
     <optional>
       <element name='address'>
-	<ref name='mac'/>
+        <ref name='mac'/>
       </element>
     </optional>

@@ -198,8 +198,8 @@
   <define name='subcapnet'>
     <element name='capability'>
       <choice>
-	<ref name='subcapnet80203'/>
-	<ref name='subcapnet80211'/>
+        <ref name='subcapnet80203'/>
+        <ref name='subcapnet80211'/>
       </choice>
     </element>
   </define>
@@ -261,27 +261,27 @@

     <optional>
       <element name='bus'>
-	<text/>
+        <text/>
       </element>
     </optional>
     <optional>
       <element name='drive_type'>
-	<text/>
+        <text/>
       </element>
     </optional>
     <optional>
       <element name='model'>
-	<text/>
-	</element>
+        <text/>
+        </element>
     </optional>
     <optional>
       <element name='vendor'>
-	<text/>
+        <text/>
       </element>
     </optional>
     <optional>
       <element name='serial'>
-	<text/>
+        <text/>
       </element>
     </optional>

@@ -292,9 +292,9 @@

     <optional>
       <element name='capability'>
-	<attribute name='type'>
-	  <value>hotpluggable</value>
-	</attribute>
+        <attribute name='type'>
+          <value>hotpluggable</value>
+        </attribute>
       </element>
     </optional>
   </define>
@@ -302,17 +302,17 @@
   <define name='capstorageremoveable'>
     <element name='capability'>
       <attribute name='type'>
-	<value>removable</value>
+        <value>removable</value>
       </attribute>
       <element name='media_available'>
-	<choice>
-	  <value>1</value>
-	  <value>0</value>
-	</choice>
+        <choice>
+          <value>1</value>
+          <value>0</value>
+        </choice>
       </element>

       <element name='media_size'>
-	<ref name='uint'/>
+        <ref name='uint'/>
       </element>
       <optional>
         <element name='media_label'>
diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index 247664e..cfcf9a6 100644
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -9,14 +9,14 @@
   <define name='pool'>
     <element name='pool'>
       <choice>
-	<ref name='pooldir'/>
-	<ref name='poolfs'/>
-	<ref name='poolnetfs'/>
-	<ref name='poollogical'/>
-	<ref name='pooldisk'/>
-	<ref name='pooliscsi'/>
-	<ref name='poolscsi'/>
-	<ref name='poolmpath'/>
+        <ref name='pooldir'/>
+        <ref name='poolfs'/>
+        <ref name='poolnetfs'/>
+        <ref name='poollogical'/>
+        <ref name='pooldisk'/>
+        <ref name='pooliscsi'/>
+        <ref name='poolscsi'/>
+        <ref name='poolmpath'/>
       </choice>
     </element>
   </define>
@@ -109,7 +109,7 @@
     </element>
     <optional>
       <element name='uuid'>
-	<ref name='uuid'/>
+        <ref name='uuid'/>
       </element>
     </optional>
   </define>
@@ -117,17 +117,17 @@
   <define name='sizing'>
     <optional>
       <element name='capacity'>
-	<ref name='uint'/>
+        <ref name='uint'/>
       </element>
     </optional>
     <optional>
       <element name='allocation'>
-	<ref name='uint'/>
+        <ref name='uint'/>
       </element>
     </optional>
     <optional>
       <element name='available'>
-	<ref name='uint'/>
+        <ref name='uint'/>
       </element>
     </optional>
   </define>
@@ -135,20 +135,20 @@
   <define name='permissions'>
     <optional>
       <element name='permissions'>
-	<element name='mode'>
-	  <ref name='uint'/>
-	</element>
-	<element name='owner'>
-	  <ref name='uint'/>
-	</element>
-	<element name='group'>
-	  <ref name='uint'/>
-	</element>
-	<optional>
-	  <element name='label'>
-	    <text/>
-	</element>
-	</optional>
+        <element name='mode'>
+          <ref name='uint'/>
+        </element>
+        <element name='owner'>
+          <ref name='uint'/>
+        </element>
+        <element name='group'>
+          <ref name='uint'/>
+        </element>
+        <optional>
+          <element name='label'>
+            <text/>
+        </element>
+        </optional>
       </element>
     </optional>
   </define>
@@ -156,9 +156,9 @@
   <define name='target'>
     <element name='target'>
       <optional>
-	<element name='path'>
-	  <ref name='path'/>
-	</element>
+        <element name='path'>
+          <ref name='path'/>
+        </element>
       </optional>
       <ref name='permissions'/>
     </element>
@@ -167,7 +167,7 @@
   <define name='sourceinfohost'>
     <element name='host'>
       <attribute name='name'>
-	<text/>
+        <text/>
       </attribute>
       <empty/>
     </element>
@@ -176,14 +176,14 @@
   <define name='sourceinfodev'>
     <element name='device'>
       <attribute name='path'>
-	<choice>
-	  <ref name='path'/>
-	  <ref name='name'/>
-	</choice>
+        <choice>
+          <ref name='path'/>
+          <ref name='name'/>
+        </choice>
       </attribute>
       <choice>
-	<empty/>
-	<ref name='devextents'/>
+        <empty/>
+        <ref name='devextents'/>
       </choice>
     </element>
   </define>
@@ -191,7 +191,7 @@
   <define name='initiatorinfoiqn'>
     <element name='iqn'>
       <attribute name='name'>
-	<text/>
+        <text/>
       </attribute>
       <empty/>
     </element>
@@ -200,12 +200,12 @@
   <define name='devextents'>
     <oneOrMore>
       <element name='freeExtent'>
-	<attribute name='start'>
-	  <ref name='uint'/>
-	</attribute>
-	<attribute name='end'>
-	  <ref name='uint'/>
-	</attribute>
+        <attribute name='start'>
+          <ref name='uint'/>
+        </attribute>
+        <attribute name='end'>
+          <ref name='uint'/>
+        </attribute>
       </element>
     </oneOrMore>
   </define>
@@ -213,7 +213,7 @@
   <define name='sourceinfodir'>
     <element name='dir'>
       <attribute name='path'>
-	<ref name='path'/>
+        <ref name='path'/>
       </attribute>
       <empty/>
     </element>
@@ -222,7 +222,7 @@
   <define name='sourceinfoadapter'>
     <element name='adapter'>
       <attribute name='name'>
-	<text/>
+        <text/>
       </attribute>
       <empty/>
     </element>
@@ -253,23 +253,23 @@
   <define name='sourcefmtfs'>
     <optional>
       <element name='format'>
-	<attribute name='type'>
-	  <choice>
-	    <value>auto</value>
-	    <value>ext2</value>
-	    <value>ext3</value>
+        <attribute name='type'>
+          <choice>
+            <value>auto</value>
+            <value>ext2</value>
+            <value>ext3</value>
             <value>ext4</value>
-	    <value>ufs</value>
-	    <value>iso9660</value>
-	    <value>udf</value>
+            <value>ufs</value>
+            <value>iso9660</value>
+            <value>udf</value>
             <value>gfs</value>
-	    <value>gfs2</value>
-	    <value>vfat</value>
-	    <value>hfs+</value>
-	    <value>xfs</value>
-	    <value>ocfs2</value>
-	  </choice>
-	</attribute>
+            <value>gfs2</value>
+            <value>vfat</value>
+            <value>hfs+</value>
+            <value>xfs</value>
+            <value>ocfs2</value>
+          </choice>
+        </attribute>
       </element>
     </optional>
   </define>
@@ -278,12 +278,12 @@
   <define name='sourcefmtnetfs'>
     <optional>
       <element name='format'>
-	<attribute name='type'>
-	  <choice>
-	    <value>auto</value>
-	    <value>nfs</value>
-	  </choice>
-	</attribute>
+        <attribute name='type'>
+          <choice>
+            <value>auto</value>
+            <value>nfs</value>
+          </choice>
+        </attribute>
       </element>
     </optional>
   </define>
@@ -292,19 +292,19 @@
   <define name='sourcefmtdisk'>
     <optional>
       <element name='format'>
-	<attribute name='type'>
-	  <choice>
-	    <value>none</value>
-	    <value>dos</value>
-	    <value>dvh</value>
-	    <value>gpt</value>
-	    <value>mac</value>
-	    <value>bsd</value>
-	    <value>pc98</value>
-	    <value>sun</value>
-	    <value>lvm2</value>
-	  </choice>
-	</attribute>
+        <attribute name='type'>
+          <choice>
+            <value>none</value>
+            <value>dos</value>
+            <value>dvh</value>
+            <value>gpt</value>
+            <value>mac</value>
+            <value>bsd</value>
+            <value>pc98</value>
+            <value>sun</value>
+            <value>lvm2</value>
+          </choice>
+        </attribute>
       </element>
     </optional>
   </define>
@@ -313,12 +313,12 @@
   <define name='sourcefmtlogical'>
     <optional>
       <element name='format'>
-	<attribute name='type'>
-	  <choice>
-	    <value>auto</value>
-	    <value>lvm2</value>
-	  </choice>
-	</attribute>
+        <attribute name='type'>
+          <choice>
+            <value>auto</value>
+            <value>lvm2</value>
+          </choice>
+        </attribute>
       </element>
     </optional>
   </define>
@@ -327,7 +327,7 @@
   <define name='sourcedir'>
     <optional>
       <element name='source'>
-	<empty/>
+        <empty/>
       </element>
     </optional>
   </define>
diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng
index 287db85..994004d 100644
--- a/docs/schemas/storagevol.rng
+++ b/docs/schemas/storagevol.rng
@@ -11,18 +11,18 @@
   <define name='vol'>
     <element name='volume'>
       <element name='name'>
-	<ref name='name'/>
+        <ref name='name'/>
       </element>
       <optional>
-	<element name='key'>
-	  <text/>
-	</element>
+        <element name='key'>
+          <text/>
+        </element>
       </optional>
       <ref name='source'/>
       <ref name='sizing'/>
       <ref name='target'/>
       <optional>
-	<ref name='backingStore'/>
+        <ref name='backingStore'/>
       </optional>
     </element>
   </define>
@@ -31,16 +31,16 @@
     <optional>
       <element name='capacity'>
         <optional>
-	  <attribute name='unit'>
-	    <ref name='unit'/>
-	  </attribute>
+          <attribute name='unit'>
+            <ref name='unit'/>
+          </attribute>
         </optional>
-	<ref name='uint'/>
+        <ref name='uint'/>
       </element>
     </optional>
     <optional>
       <element name='allocation'>
-	<ref name='uint'/>
+        <ref name='uint'/>
       </element>
     </optional>
   </define>
@@ -48,20 +48,20 @@
   <define name='permissions'>
     <optional>
       <element name='permissions'>
-	<element name='mode'>
-	  <ref name='uint'/>
-	</element>
-	<element name='owner'>
-	  <ref name='uint'/>
-	</element>
-	<element name='group'>
-	  <ref name='uint'/>
-	</element>
-	<optional>
-	  <element name='label'>
-	    <text/>
-	</element>
-	</optional>
+        <element name='mode'>
+          <ref name='uint'/>
+        </element>
+        <element name='owner'>
+          <ref name='uint'/>
+        </element>
+        <element name='group'>
+          <ref name='uint'/>
+        </element>
+        <optional>
+          <element name='label'>
+            <text/>
+        </element>
+        </optional>
       </element>
     </optional>
   </define>
@@ -69,9 +69,9 @@
   <define name='target'>
     <element name='target'>
       <optional>
-	<element name='path'>
-	  <ref name='path'/>
-	</element>
+        <element name='path'>
+          <ref name='path'/>
+        </element>
       </optional>
       <ref name='format'/>
       <ref name='permissions'/>
@@ -84,7 +84,7 @@
   <define name='backingStore'>
     <element name='backingStore'>
       <element name='path'>
-	<ref name='path'/>
+        <ref name='path'/>
       </element>
       <ref name='format'/>
       <ref name='permissions'/>
@@ -95,7 +95,7 @@
   <define name='source'>
     <element name='source'>
       <zeroOrMore>
-	<ref name='sourcedev'/>
+        <ref name='sourcedev'/>
       </zeroOrMore>
     </element>
   </define>
@@ -103,11 +103,11 @@
   <define name='sourcedev'>
     <element name='device'>
       <attribute name='path'>
-	<ref name='path'/>
+        <ref name='path'/>
       </attribute>
       <choice>
-	<empty/>
-	<ref name='devextents'/>
+        <empty/>
+        <ref name='devextents'/>
       </choice>
     </element>
   </define>
@@ -115,12 +115,12 @@
   <define name='devextents'>
     <oneOrMore>
       <element name='extent'>
-	<attribute name='start'>
-	  <ref name='uint'/>
-	</attribute>
-	<attribute name='end'>
-	  <ref name='uint'/>
-	</attribute>
+        <attribute name='start'>
+          <ref name='uint'/>
+        </attribute>
+        <attribute name='end'>
+          <ref name='uint'/>
+        </attribute>
       </element>
     </oneOrMore>
   </define>
@@ -164,12 +164,12 @@
   <define name='format'>
     <optional>
       <element name='format'>
-	<attribute name='type'>
-	  <choice>
-	    <ref name='formatfile'/>
-	    <ref name='formatdev'/>
-	  </choice>
-	</attribute>
+        <attribute name='type'>
+          <choice>
+            <ref name='formatfile'/>
+            <ref name='formatdev'/>
+          </choice>
+        </attribute>
       </element>
     </optional>
   </define>
--
1.7.0.1.414.g89213d


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]