From 91e85d8939c0cba9eaece72da20e0ffb3fcc449b Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 8 Feb 2019 19:10:17 -0500
Subject: [PATCH] schemas: domcaps: Make more elements optional

Upcoming changes will make outputting these subelements optional.

While we are here drop the useless interleave: since this is an output
only format the elements are always in the same order

Acked-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 docs/schemas/domaincaps.rng | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/docs/schemas/domaincaps.rng b/docs/schemas/domaincaps.rng
index 7d80693d38..3c42cb8075 100644
--- a/docs/schemas/domaincaps.rng
+++ b/docs/schemas/domaincaps.rng
@@ -142,12 +142,18 @@
 
   <define name='devices'>
     <element name='devices'>
-      <interleave>
+      <optional>
         <ref name='disk'/>
+      </optional>
+      <optional>
         <ref name='graphics'/>
+      </optional>
+      <optional>
         <ref name='video'/>
+      </optional>
+      <optional>
         <ref name='hostdev'/>
-      </interleave>
+      </optional>
     </element>
   </define>
 
@@ -181,12 +187,18 @@
 
   <define name='features'>
     <element name='features'>
-      <interleave>
+      <optional>
         <ref name='gic'/>
+      </optional>
+      <optional>
         <ref name='vmcoreinfo'/>
+      </optional>
+      <optional>
         <ref name='vmgenid'/>
+      </optional>
+      <optional>
         <ref name='sev'/>
-      </interleave>
+      </optional>
     </element>
   </define>