jonathan/libvirt
1
0
Fork 0
forked from rpms/libvirt
Code Pull Requests Activity
465fa4c5ff
libvirt/SOURCES/libvirt-schemas-rng-Use-interleave-in-the-disk-source-element.patch
CentOS Sources 30b580dcad import libvirt-6.0.0-28.module+el8.3.0+7827+5e65edd7
2021-09-10 11:57:33 +00:00

498 lines
14 KiB
Diff
Raw Blame History

From d7aeea8dfb78168ae305252bf581d46766496e24 Mon Sep 17 00:00:00 2001
Message-Id: <d7aeea8dfb78168ae305252bf581d46766496e24@dist-git>
From: Han Han <hhan@redhat.com>
Date: Mon, 30 Mar 2020 17:21:44 +0200
Subject: [PATCH] schemas: rng: Use interleave in the disk source element
Signed-off-by: Han Han <hhan@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
(cherry picked from commit 8b41b21aee4fb3b0f5fed1ecc73c5a7fd6879a93)
https://bugzilla.redhat.com/show_bug.cgi?id=1804750
Message-Id: <79373ae94fb73576d1433b22545327a4afca2d99.1585581552.git.pkrempa@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
docs/schemas/domaincommon.rng | 398 ++++++++++++++++++----------------
1 file changed, 211 insertions(+), 187 deletions(-)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index ac6f180382..e17f7ff8c0 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1642,21 +1642,23 @@
</optional>
<optional>
<element name="source">
- <optional>
- <attribute name="file">
- <ref name="absFilePath"/>
- </attribute>
- </optional>
- <ref name="diskSourceCommon"/>
- <optional>
- <ref name="storageStartupPolicy"/>
- </optional>
- <optional>
- <ref name="encryption"/>
- </optional>
- <zeroOrMore>
- <ref name='devSeclabel'/>
- </zeroOrMore>
+ <interleave>
+ <optional>
+ <attribute name="file">
+ <ref name="absFilePath"/>
+ </attribute>
+ </optional>
+ <ref name="diskSourceCommon"/>
+ <optional>
+ <ref name="storageStartupPolicy"/>
+ </optional>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
+ <zeroOrMore>
+ <ref name='devSeclabel'/>
+ </zeroOrMore>
+ </interleave>
</element>
</optional>
</define>
@@ -1667,24 +1669,26 @@
</attribute>
<optional>
<element name="source">
- <optional>
- <attribute name="dev">
- <ref name="absFilePath"/>
- </attribute>
- </optional>
- <ref name="diskSourceCommon"/>
- <optional>
- <ref name="storageStartupPolicy"/>
- </optional>
- <optional>
- <ref name="encryption"/>
- </optional>
- <optional>
- <ref name="reservations"/>
- </optional>
- <zeroOrMore>
- <ref name='devSeclabel'/>
- </zeroOrMore>
+ <interleave>
+ <optional>
+ <attribute name="dev">
+ <ref name="absFilePath"/>
+ </attribute>
+ </optional>
+ <ref name="diskSourceCommon"/>
+ <optional>
+ <ref name="storageStartupPolicy"/>
+ </optional>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
+ <optional>
+ <ref name="reservations"/>
+ </optional>
+ <zeroOrMore>
+ <ref name='devSeclabel'/>
+ </zeroOrMore>
+ </interleave>
</element>
</optional>
</define>
@@ -1695,17 +1699,19 @@
</attribute>
<optional>
<element name="source">
- <attribute name="dir">
- <ref name="absFilePath"/>
- </attribute>
- <ref name="diskSourceCommon"/>
- <optional>
- <ref name="storageStartupPolicy"/>
- </optional>
- <optional>
- <ref name="encryption"/>
- </optional>
- <empty/>
+ <interleave>
+ <attribute name="dir">
+ <ref name="absFilePath"/>
+ </attribute>
+ <ref name="diskSourceCommon"/>
+ <optional>
+ <ref name="storageStartupPolicy"/>
+ </optional>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
+ <empty/>
+ </interleave>
</element>
</optional>
</define>
@@ -1856,138 +1862,152 @@
<define name="diskSourceNetworkProtocolHTTPS">
<element name="source">
- <attribute name="protocol">
- <choice>
- <value>https</value>
- </choice>
- </attribute>
- <attribute name="name"/>
- <ref name="diskSourceCommon"/>
- <ref name="diskSourceNetworkHost"/>
- <optional>
- <ref name="encryption"/>
- </optional>
- <optional>
- <ref name="diskSourceNetworkProtocolSSLVerify"/>
- </optional>
- <optional>
- <ref name="diskSourceNetworkProtocolHTTPCookies"/>
- </optional>
- <ref name="diskSourceNetworkProtocolPropsCommon"/>
+ <interleave>
+ <attribute name="protocol">
+ <choice>
+ <value>https</value>
+ </choice>
+ </attribute>
+ <attribute name="name"/>
+ <ref name="diskSourceCommon"/>
+ <ref name="diskSourceNetworkHost"/>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
+ <optional>
+ <ref name="diskSourceNetworkProtocolSSLVerify"/>
+ </optional>
+ <optional>
+ <ref name="diskSourceNetworkProtocolHTTPCookies"/>
+ </optional>
+ <ref name="diskSourceNetworkProtocolPropsCommon"/>
+ </interleave>
</element>
</define>
<define name="diskSourceNetworkProtocolHTTP">
<element name="source">
- <attribute name="protocol">
- <choice>
- <value>http</value>
- </choice>
- </attribute>
- <attribute name="name"/>
- <ref name="diskSourceCommon"/>
- <ref name="diskSourceNetworkHost"/>
- <optional>
- <ref name="encryption"/>
- </optional>
- <optional>
- <ref name="diskSourceNetworkProtocolHTTPCookies"/>
- </optional>
- <ref name="diskSourceNetworkProtocolPropsCommon"/>
+ <interleave>
+ <attribute name="protocol">
+ <choice>
+ <value>http</value>
+ </choice>
+ </attribute>
+ <attribute name="name"/>
+ <ref name="diskSourceCommon"/>
+ <ref name="diskSourceNetworkHost"/>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
+ <optional>
+ <ref name="diskSourceNetworkProtocolHTTPCookies"/>
+ </optional>
+ <ref name="diskSourceNetworkProtocolPropsCommon"/>
+ </interleave>
</element>
</define>
<define name="diskSourceNetworkProtocolFTPS">
<element name="source">
- <attribute name="protocol">
- <choice>
- <value>ftps</value>
- </choice>
- </attribute>
- <attribute name="name"/>
- <ref name="diskSourceCommon"/>
- <ref name="diskSourceNetworkHost"/>
- <optional>
- <ref name="encryption"/>
- </optional>
- <optional>
- <ref name="diskSourceNetworkProtocolSSLVerify"/>
- </optional>
- <ref name="diskSourceNetworkProtocolPropsCommon"/>
+ <interleave>
+ <attribute name="protocol">
+ <choice>
+ <value>ftps</value>
+ </choice>
+ </attribute>
+ <attribute name="name"/>
+ <ref name="diskSourceCommon"/>
+ <ref name="diskSourceNetworkHost"/>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
+ <optional>
+ <ref name="diskSourceNetworkProtocolSSLVerify"/>
+ </optional>
+ <ref name="diskSourceNetworkProtocolPropsCommon"/>
+ </interleave>
</element>
</define>
<define name="diskSourceNetworkProtocolSimple">
<element name="source">
- <attribute name="protocol">
- <choice>
- <value>sheepdog</value>
- <value>ftp</value>
- <value>tftp</value>
- </choice>
- </attribute>
- <attribute name="name"/>
- <ref name="diskSourceCommon"/>
- <ref name="diskSourceNetworkHost"/>
- <optional>
- <ref name="encryption"/>
- </optional>
- <ref name="diskSourceNetworkProtocolPropsCommon"/>
+ <interleave>
+ <attribute name="protocol">
+ <choice>
+ <value>sheepdog</value>
+ <value>ftp</value>
+ <value>tftp</value>
+ </choice>
+ </attribute>
+ <attribute name="name"/>
+ <ref name="diskSourceCommon"/>
+ <ref name="diskSourceNetworkHost"/>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
+ <ref name="diskSourceNetworkProtocolPropsCommon"/>
+ </interleave>
</element>
</define>
<define name="diskSourceNetworkProtocolNBD">
<element name="source">
- <attribute name="protocol">
- <value>nbd</value>
- </attribute>
- <optional>
- <attribute name="name"/>
- </optional>
- <optional>
- <attribute name="tls">
- <ref name="virYesNo"/>
+ <interleave>
+ <attribute name="protocol">
+ <value>nbd</value>
</attribute>
- </optional>
- <ref name="diskSourceCommon"/>
- <ref name="diskSourceNetworkHost"/>
- <optional>
- <ref name="encryption"/>
- </optional>
+ <optional>
+ <attribute name="name"/>
+ </optional>
+ <optional>
+ <attribute name="tls">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
+ <ref name="diskSourceCommon"/>
+ <ref name="diskSourceNetworkHost"/>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
+ </interleave>
</element>
</define>
<define name="diskSourceNetworkProtocolGluster">
<element name="source">
- <attribute name="protocol">
- <value>gluster</value>
- </attribute>
- <attribute name="name"/>
- <ref name="diskSourceCommon"/>
- <oneOrMore>
- <ref name="diskSourceNetworkHost"/>
- </oneOrMore>
- <optional>
- <ref name="encryption"/>
- </optional>
+ <interleave>
+ <attribute name="protocol">
+ <value>gluster</value>
+ </attribute>
+ <attribute name="name"/>
+ <ref name="diskSourceCommon"/>
+ <oneOrMore>
+ <ref name="diskSourceNetworkHost"/>
+ </oneOrMore>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
+ </interleave>
</element>
</define>
<define name="diskSourceNetworkProtocolVxHS">
<element name="source">
- <attribute name="protocol">
- <choice>
- <value>vxhs</value>
- </choice>
- </attribute>
- <attribute name="name"/>
- <ref name="diskSourceCommon"/>
- <optional>
- <attribute name="tls">
- <ref name="virYesNo"/>
+ <interleave>
+ <attribute name="protocol">
+ <choice>
+ <value>vxhs</value>
+ </choice>
</attribute>
- </optional>
- <ref name="diskSourceNetworkHost"/>
+ <attribute name="name"/>
+ <ref name="diskSourceCommon"/>
+ <optional>
+ <attribute name="tls">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
+ <ref name="diskSourceNetworkHost"/>
+ </interleave>
</element>
</define>
@@ -2014,30 +2034,32 @@
</attribute>
<optional>
<element name="source">
- <attribute name="pool">
- <ref name="poolName"/>
- </attribute>
- <attribute name="volume">
- <ref name="volName"/>
- </attribute>
- <optional>
- <attribute name="mode">
- <choice>
- <value>host</value>
- <value>direct</value>
- </choice>
+ <interleave>
+ <attribute name="pool">
+ <ref name="poolName"/>
</attribute>
- </optional>
- <ref name="diskSourceCommon"/>
- <optional>
- <ref name="storageStartupPolicy"/>
- </optional>
- <optional>
- <ref name="encryption"/>
- </optional>
- <zeroOrMore>
- <ref name='devSeclabel'/>
- </zeroOrMore>
+ <attribute name="volume">
+ <ref name="volName"/>
+ </attribute>
+ <optional>
+ <attribute name="mode">
+ <choice>
+ <value>host</value>
+ <value>direct</value>
+ </choice>
+ </attribute>
+ </optional>
+ <ref name="diskSourceCommon"/>
+ <optional>
+ <ref name="storageStartupPolicy"/>
+ </optional>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
+ <zeroOrMore>
+ <ref name='devSeclabel'/>
+ </zeroOrMore>
+ </interleave>
</element>
</optional>
</define>
@@ -2048,27 +2070,29 @@
</attribute>
<optional>
<element name="source">
- <attribute name="type">
- <value>pci</value>
- </attribute>
- <attribute name="namespace">
- <ref name="uint32"/>
- </attribute>
- <optional>
- <attribute name="managed">
- <ref name="virYesNo"/>
+ <interleave>
+ <attribute name="type">
+ <value>pci</value>
</attribute>
- </optional>
- <element name="address">
- <ref name="pciaddress"/>
- </element>
- <ref name="diskSourceCommon"/>
- <optional>
- <ref name="storageStartupPolicy"/>
- </optional>
- <optional>
- <ref name="encryption"/>
- </optional>
+ <attribute name="namespace">
+ <ref name="uint32"/>
+ </attribute>
+ <optional>
+ <attribute name="managed">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
+ <element name="address">
+ <ref name="pciaddress"/>
+ </element>
+ <ref name="diskSourceCommon"/>
+ <optional>
+ <ref name="storageStartupPolicy"/>
+ </optional>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
+ </interleave>
</element>
</optional>
</define>
--
2.26.0
View Git Blame Copy Permalink