| Message ID | 20181120104504.GM3513@dell |
|---|---|
| State | New |
| Headers | show |
| Series | arm64/xen: Fix too few arguments to function ‘grub_create_loader_cmdline’ | expand |
On Tue, Nov 20, 2018 at 10:45:04AM +0000, Lee Jones wrote: > From: Lee Jones <lee.jones@linaro.org> > > arm64/xen: Fix too few arguments to function ‘grub_create_loader_cmdline’ > > 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> Pushed despite it had malformed tabs. Next time please use "git format-patch" and "git send-email" to build and send the patches. Daniel
On Wed, 21 Nov 2018, Daniel Kiper wrote: > On Tue, Nov 20, 2018 at 10:45:04AM +0000, Lee Jones wrote: > > From: Lee Jones <lee.jones@linaro.org> > > > > arm64/xen: Fix too few arguments to function ‘grub_create_loader_cmdline’ > > > > 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> > > Pushed despite it had malformed tabs. Next time please use "git format-patch" > and "git send-email" to build and send the patches. I normally do this (for my kernel work), but Leif asked me to reply directly to this mail (since I am not set-up for Grub). If I continue to contribute, I'll set something up more enduring. Thank you for your help.
diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c index 1003a0b99..33a855df4 100644 --- a/grub-core/loader/arm64/xen_boot.c +++ b/grub-core/loader/arm64/xen_boot.c @@ -368,7 +368,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);