[libvirt] [PATCHv5 3/6] domaincommon.rng: Add bootloader, bootloader_arg to os=hvm schema for Bhyve

Conrad Meyer cse.cem at gmail.com
Mon Oct 27 14:37:38 UTC 2014


Sponsored by:  EMC / Isilon storage division

Signed-off-by: Conrad Meyer <conrad.meyer at isilon.com>
---
 docs/schemas/domaincommon.rng | 41 ++++++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 20d81ae..1c444e0 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -213,7 +213,7 @@
     <choice>
       <group>
         <optional>
-          <ref name="bootloader"/>
+          <ref name="xenbootloader"/>
         </optional>
         <element name="os">
           <ref name="ostypexen"/>
@@ -221,7 +221,7 @@
         </element>
       </group>
       <group>
-        <ref name="bootloader"/>
+        <ref name="xenbootloader"/>
         <optional>
           <element name="os">
             <ref name="ostypexen"/>
@@ -234,6 +234,9 @@
     </choice>
   </define>
   <define name="oshvm">
+    <optional>
+      <ref name="bhyvebootloader"/>
+    </optional>
     <element name="os">
       <ref name="ostypehvm"/>
       <interleave>
@@ -1053,17 +1056,33 @@
       binary or script used to extract the data from the first disk device.
     -->
   <define name="bootloader">
+    <element name="bootloader">
+      <choice>
+        <ref name="absFilePath"/>
+        <empty/>
+      </choice>
+    </element>
+  </define>
+  <define name="bootloader_args">
+    <element name="bootloader_args">
+      <text/>
+    </element>
+  </define>
+  <define name="xenbootloader">
     <interleave>
-      <element name="bootloader">
-        <choice>
-          <ref name="absFilePath"/>
-          <empty/>
-        </choice>
-      </element>
+      <ref name="bootloader"/>
       <optional>
-        <element name="bootloader_args">
-          <text/>
-        </element>
+        <ref name="bootloader_args"/>
+      </optional>
+    </interleave>
+  </define>
+  <define name="bhyvebootloader">
+    <interleave>
+      <optional>
+        <ref name="bootloader"/>
+      </optional>
+      <optional>
+        <ref name="bootloader_args"/>
       </optional>
     </interleave>
   </define>
-- 
1.9.3




More information about the libvir-list mailing list