tools: fix arm build after bdf693ee61b48

The ramdisk fields were removed. We should use modules[0] instead.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
(cherry picked from commit db3ae8becc2b4f9f544eafa06a7c858c7cc9f029)

Gbp-Pq: Name tools-fix-arm-build-after-bdf693ee61b48.patch

diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c
index c069ace3569e8e9b729bc817fb9a3173b337e468..b23e4271c3aa772b680b3adb00c59b57a87e4e11 100644 (file)
--- a/tools/libxc/xc_dom_arm.c
+++ b/tools/libxc/xc_dom_arm.c
@@ -386,8 +386,8 @@ static int meminit(struct xc_dom_image *dom)
     const uint64_t kernsize = kernend - kernbase;
     const uint64_t dtb_size = dom->devicetree_blob ?
         ROUNDUP(dom->devicetree_size, XC_PAGE_SHIFT) : 0;
-    const uint64_t ramdisk_size = dom->ramdisk_blob ?
-        ROUNDUP(dom->ramdisk_size, XC_PAGE_SHIFT) : 0;
+    const uint64_t ramdisk_size = dom->modules[0].blob ?
+        ROUNDUP(dom->modules[0].size, XC_PAGE_SHIFT) : 0;
     const uint64_t modsize = dtb_size + ramdisk_size;
     const uint64_t ram128mb = bankbase[0] + (128<<20);
 
@@ -481,12 +481,12 @@ static int meminit(struct xc_dom_image *dom)
      */
     if ( ramdisk_size )
     {
-        dom->ramdisk_seg.vstart = modbase;
-        dom->ramdisk_seg.vend = modbase + ramdisk_size;
+        dom->modules[0].seg.vstart = modbase;
+        dom->modules[0].seg.vend = modbase + ramdisk_size;
 
         DOMPRINTF("%s: ramdisk: 0x%" PRIx64 " -> 0x%" PRIx64 "",
                   __FUNCTION__,
-                  dom->ramdisk_seg.vstart, dom->ramdisk_seg.vend);
+                  dom->modules[0].seg.vstart, dom->modules[0].seg.vend);
 
         modbase += ramdisk_size;
     }

diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c
index d842d888ebcf8db33d139173986a1cd95010bb18..a46b739e8902eaea65327f2796a94c4e9244bb6f 100644 (file)
--- a/tools/libxl/libxl_arm.c
+++ b/tools/libxl/libxl_arm.c
@@ -864,7 +864,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->modules[0].blob, state, info) );
         FDT( make_cpus_node(gc, fdt, info->max_vcpus, ainfo) );
         FDT( make_psci_node(gc, fdt) );
 
@@ -991,8 +991,8 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc,
     int i;
     const uint64_t bankbase[] = GUEST_RAM_BANK_BASES;
 
-    const struct xc_dom_seg *ramdisk = dom->ramdisk_blob ?
-        &dom->ramdisk_seg : NULL;
+    const struct xc_dom_seg *ramdisk = dom->modules[0].blob ?
+        &dom->modules[0].seg : NULL;
 
     if (ramdisk) {
         int chosen, res;