[PATCH v2] tools: fix arm build after bdf693ee61b48

[PATCH v2] tools: fix arm build after bdf693ee61b48

[Wei Liu]

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

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Julien Grall <julien.grall@arm.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>

Verified the build with a qemu-chroot.
---
 tools/libxc/xc_dom_arm.c | 10 +++++-----
 tools/libxl/libxl_arm.c  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c
index fce151d821..5b9eca6087 100644
--- a/tools/libxc/xc_dom_arm.c
+++ b/tools/libxc/xc_dom_arm.c
@@ -390,8 +390,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);
 
@@ -483,12 +483,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 de1840bece..3e46554301 100644
--- a/tools/libxl/libxl_arm.c
+++ b/tools/libxl/libxl_arm.c
@@ -923,7 +923,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) );
 
@@ -1053,8 +1053,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;
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel