File ac63014c-libxl-domxml-from-native.patch of Package libvirt.1263

Overview Repositories Revisions Requests Users Attributes Meta

File ac63014c-libxl-domxml-from-native.patch of Package libvirt.1263

commit ac63014cfd75cdc4b9c9533899c593044aed8e1a
Author: Ian Campbell <Ian.Campbell@citrix.com>
Date:   Wed Jun 18 09:58:45 2014 +0100

xen: handle root= in xen-xm configuration files.
    
    In addition to extra= xm supported a root= option which was supposed
    to be incorporated into the final command line. Handle that for "virsh
    domxml-from-native xen-xm". Tested with the libxl backend.
    
    Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

Index: libvirt-1.2.5/src/xenxs/xen_xm.c
===================================================================
--- libvirt-1.2.5.orig/src/xenxs/xen_xm.c
+++ libvirt-1.2.5/src/xenxs/xen_xm.c
@@ -339,6 +339,8 @@ xenParseXM(virConfPtr conf, int xendConf
             def->os.nBootDevs++;
         }
     } else {
+        const char *extra, *root;
+
         if (xenXMConfigCopyStringOpt(conf, "bootloader", &def->os.bootloader) < 0)
             goto cleanup;
         if (xenXMConfigCopyStringOpt(conf, "bootargs", &def->os.bootloaderArgs) < 0)
@@ -348,8 +350,18 @@ xenParseXM(virConfPtr conf, int xendConf
             goto cleanup;
         if (xenXMConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0)
             goto cleanup;
-        if (xenXMConfigCopyStringOpt(conf, "extra", &def->os.cmdline) < 0)
+        if (xenXMConfigGetString(conf, "extra", &extra, "") < 0)
+            goto cleanup;
+        if (xenXMConfigGetString(conf, "root", &root, NULL) < 0)
             goto cleanup;
+
+        if (root) {
+            if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0)
+                goto cleanup;
+        } else {
+            if (VIR_STRDUP(def->os.cmdline, extra) < 0)
+                goto cleanup;
+        }
     }
 
     if (xenXMConfigGetULongLong(conf, "memory", &def->mem.cur_balloon,

Places

File ac63014c-libxl-domxml-from-native.patch of Package libvirt.1263

Places