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