提交 40df36eb 编写于 作者: M Michal Privoznik

rng: Drop useless <choice/>

If we have <choice/> with just one value to chose from, it's no
choice.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
上级 cdecfbed
...@@ -1554,9 +1554,7 @@ ...@@ -1554,9 +1554,7 @@
<element name="source"> <element name="source">
<interleave> <interleave>
<attribute name="protocol"> <attribute name="protocol">
<choice>
<value>rbd</value> <value>rbd</value>
</choice>
</attribute> </attribute>
<optional> <optional>
<attribute name="name"/> <attribute name="name"/>
...@@ -1617,9 +1615,7 @@ ...@@ -1617,9 +1615,7 @@
<define name="diskSourceNetworkProtocolNBD"> <define name="diskSourceNetworkProtocolNBD">
<element name="source"> <element name="source">
<attribute name="protocol"> <attribute name="protocol">
<choice>
<value>nbd</value> <value>nbd</value>
</choice>
</attribute> </attribute>
<optional> <optional>
<attribute name="name"/> <attribute name="name"/>
...@@ -1631,9 +1627,7 @@ ...@@ -1631,9 +1627,7 @@
<define name="diskSourceNetworkProtocolGluster"> <define name="diskSourceNetworkProtocolGluster">
<element name="source"> <element name="source">
<attribute name="protocol"> <attribute name="protocol">
<choice>
<value>gluster</value> <value>gluster</value>
</choice>
</attribute> </attribute>
<attribute name="name"/> <attribute name="name"/>
<oneOrMore> <oneOrMore>
...@@ -2370,9 +2364,7 @@ ...@@ -2370,9 +2364,7 @@
<interleave> <interleave>
<element name="source"> <element name="source">
<attribute name="type"> <attribute name="type">
<choice>
<value>unix</value> <value>unix</value>
</choice>
</attribute> </attribute>
<attribute name="path"> <attribute name="path">
<ref name="absFilePath"/> <ref name="absFilePath"/>
...@@ -2475,9 +2467,7 @@ ...@@ -2475,9 +2467,7 @@
</group> </group>
<group> <group>
<attribute name="type"> <attribute name="type">
<choice>
<value>udp</value> <value>udp</value>
</choice>
</attribute> </attribute>
<interleave> <interleave>
<element name="source"> <element name="source">
...@@ -2967,9 +2957,7 @@ ...@@ -2967,9 +2957,7 @@
</optional> </optional>
<optional> <optional>
<attribute name="connected"> <attribute name="connected">
<choice>
<value>keep</value> <value>keep</value>
</choice>
</attribute> </attribute>
</optional> </optional>
<ref name="listenElements"/> <ref name="listenElements"/>
...@@ -3693,10 +3681,8 @@ ...@@ -3693,10 +3681,8 @@
</optional> </optional>
<empty/> <empty/>
</group> </group>
<choice>
<ref name="qemucdev"/> <ref name="qemucdev"/>
</choice> </choice>
</choice>
</element> </element>
</define> </define>
<define name="codec"> <define name="codec">
...@@ -3730,9 +3716,7 @@ ...@@ -3730,9 +3716,7 @@
<ref name="address"/> <ref name="address"/>
</optional> </optional>
<zeroOrMore> <zeroOrMore>
<choice>
<ref name="codec"/> <ref name="codec"/>
</choice>
</zeroOrMore> </zeroOrMore>
</interleave> </interleave>
</element> </element>
...@@ -3985,9 +3969,7 @@ ...@@ -3985,9 +3969,7 @@
<element name="tpm"> <element name="tpm">
<optional> <optional>
<attribute name="model"> <attribute name="model">
<choice>
<value>tpm-tis</value> <value>tpm-tis</value>
</choice>
</attribute> </attribute>
</optional> </optional>
<ref name="tpm-backend"/> <ref name="tpm-backend"/>
...@@ -4106,9 +4088,7 @@ ...@@ -4106,9 +4088,7 @@
<define name="hub"> <define name="hub">
<element name="hub"> <element name="hub">
<attribute name="type"> <attribute name="type">
<choice>
<value>usb</value> <value>usb</value>
</choice>
</attribute> </attribute>
<optional> <optional>
<ref name="alias"/> <ref name="alias"/>
...@@ -4121,9 +4101,7 @@ ...@@ -4121,9 +4101,7 @@
<define name="redirdev"> <define name="redirdev">
<element name="redirdev"> <element name="redirdev">
<attribute name="bus"> <attribute name="bus">
<choice>
<value>usb</value> <value>usb</value>
</choice>
</attribute> </attribute>
<attribute name="type"> <attribute name="type">
<ref name="qemucdevSrcTypeChoice"/> <ref name="qemucdevSrcTypeChoice"/>
...@@ -4286,9 +4264,7 @@ ...@@ -4286,9 +4264,7 @@
<group> <!-- scsi_host adapter --> <group> <!-- scsi_host adapter -->
<optional> <optional>
<attribute name="protocol"> <attribute name="protocol">
<choice>
<value>adapter</value> <!-- scsi_host, default, optional --> <value>adapter</value> <!-- scsi_host, default, optional -->
</choice>
</attribute> </attribute>
</optional> </optional>
<interleave> <interleave>
...@@ -4300,9 +4276,7 @@ ...@@ -4300,9 +4276,7 @@
</group> </group>
<group> <!-- iscsi adapter --> <group> <!-- iscsi adapter -->
<attribute name="protocol"> <attribute name="protocol">
<choice>
<value>iscsi</value> <!-- iscsi, required --> <value>iscsi</value> <!-- iscsi, required -->
</choice>
</attribute> </attribute>
<attribute name="name"> <attribute name="name">
<text/> <text/>
...@@ -4338,9 +4312,7 @@ ...@@ -4338,9 +4312,7 @@
<choice> <choice>
<group> <group>
<attribute name="protocol"> <attribute name="protocol">
<choice>
<value>vhost</value> <!-- vhost, required --> <value>vhost</value> <!-- vhost, required -->
</choice>
</attribute> </attribute>
<attribute name="wwpn"> <attribute name="wwpn">
<data type="string"> <data type="string">
...@@ -4357,9 +4329,7 @@ ...@@ -4357,9 +4329,7 @@
<value>mdev</value> <value>mdev</value>
</attribute> </attribute>
<attribute name="model"> <attribute name="model">
<choice>
<value>vfio-pci</value> <value>vfio-pci</value>
</choice>
</attribute> </attribute>
<element name="source"> <element name="source">
<ref name="mdevaddress"/> <ref name="mdevaddress"/>
...@@ -4821,9 +4791,7 @@ ...@@ -4821,9 +4791,7 @@
<zeroOrMore> <zeroOrMore>
<element name="table"> <element name="table">
<attribute name="type"> <attribute name="type">
<choice>
<value>slic</value> <value>slic</value>
</choice>
</attribute> </attribute>
<ref name="absFilePath"/> <ref name="absFilePath"/>
</element> </element>
...@@ -5035,9 +5003,7 @@ ...@@ -5035,9 +5003,7 @@
<define name="rng"> <define name="rng">
<element name="rng"> <element name="rng">
<attribute name="model"> <attribute name="model">
<choice>
<value>virtio</value> <value>virtio</value>
</choice>
</attribute> </attribute>
<interleave> <interleave>
<ref name="rng-backend"/> <ref name="rng-backend"/>
...@@ -5162,9 +5128,7 @@ ...@@ -5162,9 +5128,7 @@
</optional> </optional>
<optional> <optional>
<attribute name='job'> <attribute name='job'>
<choice>
<value>copy</value> <value>copy</value>
</choice>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
......
...@@ -220,9 +220,7 @@ ...@@ -220,9 +220,7 @@
<element name='name'><text/></element> <element name='name'><text/></element>
</optional> </optional>
<element name='deviceAPI'> <element name='deviceAPI'>
<choice>
<value>vfio-pci</value> <value>vfio-pci</value>
</choice>
</element> </element>
<element name='availableInstances'> <element name='availableInstances'>
<ref name='unsignedInt'/> <ref name='unsignedInt'/>
......
...@@ -34,9 +34,7 @@ ...@@ -34,9 +34,7 @@
<define name='secret'> <define name='secret'>
<element name='secret'> <element name='secret'>
<attribute name='type'> <attribute name='type'>
<choice>
<value>passphrase</value> <value>passphrase</value>
</choice>
</attribute> </attribute>
<choice> <choice>
<attribute name='uuid'> <attribute name='uuid'>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册