[libvirt] [PATCH] docs: schema: Add missing <interleave> element to input device

Lily Zhu posted 1 patch 5 years, 10 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/1528962633-23842-1-git-send-email-lizhu@redhat.com
Test syntax-check passed
docs/schemas/domaincommon.rng | 2 ++
1 file changed, 2 insertions(+)
[libvirt] [PATCH] docs: schema: Add missing <interleave> element to input device
Posted by Lily Zhu 5 years, 10 months ago
Input device has 2 optional sub-elements - <alias> and <address> the
order of which should be interchangeable in the XML.

Signed-off-by: Lily Zhu <lizhu@redhat.com>
---
 docs/schemas/domaincommon.rng | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 1d06a5e..999b863 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4309,12 +4309,14 @@
           </element>
         </group>
       </choice>
+      <interleave>
       <optional>
         <ref name="alias"/>
       </optional>
       <optional>
         <ref name="address"/>
       </optional>
+      </interleave>
     </element>
   </define>
   <define name="hub">
-- 
1.8.3.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] docs: schema: Add missing <interleave> element to input device
Posted by Ján Tomko 5 years, 10 months ago
On Thu, Jun 14, 2018 at 03:50:33PM +0800, Lily Zhu wrote:
>Input device has 2 optional sub-elements - <alias> and <address> the
>order of which should be interchangeable in the XML.

If we're at it, the order of all the elements should be interchangeable,
even <source> and <driver>

>
>Signed-off-by: Lily Zhu <lizhu@redhat.com>
>---
> docs/schemas/domaincommon.rng | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
>index 1d06a5e..999b863 100644
>--- a/docs/schemas/domaincommon.rng
>+++ b/docs/schemas/domaincommon.rng
>@@ -4309,12 +4309,14 @@
>           </element>
>         </group>
>       </choice>
>+      <interleave>

This one should be moved right after:
<element name="input">

>       <optional>
>         <ref name="alias"/>
>       </optional>
>       <optional>
>         <ref name="address"/>
>       </optional>

And everything inbetween the newly added <interleave> needs to be
reindented.

Jano

>+      </interleave>
>     </element>
>   </define>
>   <define name="hub">
>-- 
>1.8.3.1
>
>--
>libvir-list mailing list
>libvir-list@redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list