[libvirt PATCH 1/4] schema: domain: Allow interleaving of 'tpm' config elements

[Ján Tomko]

From: Peter Krempa <pkrempa at redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/conf/schemas/domaincommon.rng | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index d346442510..6e30512c73 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -5530,13 +5530,15 @@
           </choice>
         </attribute>
       </optional>
-      <ref name="tpm-backend"/>
-      <optional>
-        <ref name="alias"/>
-      </optional>
-      <optional>
-        <ref name="address"/>
-      </optional>
+      <interleave>
+        <ref name="tpm-backend"/>
+        <optional>
+          <ref name="alias"/>
+        </optional>
+        <optional>
+          <ref name="address"/>
+        </optional>
+      </interleave>
     </element>
   </define>
 
@@ -5551,10 +5553,12 @@
         </group>
         <group>
           <attribute name="type">
-             <value>emulator</value>
+            <value>emulator</value>
           </attribute>
-          <ref name="tpm-backend-emulator-encryption"/>
-          <ref name="tpm-backend-emulator-active-pcr-banks"/>
+          <interleave>
+            <ref name="tpm-backend-emulator-encryption"/>
+            <ref name="tpm-backend-emulator-active-pcr-banks"/>
+          </interleave>
           <optional>
             <attribute name="persistent_state">
               <ref name="virYesNo"/>
-- 
2.37.3