* src/xend_internal.c: applied patch from Cole Robinson to not

  loose the boot tag when defining a fully virtualized xen domain
Daniel

diff --git a/ChangeLog b/ChangeLog
index b60e137c9596f223b330063abd4c535701ec6906..2d79dfaacfb267ae96bfa2066e30e3f1e0c01ee3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar  7 10:22:00 CET 2008 Daniel Veillard <veillard@redhat.com>
+
+       * src/xend_internal.c: applied patch from Cole Robinson to not
+         loose the boot tag when defining a fully virtualized xen domain
+
 Tue Mar  4 20:01:00 UTC 2008 Richard W.M. Jones <rjones@redhat.com>
 
        Make iSCSI login actually work

diff --git a/src/xend_internal.c b/src/xend_internal.c
index 8bbc28f07c91b3a79583e4d5e2a175ab12671bb4..fef54f8717f859191741f92ffc721b9d02bae5a5 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -1323,7 +1323,7 @@ xend_parse_sexp_desc_os(virConnectPtr xend, struct sexpr *node, virBufferPtr buf
     if (hvm)
         virBufferVSprintf(buf, "    <loader>%s</loader>\n", loader);
 
-    if (kernel) {
+    if ((kernel) && ((!loader) || (STRNEQ(kernel, loader)))) {
         virBufferVSprintf(buf, "    <kernel>%s</kernel>\n", kernel);
         if (initrd && initrd[0])
             virBufferVSprintf(buf, "    <initrd>%s</initrd>\n", initrd);