[PATCH v2 18/21] schema: domain: Accept VMWARE disk sources for the disk

Peter Krempa pkrempa at redhat.com
Thu Oct 8 08:47:16 UTC 2020


Our vmware driver chose to format disk paths starting with a square
bracket. This would not conform to the RNG schema for disk source.
Modify the schema to allow these since it's around for some time.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---

Consider this as replacement for the original patch 18. Just add an
alternative to the path.

 docs/schemas/basictypes.rng   | 6 ++++++
 docs/schemas/domaincommon.rng | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
index b1fb939aff..42e94c40e9 100644
--- a/docs/schemas/basictypes.rng
+++ b/docs/schemas/basictypes.rng
@@ -303,6 +303,12 @@
     </data>
   </define>

+  <define name="vmwarePath">
+    <data type="string">
+      <param name="pattern">\[.+\] .+</param>
+    </data>
+  </define>
+
   <define name="absDirPath">
     <data type="string">
       <param name="pattern">/.*</param>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 41c256b653..a08497eea2 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1651,7 +1651,10 @@
         <interleave>
           <optional>
             <attribute name="file">
-              <ref name="absFilePath"/>
+              <choice>
+                <ref name="absFilePath"/>
+                <ref name="vmwarePath"/>
+              </choice>
             </attribute>
           </optional>
           <ref name="diskSourceCommon"/>
-- 
2.26.2




More information about the libvir-list mailing list