From: Han Han <hhan@redhat.com>
Date: Wed, 6 Jul 2022 02:42:02 +0000 (+0800)
Subject: schemas: rng: Make secret optional in storage vol
X-Git-Tag: v8.6.0-rc1~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19c8da1d4c529fc455941740fbcf6c1903b038a5;p=thirdparty%2Flibvirt.git

schemas: rng: Make secret optional in storage vol

For a qcow2 storage volume with luks encryption created by qemu-img, its
dumped storage vol XML has no secret element in encryption:
<volume type='file'>
    ...
    <encryption format='luks'>
    </encryption>
    ...
</volume>

That will cause a failure in rng validation. Fix that validation failure.

Signed-off-by: Han Han <hhan@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/schemas/storagecommon.rng b/src/conf/schemas/storagecommon.rng
index 10f1bc6a15..76714c9aad 100644
--- a/src/conf/schemas/storagecommon.rng
+++ b/src/conf/schemas/storagecommon.rng
@@ -24,17 +24,19 @@
           </choice>
         </attribute>
       </optional>
-      <interleave>
-        <ref name="secret"/>
-        <optional>
-          <element name="cipher">
-            <ref name="keycipher"/>
-          </element>
-          <element name="ivgen">
-            <ref name="keyivgen"/>
-          </element>
-        </optional>
-      </interleave>
+      <optional>
+        <interleave>
+          <ref name="secret"/>
+          <optional>
+            <element name="cipher">
+              <ref name="keycipher"/>
+            </element>
+            <element name="ivgen">
+              <ref name="keyivgen"/>
+            </element>
+          </optional>
+        </interleave>
+      </optional>
     </element>
   </define>