From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 25 Aug 2022 09:25:39 +0000 (+0200)
Subject: schemas: domaincommon: Extract contents of the 'domain' element definition
X-Git-Tag: v8.8.0-rc1~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=423e435e8c96f4de25f8bda57967dcc3b9f4df6e;p=thirdparty%2Flibvirt.git

schemas: domaincommon: Extract contents of the 'domain' element definition

Move all definition under the <domain> element into a separate
definition so that it can be referenced from elements with other names.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index bb6b1058e6..ce4509f245 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -33,77 +33,82 @@
     -->
   <define name="domain">
     <element name="domain">
-      <ref name="hvs"/>
-      <interleave>
-        <ref name="ids"/>
-        <optional>
-          <ref name="title"/>
-        </optional>
-        <optional>
-          <ref name="description"/>
-        </optional>
-        <optional>
-          <ref name="metadata"/>
-        </optional>
-        <optional>
-          <ref name="guestcpu"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="sysinfo"/>
-        </zeroOrMore>
-        <ref name="os"/>
-        <ref name="clock"/>
-        <ref name="resources"/>
-        <ref name="features"/>
-        <ref name="events"/>
-        <optional>
-          <ref name="pm"/>
-        </optional>
-        <optional>
-          <ref name="perf"/>
-        </optional>
-        <optional>
-          <ref name="idmap"/>
-        </optional>
-        <optional>
-          <ref name="devices"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="seclabel"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="qemucmdline"/>
-        </optional>
-        <optional>
-          <ref name="qemucapabilities"/>
-        </optional>
-        <optional>
-          <ref name="qemudeprecation"/>
-        </optional>
-        <optional>
-          <ref name="qemuoverride"/>
-        </optional>
-        <optional>
-          <ref name="lxcsharens"/>
-        </optional>
-        <optional>
-          <ref name="keywrap"/>
-        </optional>
-        <optional>
-          <ref name="launchSecurity"/>
-        </optional>
-        <optional>
-          <ref name="bhyvecmdline"/>
-        </optional>
-        <optional>
-          <ref name="xencmdline"/>
-        </optional>
-        <optional>
-          <ref name="vmwaredatacenterpath"/>
-        </optional>
-      </interleave>
+      <ref name="domaincontents"/>
     </element>
   </define>
+
+  <define name="domaincontents">
+    <ref name="hvs"/>
+    <interleave>
+      <ref name="ids"/>
+      <optional>
+        <ref name="title"/>
+      </optional>
+      <optional>
+        <ref name="description"/>
+      </optional>
+      <optional>
+        <ref name="metadata"/>
+      </optional>
+      <optional>
+        <ref name="guestcpu"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="sysinfo"/>
+      </zeroOrMore>
+      <ref name="os"/>
+      <ref name="clock"/>
+      <ref name="resources"/>
+      <ref name="features"/>
+      <ref name="events"/>
+      <optional>
+        <ref name="pm"/>
+      </optional>
+      <optional>
+        <ref name="perf"/>
+      </optional>
+      <optional>
+        <ref name="idmap"/>
+      </optional>
+      <optional>
+        <ref name="devices"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="seclabel"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="qemucmdline"/>
+      </optional>
+      <optional>
+        <ref name="qemucapabilities"/>
+      </optional>
+      <optional>
+        <ref name="qemudeprecation"/>
+      </optional>
+      <optional>
+        <ref name="qemuoverride"/>
+      </optional>
+      <optional>
+        <ref name="lxcsharens"/>
+      </optional>
+      <optional>
+        <ref name="keywrap"/>
+      </optional>
+      <optional>
+        <ref name="launchSecurity"/>
+      </optional>
+      <optional>
+        <ref name="bhyvecmdline"/>
+      </optional>
+      <optional>
+        <ref name="xencmdline"/>
+      </optional>
+      <optional>
+        <ref name="vmwaredatacenterpath"/>
+      </optional>
+    </interleave>
+  </define>
+
   <define name="seclabel">
     <element name="seclabel">
       <optional>