[Xen-changelog] [xen stable-4.5] libxl: use correct command line for arm guests.

[patchbot@xxxxxxx]

commit 9befcd335c21818caaf5c5ab764d31a4006d2800
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Thu Aug 6 11:55:57 2015 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Wed Oct 21 17:08:56 2015 +0100

    libxl: use correct command line for arm guests.
    
    We need to use libxl__domain_build_state.pv_cmdline in order to pickup
    the correct args when using pygrub. libxl_domain_build_info.cmdline is
    any args statically configured by the user.
    
    This is consistent with the call to xc_domain_allocate, which takes
    the cmdline too (in that case for x86/PV usage).
    
    state->pv_cmdline is also set for non-pygrub guests, since
    libxl__bootloader_run propagates info->cmdline if no bootloader is
    configured.
    
    Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    (cherry picked from commit 201eac83831d94ba2e9a63a7eed4c128633fafb1)
---
 tools/libxl/libxl_arm.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c
index 448ac07..f89533b 100644
--- a/tools/libxl/libxl_arm.c
+++ b/tools/libxl/libxl_arm.c
@@ -195,6 +195,7 @@ static int make_root_properties(libxl__gc *gc,
 }
 
 static int make_chosen_node(libxl__gc *gc, void *fdt, bool ramdisk,
+                            libxl__domain_build_state *state,
                             const libxl_domain_build_info *info)
 {
     int res;
@@ -203,8 +204,9 @@ static int make_chosen_node(libxl__gc *gc, void *fdt, bool 
ramdisk,
     res = fdt_begin_node(fdt, "chosen");
     if (res) return res;
 
-    if (info->cmdline) {
-        res = fdt_property_string(fdt, "bootargs", info->cmdline);
+    if (state->pv_cmdline) {
+        LOG(DEBUG, "/chosen/bootargs = %s", state->pv_cmdline);
+        res = fdt_property_string(fdt, "bootargs", state->pv_cmdline);
         if (res) return res;
     }
 
@@ -586,7 +588,7 @@ next_resize:
         FDT( fdt_begin_node(fdt, "") );
 
         FDT( make_root_properties(gc, vers, fdt) );
-        FDT( make_chosen_node(gc, fdt, !!dom->ramdisk_blob, info) );
+        FDT( make_chosen_node(gc, fdt, !!dom->ramdisk_blob, state, info) );
         FDT( make_cpus_node(gc, fdt, info->max_vcpus, ainfo) );
         FDT( make_psci_node(gc, fdt) );
 
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.5

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog