From 8b2b71d8993af4d1017871fd501dcd2009f1c6ed Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 13 Oct 2022 16:33:11 +0200
Subject: [PATCH] schema: domain: Allow interleaving of subelements of
 'memtune'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/conf/schemas/domaincommon.rng | 50 ++++++++++++++++---------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index ea10d13a4f..99a705aa3c 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -956,30 +956,32 @@
   <!-- All the memory/swap related tunables would go in the memtune -->
   <define name="memtune">
     <element name="memtune">
-      <!-- Maximum memory the VM can use -->
-      <optional>
-        <element name="hard_limit">
-          <ref name="scaledInteger"/>
-        </element>
-      </optional>
-      <!-- Minimum memory ascertained for the VM during contention -->
-      <optional>
-        <element name="soft_limit">
-          <ref name="scaledInteger"/>
-        </element>
-      </optional>
-      <!-- Minimum amount of memory required to start the VM -->
-      <optional>
-        <element name="min_guarantee">
-          <ref name="scaledInteger"/>
-        </element>
-      </optional>
-      <!-- Maximum swap area the VM can use -->
-      <optional>
-        <element name="swap_hard_limit">
-          <ref name="scaledInteger"/>
-        </element>
-      </optional>
+      <interleave>
+        <!-- Maximum memory the VM can use -->
+        <optional>
+          <element name="hard_limit">
+            <ref name="scaledInteger"/>
+          </element>
+        </optional>
+        <!-- Minimum memory ascertained for the VM during contention -->
+        <optional>
+          <element name="soft_limit">
+            <ref name="scaledInteger"/>
+          </element>
+        </optional>
+        <!-- Minimum amount of memory required to start the VM -->
+        <optional>
+          <element name="min_guarantee">
+            <ref name="scaledInteger"/>
+          </element>
+        </optional>
+        <!-- Maximum swap area the VM can use -->
+        <optional>
+          <element name="swap_hard_limit">
+            <ref name="scaledInteger"/>
+          </element>
+        </optional>
+      </interleave>
     </element>
   </define>