Re: [PATCH] EFI: some easy constification

[Julien Grall <julien@xxxxxxx>]

Hi Jan,

On 17/09/2020 12:27, Jan Beulich wrote:
> Inspired by some of Trammell's suggestions, this harvests some low
> hanging fruit, without needing to be concerned about the definitions of
> the EFI interfaces themselves.
>
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Julien Grall <jgrall@xxxxxxxxxx>

Cheers,

> --- a/xen/arch/arm/efi/efi-boot.h
> +++ b/xen/arch/arm/efi/efi-boot.h
> @@ -420,7 +420,7 @@ static void __init efi_arch_memory_setup
>   
>   static void __init efi_arch_handle_cmdline(CHAR16 *image_name,
>                                              CHAR16 *cmdline_options,
> -                                           char *cfgfile_options)
> +                                           const char *cfgfile_options)
>   {
>       union string name;
>       char *buf;
> @@ -481,8 +481,9 @@ static void __init efi_arch_handle_cmdli
>       efi_bs->FreePool(buf);
>   }
>   
> -static void __init efi_arch_handle_module(struct file *file, const CHAR16 *name,
> -                                          char *options)
> +static void __init efi_arch_handle_module(const struct file *file,
> +                                          const CHAR16 *name,
> +                                          const char *options)
>   {
>       int node;
>       int chosen;
> --- a/xen/arch/x86/efi/efi-boot.h
> +++ b/xen/arch/x86/efi/efi-boot.h
> @@ -294,7 +294,7 @@ static void __init efi_arch_cfg_file_lat
>   
>   static void __init efi_arch_handle_cmdline(CHAR16 *image_name,
>                                              CHAR16 *cmdline_options,
> -                                           char *cfgfile_options)
> +                                           const char *cfgfile_options)
>   {
>       union string name;
>   
> @@ -635,8 +635,9 @@ static void __init efi_arch_memory_setup
>   #undef l2_4G_offset
>   }
>   
> -static void __init efi_arch_handle_module(struct file *file, const CHAR16 *name,
> -                                          char *options)
> +static void __init efi_arch_handle_module(const struct file *file,
> +                                          const CHAR16 *name,
> +                                          const char *options)
>   {
>       union string local_name;
>       void *ptr;
> --- a/xen/common/efi/boot.c
> +++ b/xen/common/efi/boot.c
> @@ -119,7 +119,7 @@ static char *split_string(char *s);
>   static CHAR16 *s2w(union string *str);
>   static char *w2s(const union string *str);
>   static bool read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name,
> -                      struct file *file, char *options);
> +                      struct file *file, const char *options);
>   static size_t wstrlen(const CHAR16 * s);
>   static int set_color(u32 mask, int bpp, u8 *pos, u8 *sz);
>   static bool match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2);
> @@ -539,7 +539,7 @@ static char * __init split_string(char *
>   }
>   
>   static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name,
> -                             struct file *file, char *options)
> +                             struct file *file, const char *options)
>   {
>       EFI_FILE_HANDLE FileHandle = NULL;
>       UINT64 size;
> @@ -1100,7 +1100,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SY
>       EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL;
>       union string section = { NULL }, name;
>       bool base_video = false;
> -    char *option_str;
> +    const char *option_str;
>       bool use_cfg_file;
>   
>       __set_bit(EFI_BOOT, &efi_flags);
--
Julien Grall