vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

xen_boot: Remove useless file_name_index variable.

Browse source
This commit is contained in:
Fu Wei 2015-11-12 11:33:55 +01:00 • committed by Vladimir Serbinenko
parent fb94736fe8
commit a771a7b9f6
1 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
grub-core/loader/arm64/xen_boot.c
View file

@ -136,16 +136,10 @@ xen_boot_address_align (grub_addr_t start, grub_size_t align)
return (align ? (ALIGN_UP (start, align)) : start); return (align ? (ALIGN_UP (start, align)) : start);
} }
/* Parse the option of xen_module command. For now, we support /* set module type according to command name. */
(1) --type <the compatible stream>
We also set up the type of module in this function.
If there are some "--type" options in the command line,
we make a custom compatible stream in this function. */
static grub_err_t static grub_err_t
set_module_type (grub_command_t cmd, struct xen_boot_binary *module, int *file_name_index) set_module_type (grub_command_t cmd, struct xen_boot_binary *module)
{ {
*file_name_index = 0;
if (!grub_strcmp (cmd->name, "xen_linux")) if (!grub_strcmp (cmd->name, "xen_linux"))
module->node_info.type = MODULE_IMAGE; module->node_info.type = MODULE_IMAGE;
else if (!grub_strcmp (cmd->name, "xen_initrd")) else if (!grub_strcmp (cmd->name, "xen_initrd"))
@ -440,7 +434,6 @@ grub_cmd_xen_module (grub_command_t cmd, int argc, char *argv[])
{ {
struct xen_boot_binary *module = NULL; struct xen_boot_binary *module = NULL;
int file_name_index = 0;
grub_file_t file = 0; grub_file_t file = 0;
if (!argc) if (!argc)
@ -462,8 +455,7 @@ grub_cmd_xen_module (grub_command_t cmd, int argc, char *argv[])
return grub_errno; return grub_errno;
/* process all the options and get module type */ /* process all the options and get module type */
if (set_module_type (cmd, module, &file_name_index) != if (set_module_type (cmd, module) != GRUB_ERR_NONE)
GRUB_ERR_NONE)
goto fail; goto fail;
switch (module->node_info.type) switch (module->node_info.type)
{ {
@ -491,12 +483,11 @@ grub_cmd_xen_module (grub_command_t cmd, int argc, char *argv[])
module->name, module->node_info.compat_string, module->name, module->node_info.compat_string,
module->node_info.compat_string_size); module->node_info.compat_string_size);
file = grub_file_open (argv[file_name_index]); file = grub_file_open (argv[0]);
if (!file) if (!file)
goto fail; goto fail;
xen_boot_binary_load (module, file, argc - file_name_index, xen_boot_binary_load (module, file, argc, argv);
argv + file_name_index);
if (grub_errno == GRUB_ERR_NONE) if (grub_errno == GRUB_ERR_NONE)
grub_list_push (GRUB_AS_LIST_P (&module_head), GRUB_AS_LIST (module)); grub_list_push (GRUB_AS_LIST_P (&module_head), GRUB_AS_LIST (module));