From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 17 Dec 2015 12:43:58 +0000 (+0100)
Subject: schema: interleave domain name and uuid with other elements
X-Git-Tag: v1.2.18.3~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa3eb97fdc62425da6d49de140590d151e8e0720;p=thirdparty%2Flibvirt.git

schema: interleave domain name and uuid with other elements

Allow <name> and <uuid> anywhere under <domain>, not just at the top:

error:XML document failed to validate against schema: Unable to validate
doc against /usr/share/libvirt/schemas/domain.rng
Expecting an element name, got nothing
Invalid sequence in interleave
Element domain failed to validate content

Introduced with the first RelaxNG schema in commit c642103.

https://bugzilla.redhat.com/show_bug.cgi?id=1292131
(cherry picked from commit b4e0549febe416ffefc16f389423740d6d65fa74)
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 1120003518..9e7fad521d 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -30,8 +30,8 @@
   <define name="domain">
     <element name="domain">
       <ref name="hvs"/>
-      <ref name="ids"/>
       <interleave>
+        <ref name="ids"/>
         <optional>
           <ref name="title"/>
         </optional>