From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 22 Nov 2010 16:46:13 +0000 (-0500)
Subject: schemas: domain: Add more valid file path chars
X-Git-Tag: v0.8.6~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4610a2d51a679c9d7c190b11ed657da8f6b611f0;p=thirdparty%2Flibvirt.git

schemas: domain: Add more valid file path chars

Also, standardize path usage on 'filePath' and 'absFilePath'
---

diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index bbbc846c83..fb44335395 100644
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -497,7 +497,7 @@
       </optional>
       <optional>
         <element name="root">
-          <ref name="devicePath"/>
+          <ref name="absFilePath"/>
         </element>
       </optional>
       <optional>
@@ -588,7 +588,7 @@
             <optional>
               <element name="source">
                 <attribute name="dev">
-                  <ref name="deviceName"/>
+                  <ref name="absFilePath"/>
                 </attribute>
                 <empty/>
               </element>
@@ -766,7 +766,7 @@
           <interleave>
             <element name="source">
               <attribute name="dev">
-                <ref name="deviceName"/>
+                <ref name="absFilePath"/>
               </attribute>
               <empty/>
             </element>
@@ -1338,7 +1338,7 @@
     <ref name="qemucdevSrcType"/>
     <optional>
       <attribute name="tty">
-        <ref name="devicePath"/>
+        <ref name="absFilePath"/>
       </attribute>
     </optional>
     <interleave>
@@ -1430,7 +1430,7 @@
         <group>
           <optional>
             <attribute name="tty">
-              <ref name="devicePath"/>
+              <ref name="absFilePath"/>
             </attribute>
           </optional>
           <empty/>
@@ -2028,27 +2028,22 @@
   </define>
   <define name="filePath">
     <data type="string">
-      <param name="pattern">[a-zA-Z0-9_\.\+\-&amp;/%]+</param>
+      <param name="pattern">[a-zA-Z0-9_\.\+\-\\&amp;&quot;&apos;&lt;&gt;/%]+</param>
     </data>
   </define>
   <define name="absFilePath">
     <data type="string">
-      <param name="pattern">/[a-zA-Z0-9_\.\+\-&amp;/%]+</param>
+      <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&amp;&quot;&apos;&lt;&gt;/%]+</param>
     </data>
   </define>
   <define name="absDirPath">
     <data type="string">
-      <param name="pattern">/[a-zA-Z0-9_\.\+\-&amp;/%]*</param>
-    </data>
-  </define>
-  <define name="devicePath">
-    <data type="string">
-      <param name="pattern">/[a-zA-Z0-9_\+\-/%]+</param>
+      <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&amp;&quot;&apos;&lt;&gt;/%]*</param>
     </data>
   </define>
   <define name="deviceName">
     <data type="string">
-      <param name="pattern">[a-zA-Z0-9_\.\-:/]+</param>
+      <param name="pattern">[a-zA-Z0-9_\.\-\\:/]+</param>
     </data>
   </define>
   <define name="bridgeMode">