File xend-disk-order.patch of Package libvirt

File xend-disk-order.patch of Package libvirt (Revision 3c3f1d473162e2b647fe95537c2b069e)

Currently displaying revision 3c3f1d473162e2b647fe95537c2b069e, show latest

Index: libvirt-0.9.1/src/xenxs/xen_sxpr.c
===================================================================
--- libvirt-0.9.1.orig/src/xenxs/xen_sxpr.c
+++ libvirt-0.9.1/src/xenxs/xen_sxpr.c
@@ -342,20 +342,24 @@ xenParseSxprDisks(virDomainDefPtr def,
             const char *src = NULL;
             const char *dst = NULL;
             const char *mode = NULL;
+            int bootable;
 
             /* Again dealing with (vbd...) vs (tap ...) differences */
             if (sexpr_lookup(node, "device/vbd")) {
                 src = sexpr_node(node, "device/vbd/uname");
                 dst = sexpr_node(node, "device/vbd/dev");
                 mode = sexpr_node(node, "device/vbd/mode");
+                bootable = sexpr_int(node, "device/vbd/bootable");
             } else if (sexpr_lookup(node, "device/tap2")) {
                 src = sexpr_node(node, "device/tap2/uname");
                 dst = sexpr_node(node, "device/tap2/dev");
                 mode = sexpr_node(node, "device/tap2/mode");
+                bootable = sexpr_int(node, "device/tap2/bootable");
             } else {
                 src = sexpr_node(node, "device/tap/uname");
                 dst = sexpr_node(node, "device/tap/dev");
                 mode = sexpr_node(node, "device/tap/mode");
+                bootable = sexpr_int(node, "device/tap/bootable");
             }
 
             if (VIR_ALLOC(disk) < 0)
@@ -480,7 +484,13 @@ xenParseSxprDisks(virDomainDefPtr def,
             if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0)
                 goto no_memory;
 
-            def->disks[def->ndisks++] = disk;
+            if (bootable == 1 && def->ndisks > 0) {
+                memmove(def->disks + 1, def->disks, sizeof(def->disks) * def->ndisks);
+                def->disks[0] = disk;
+                def->ndisks++;
+            } else
+                def->disks[def->ndisks++] = disk;
+
             disk = NULL;
         }
     }