From 15730e7667886e45a4e784e7b31dddb84bd12890 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 13 Oct 2022 18:18:03 +0200
Subject: [PATCH] schema: domain: Allow interleaving of 'watchdog' subelements
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 | 54 ++++++++++++++++---------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index 57457d1aa8..ebdf21fe99 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -5264,35 +5264,37 @@
   </define>
   <define name="watchdog">
     <element name="watchdog">
-      <attribute name="model">
-        <choice>
-          <value>i6300esb</value>
-          <value>ib700</value>
-          <value>diag288</value>
-        </choice>
-      </attribute>
-      <optional>
-        <attribute name="action">
+      <interleave>
+        <attribute name="model">
           <choice>
-            <value>reset</value>
-            <value>shutdown</value>
-            <value>poweroff</value>
-            <value>pause</value>
-            <value>none</value>
-            <value>dump</value>
-            <value>inject-nmi</value>
+            <value>i6300esb</value>
+            <value>ib700</value>
+            <value>diag288</value>
           </choice>
         </attribute>
-      </optional>
-      <optional>
-        <ref name="alias"/>
-      </optional>
-      <optional>
-        <ref name="acpi"/>
-      </optional>
-      <optional>
-        <ref name="address"/>
-      </optional>
+        <optional>
+          <attribute name="action">
+            <choice>
+              <value>reset</value>
+              <value>shutdown</value>
+              <value>poweroff</value>
+              <value>pause</value>
+              <value>none</value>
+              <value>dump</value>
+              <value>inject-nmi</value>
+            </choice>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="alias"/>
+        </optional>
+        <optional>
+          <ref name="acpi"/>
+        </optional>
+        <optional>
+          <ref name="address"/>
+        </optional>
+      </interleave>
     </element>
   </define>
   <define name="nvram">