render / rpms / libvirt

Forked from rpms/libvirt 11 months ago
Clone
Daniel P. Berrange 206300
commit 2bcf35336cd649e58c08d7cf3452a8d4353bcf85
Daniel P. Berrange 206300
Author: Daniel Veillard <veillard@redhat.com>
Daniel P. Berrange 206300
Date:   Fri Mar 7 09:23:30 2008 +0000
Daniel P. Berrange 206300
Daniel P. Berrange 206300
    * src/xend_internal.c: applied patch from Cole Robinson to not
Daniel P. Berrange 206300
      loose the boot tag when defining a fully virtualized xen domain
Daniel P. Berrange 206300
    Daniel
Daniel P. Berrange 206300
Daniel P. Berrange 206300
diff --git a/src/xend_internal.c b/src/xend_internal.c
Daniel P. Berrange 206300
index 8bbc28f..fef54f8 100644
Daniel P. Berrange 206300
--- a/src/xend_internal.c
Daniel P. Berrange 206300
+++ b/src/xend_internal.c
Daniel P. Berrange 206300
@@ -1323,7 +1323,7 @@ xend_parse_sexp_desc_os(virConnectPtr xend, struct sexpr *node, virBufferPtr buf
Daniel P. Berrange 206300
     if (hvm)
Daniel P. Berrange 206300
         virBufferVSprintf(buf, "    <loader>%s</loader>\n", loader);
Daniel P. Berrange 206300
 
Daniel P. Berrange 206300
-    if (kernel) {
Daniel P. Berrange 206300
+    if ((kernel) && ((!loader) || (STRNEQ(kernel, loader)))) {
Daniel P. Berrange 206300
         virBufferVSprintf(buf, "    <kernel>%s</kernel>\n", kernel);
Daniel P. Berrange 206300
         if (initrd && initrd[0])
Daniel P. Berrange 206300
             virBufferVSprintf(buf, "    <initrd>%s</initrd>\n", initrd);