From: Frediano Ziglio <frediano.ziglio@cloud.com>
Date: Fri, 4 Jul 2025 14:06:16 +0000 (+0100)
Subject: loader/arm64/xen_boot: Consider alignment calling grub_arch_efi_linux_boot_image()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=030a70fcaded80a82a3951725f183ebaa8d5b38c;p=thirdparty%2Fgrub.git

loader/arm64/xen_boot: Consider alignment calling grub_arch_efi_linux_boot_image()

The Xen image is loaded with an alignment, not always at "start".

Signed-off-by: Frediano Ziglio <frediano.ziglio@cloud.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
---

diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
index 4e6f2d913..14afec143 100644
--- a/grub-core/loader/arm64/xen_boot.c
+++ b/grub-core/loader/arm64/xen_boot.c
@@ -247,13 +247,17 @@ fail:
 static grub_err_t
 xen_boot (void)
 {
+  grub_addr_t start;
+
   grub_err_t err = finalize_params_xen_boot ();
   if (err)
     return err;
 
-  return grub_arch_efi_linux_boot_image (xen_hypervisor->start,
-					  xen_hypervisor->size,
-					  xen_hypervisor->cmdline);
+  start = xen_boot_address_align (xen_hypervisor->start,
+				  xen_hypervisor->align);
+  return grub_arch_efi_linux_boot_image (start,
+					 xen_hypervisor->size,
+					 xen_hypervisor->cmdline);
 }
 
 static void