[PATCH 5/7] 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(a)redhat.com>
---
src/conf/schemas/domaincommon.rng | 143 ++++++++++++++++--------------
1 file changed, 74 insertions(+), 69 deletions(-)
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index 7f6ea1d888..cc6a3475c8 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>
--
2.37.1