| Message ID | 20200929181717.1596965-4-hudson@trmm.net (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | efi: Unified Xen hypervisor/kernel/initrd images | expand |
On 29.09.2020 20:17, Trammell Hudson wrote: > This patch wraps the EFI OutputString() method so that they can be > called with const arguments. The OutputString method does not modify > its argument, although the prototype is missing const, so it is necssary > to cast away the const when calling it. > > Signed-off-by: Trammell Hudson <hudson@trmm.net> Reviewed-by: Jan Beulich <jbeulich@suse.com> with ... > --- a/xen/common/efi/boot.c > +++ b/xen/common/efi/boot.c > @@ -151,10 +151,16 @@ static struct file __initdata cfg; > static struct file __initdata kernel; > static struct file __initdata ramdisk; > static struct file __initdata xsm; > -static CHAR16 __initdata newline[] = L"\r\n"; > +static const CHAR16 __initconst newline[] = L"\r\n"; > > -#define PrintStr(s) StdOut->OutputString(StdOut, s) > -#define PrintErr(s) StdErr->OutputString(StdErr, s) > +static void __init PrintStr(const CHAR16 *s) > +{ > + StdOut->OutputString(StdOut, (CHAR16 *)s ); > +} > +static void __init PrintErr(const CHAR16 *s) ... a blank line added here and ... > @@ -275,7 +281,7 @@ static bool __init match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2) > void __init noreturn blexit(const CHAR16 *str) > { > if ( str ) > - PrintStr((CHAR16 *)str); > + PrintStr(str); ... the similar change to PrintErrMesg() also made. I'll be happy to do both while committing. Jan
diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 93cfeba7e1..fc2ea80e43 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -151,10 +151,16 @@ static struct file __initdata cfg; static struct file __initdata kernel; static struct file __initdata ramdisk; static struct file __initdata xsm; -static CHAR16 __initdata newline[] = L"\r\n"; +static const CHAR16 __initconst newline[] = L"\r\n"; -#define PrintStr(s) StdOut->OutputString(StdOut, s) -#define PrintErr(s) StdErr->OutputString(StdErr, s) +static void __init PrintStr(const CHAR16 *s) +{ + StdOut->OutputString(StdOut, (CHAR16 *)s ); +} +static void __init PrintErr(const CHAR16 *s) +{ + StdErr->OutputString(StdErr, (CHAR16 *)s ); +} /* * Include architecture specific implementation here, which references the @@ -275,7 +281,7 @@ static bool __init match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2) void __init noreturn blexit(const CHAR16 *str) { if ( str ) - PrintStr((CHAR16 *)str); + PrintStr(str); PrintStr(newline); if ( !efi_bs ) @@ -540,7 +546,7 @@ static char * __init split_string(char *s) return NULL; } -static void __init handle_file_info(CHAR16 *name, +static void __init handle_file_info(const CHAR16 *name, const struct file *file, const char *options) { if ( file == &cfg ) @@ -562,7 +568,7 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, EFI_FILE_HANDLE FileHandle = NULL; UINT64 size; EFI_STATUS ret; - CHAR16 *what = NULL; + const CHAR16 *what = NULL; if ( !name ) PrintErrMesg(L"No filename", EFI_OUT_OF_RESOURCES);
This patch wraps the EFI OutputString() method so that they can be called with const arguments. The OutputString method does not modify its argument, although the prototype is missing const, so it is necssary to cast away the const when calling it. Signed-off-by: Trammell Hudson <hudson@trmm.net> --- xen/common/efi/boot.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)