From: Osier Yang <jyang@redhat.com>
Date: Fri, 15 Jun 2012 02:34:04 +0000 (+0800)
Subject: schema: Update domain XML schema
X-Git-Tag: v0.9.13-rc1~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b34324fbf09c82fbd4ad2c0dcc140172ee045c8a;p=thirdparty%2Flibvirt.git

schema: Update domain XML schema

'boot' tag shouldn't be exclusive with 'kernel', 'initrd', and 'cmdline',
though the boot sequence doesn't make sense when the guest boots from
kernel directly. But it's useful if booting from kernel is to install
a newguest, even if it's not to install a guest, there is no hurt. And
on the other hand, we allow 'boot' and the kernel tags when parsing.
---

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 62c28c8d84..46e539da0e 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -222,12 +222,14 @@
             <ref name="absFilePath"/>
           </element>
         </optional>
-        <choice>
+        <optional>
           <ref name="osbootkernel"/>
+        </optional>
+        <optional>
           <zeroOrMore>
             <ref name="osbootdev"/>
           </zeroOrMore>
-        </choice>
+        </optional>
         <optional>
           <element name="bootmenu">
             <attribute name="enable">