From cd9680219023f76a434305bc66d8ac91ec7047ae Mon Sep 17 00:00:00 2001 From: Jeremy Szu Date: Tue, 21 Feb 2023 07:42:51 +0800 Subject: [PATCH] loader/i386/linux: Correct wrong initrd address for debug The "addr" is used to request the memory with specific ranges but the real loadable address come from the relocator. Thus, print the final retrieved addresses, virtual and physical, for initrd. On the occasion migrate to PRIxGRUB_ADDR and PRIxGRUB_SIZE format specifiers. Signed-off-by: Jeremy Szu Reviewed-by: Daniel Kiper --- grub-core/loader/i386/linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c index 10a367629..c2385d0a5 100644 --- a/grub-core/loader/i386/linux.c +++ b/grub-core/loader/i386/linux.c @@ -1123,8 +1123,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), if (grub_initrd_load (&initrd_ctx, initrd_mem)) goto fail; - grub_dprintf ("linux", "Initrd, addr=0x%x, size=0x%x\n", - (unsigned) addr, (unsigned) size); + grub_dprintf ("linux", "Initrd (%p) at 0x%" PRIxGRUB_ADDR ", size=0x%" PRIxGRUB_SIZE "\n", + initrd_mem, initrd_mem_target, size); linux_params.ramdisk_image = initrd_mem_target; linux_params.ramdisk_size = size; -- 2.47.2