Only use bootloader for paravirt guests

diff --git a/ChangeLog b/ChangeLog
index 7e655622b76f91426b8437ff5a548bc5babb4260..3ce29ce851c462ea1477fa9332108bc9622b9eb5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Sep 30 12:27:36 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/xend_internal.c: Don't include <bootloader/> for HVM guests
+       * tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: revert previous
+       change since HVM doesn't use bootloaders
+
 Sun Sep 30 15:20:36 CEST 2007 Daniel Veillard <veillard@redhat.com>
 
        * src/virsh.c: use virNodeGetFreeMemory() for freecell without

diff --git a/src/xend_internal.c b/src/xend_internal.c
index b0e8d0cc90f24a29ea8b039156279844fa5d063f..5b28065df81fa4a0845c6a86627b78288f1e892e 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -1401,25 +1401,27 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
     virUUIDFormat(uuid, uuidstr);
     virBufferVSprintf(&buf, "  <uuid>%s</uuid>\n", uuidstr);
 
-    tmp = sexpr_node(root, "domain/bootloader");
-    if (tmp != NULL) {
-        bootloader = 1;
-        virBufferVSprintf(&buf, "  <bootloader>%s</bootloader>\n", tmp);
-    } else if (sexpr_has(root, "domain/bootloader")) {
-        bootloader = 1;
-        virBufferVSprintf(&buf, "  <bootloader/>\n");
-    }
-    tmp = sexpr_node(root, "domain/bootloader_args");
-    if (tmp != NULL && bootloader) {
-        /*
-         * Only insert bootloader_args if there is also a bootloader param
-         */
-        virBufferEscapeString(&buf, "  <bootloader_args>%s</bootloader_args>\n", tmp);
+    hvm = sexpr_lookup(root, "domain/image/hvm") ? 1 : 0;
+    if (!hvm) {
+        tmp = sexpr_node(root, "domain/bootloader");
+        if (tmp != NULL) {
+            bootloader = 1;
+            virBufferVSprintf(&buf, "  <bootloader>%s</bootloader>\n", tmp);
+        } else if (sexpr_has(root, "domain/bootloader")) {
+            bootloader = 1;
+            virBufferVSprintf(&buf, "  <bootloader/>\n");
+        }
+        tmp = sexpr_node(root, "domain/bootloader_args");
+        if (tmp != NULL && bootloader) {
+            /*
+             * Only insert bootloader_args if there is also a bootloader param
+             */
+            virBufferEscapeString(&buf, "  <bootloader_args>%s</bootloader_args>\n", tmp);
+        }
     }
 
     if (domid != 0) {
         if (sexpr_lookup(root, "domain/image")) {
-            hvm = sexpr_lookup(root, "domain/image/hvm") ? 1 : 0;
             if (xend_parse_sexp_desc_os(conn, root, &buf, hvm, bootloader) < 0)
                 goto error;
         }

diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
index cfc1949c69efc5cd1b8d410a10c163490dd65291..429474aff26103adfc2326b1afc3592fbdf09fbc 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
@@ -1,7 +1,6 @@
 <domain type='xen' id='6'>
   <name>test</name>
   <uuid>cc2315e7-d26a-307a-438c-6d188ec4c09c</uuid>
-  <bootloader/>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>