From: Conrad Meyer <cse.cem@gmail.com>
Date: Sat, 8 Nov 2014 16:48:32 +0000 (-0500)
Subject: domaincommon.rng: Add 'bootloader' to os=hvm schema for Bhyve
X-Git-Tag: CVE-2014-8135~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79f370fc4be9e65a5186905c0aad92fe35d5bc3d;p=thirdparty%2Flibvirt.git

domaincommon.rng: Add 'bootloader' to os=hvm schema for Bhyve

Additionally, make the <bootloader> tag optional (for bhyveload with
custom arguments) (also, matches the actual parser).
---

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 737dae3553..6863ec656a 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -234,6 +234,9 @@
     </choice>
   </define>
   <define name="oshvm">
+    <optional>
+      <ref name="bootloader"/>
+    </optional>
     <element name="os">
       <ref name="ostypehvm"/>
       <interleave>
@@ -1054,12 +1057,14 @@
     -->
   <define name="bootloader">
     <interleave>
-      <element name="bootloader">
-        <choice>
-          <ref name="absFilePath"/>
-          <empty/>
-        </choice>
-      </element>
+      <optional>
+        <element name="bootloader">
+          <choice>
+            <ref name="absFilePath"/>
+            <empty/>
+          </choice>
+        </element>
+      </optional>
       <optional>
         <element name="bootloader_args">
           <text/>