[v2,09/16] schemas: domcaps: Make more elements optional

Message ID af22ae2a47c2eef3505f7af52c467f88de757f09.1551914794.git.crobinso@redhat.com
State New
Headers show
Series
  • domcaps: use virTristateBool
Related show

Commit Message

Cole Robinson March 6, 2019, 11:36 p.m.
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

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---
 docs/schemas/domaincaps.rng | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

-- 
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patch

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>