41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: Lee Jones <lee.jones@linaro.org>
|
|||
|
|
Date: Tue, 20 Nov 2018 10:45:04 +0000
|
|||
|
|
Subject: [PATCH] arm64/xen: Fix too few arguments to function
|
|||
|
|
grub_create_loader_cmdline()
|
|||
|
|
MIME-Version: 1.0
|
|||
|
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|
|||
|
|
Without this fix, building xen_boot.c omits:
|
|||
|
|
|
|||
|
|
loader/arm64/xen_boot.c: In function ‘xen_boot_binary_load’:
|
|||
|
|
loader/arm64/xen_boot.c:370:7: error: too few arguments to function ‘grub_create_loader_cmdline’
|
|||
|
|
grub_create_loader_cmdline (argc - 1, argv + 1, binary->cmdline,
|
|||
|
|
^~~~~~~~~~~~~~~~~~~~~~~~~~
|
|||
|
|
In file included from loader/arm64/xen_boot.c:36:0:
|
|||
|
|
../include/grub/lib/cmdline.h:29:12: note: declared here
|
|||
|
|
grub_err_t grub_create_loader_cmdline (int argc, char *argv[], char *buf,
|
|||
|
|
|
|||
|
|
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
|||
|
|
Reviewed-by: Julien Grall <julien.grall@arm.com>
|
|||
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|||
|
|
---
|
|||
|
|
grub-core/loader/arm64/xen_boot.c | 3 ++-
|
|||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|||
|
|
|
|||
|
|
diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
|
|||
|
|
index 318c833de57..1a337866f08 100644
|
|||
|
|
--- a/grub-core/loader/arm64/xen_boot.c
|
|||
|
|
+++ b/grub-core/loader/arm64/xen_boot.c
|
|||
|
|
@@ -367,7 +367,8 @@ xen_boot_binary_load (struct xen_boot_binary *binary, grub_file_t file,
|
|||
|
|
return;
|
|||
|
|
}
|
|||
|
|
grub_create_loader_cmdline (argc - 1, argv + 1, binary->cmdline,
|
|||
|
|
- binary->cmdline_size);
|
|||
|
|
+ binary->cmdline_size,
|
|||
|
|
+ GRUB_VERIFY_KERNEL_CMDLINE);
|
|||
|
|
grub_dprintf ("xen_loader",
|
|||
|
|
"Xen_boot cmdline @ %p %s, size: %d\n",
|
|||
|
|
binary->cmdline, binary->cmdline, binary->cmdline_size);
|