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

[patchbot@xxxxxxx]

commit 47db4b088d18d900b5613ecb872283804320dde9
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Mon Oct 26 11:16:06 2015 +0000
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Mon Oct 26 11:25:07 2015 +0000

    Revert "libxl: use correct command line for arm guests."
    
    This reverts commit 9befcd335c21818caaf5c5ab764d31a4006d2800.
    
    This commit breaks the build:
     libxl_arm.c: In function 'libxl__arch_domain_init_hw_description':
     libxl_arm.c:591:76: error: 'state' undeclared (first use in this function)
     libxl_arm.c:591:76: note: each undeclared identifier is reported only once 
fo\
    r each function it appears in
     make[3]: *** [libxl_arm.o] Error 1
    
    "state" was introduced in a7511905 "xen: Extend DOMCTL createdomain to
    support arch configuration".
    
    On Julien's recommendation: a7511905 ought not to be backported, so
    revert this and wait for Ian Campbell to get back.
    
    Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    CC: Julien Grall <julien.grall@xxxxxxxxxx>
    CC: Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>
    CC: Jan Beulich <JBeulich@xxxxxxxx>
---
 tools/libxl/libxl_arm.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c
index f89533b..448ac07 100644
--- a/tools/libxl/libxl_arm.c
+++ b/tools/libxl/libxl_arm.c
@@ -195,7 +195,6 @@ 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;
@@ -204,9 +203,8 @@ static int make_chosen_node(libxl__gc *gc, void *fdt, bool 
ramdisk,
     res = fdt_begin_node(fdt, "chosen");
     if (res) return res;
 
-    if (state->pv_cmdline) {
-        LOG(DEBUG, "/chosen/bootargs = %s", state->pv_cmdline);
-        res = fdt_property_string(fdt, "bootargs", state->pv_cmdline);
+    if (info->cmdline) {
+        res = fdt_property_string(fdt, "bootargs", info->cmdline);
         if (res) return res;
     }
 
@@ -588,7 +586,7 @@ next_resize:
         FDT( fdt_begin_node(fdt, "") );
 
         FDT( make_root_properties(gc, vers, fdt) );
-        FDT( make_chosen_node(gc, fdt, !!dom->ramdisk_blob, state, info) );
+        FDT( make_chosen_node(gc, fdt, !!dom->ramdisk_blob, 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