]> xenbits.xensource.com Git - unikraft/unikraft.git/commitdiff
plat/xen: Fix implicit int cast build error
authorAndrei Stan <andreistan2003@gmail.com>
Fri, 4 Oct 2024 14:46:10 +0000 (17:46 +0300)
committerUnikraft Bot <monkey@unikraft.io>
Thu, 12 Dec 2024 00:17:21 +0000 (00:17 +0000)
Building xen on arm64 with Clang would fail due to an implicit
cast from char * to __uptr.

Signed-off-by: Andrei Stan <andreistan2003@gmail.com>
Reviewed-by: Oleksii Moisieiev <oleksii_moisieiev@epam.com>
Reviewed-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
Reviewed-by: Simon Kuenzer <simon@unikraft.io>
Approved-by: Simon Kuenzer <simon@unikraft.io>
GitHub-Closes: #1518

plat/xen/arm/setup64.c

index 77c93323b10385794089e539060842a4c1f63eff..ffb0108a8df971815b1ccfe6c3d20ab5839fc382 100644 (file)
@@ -173,7 +173,7 @@ static inline void _get_cmdline(struct ukplat_bootinfo *bi)
 
        UK_ASSERT(bi);
 
-       bi->cmdline = CONFIG_UK_NAME;
+       bi->cmdline = (__uptr)CONFIG_UK_NAME;
        bi->cmdline_len = sizeof(CONFIG_UK_NAME) - 1;
 
        fdtchosen = fdt_path_offset(HYPERVISOR_dtb, "/chosen");
@@ -181,7 +181,7 @@ static inline void _get_cmdline(struct ukplat_bootinfo *bi)
                fdtcmdline = fdt_getprop(HYPERVISOR_dtb, fdtchosen, "bootargs",
                                         &len);
                if (fdtcmdline) {
-                       bi->cmdline = fdtcmdline;
+                       bi->cmdline = (__uptr)fdtcmdline;
                        bi->cmdline_len = len;
                }
        }