Message ID | 20200102135624.30787-1-andrew.cooper3@citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | xen/efi: Drop infinite loops and use unreachable()/noreturn | expand |
On Thu, Jan 02, 2020 at 01:56:24PM +0000, Andrew Cooper wrote: > No functional change. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Wei Liu <wl@xen.org> Preferably with one additional adjustment below. > > static void __init efi_arch_cfg_file_early(EFI_FILE_HANDLE dir_handle, char *section) > diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c > index 3f1c330afe..1b7dc16056 100644 > --- a/xen/common/efi/boot.c > +++ b/xen/common/efi/boot.c > @@ -1402,7 +1402,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) > efi_exit_boot(ImageHandle, SystemTable); > efi_arch_post_exit_boot(); /* never returns */ Wei.
On 02.01.2020 17:46, Wei Liu wrote: > On Thu, Jan 02, 2020 at 01:56:24PM +0000, Andrew Cooper wrote: >> No functional change. >> >> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > > Reviewed-by: Wei Liu <wl@xen.org> Acked-by: Jan Beulich <jbeulich@suse.com>
Hi Andrew, On 02/01/2020 13:56, Andrew Cooper wrote: > No functional change. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: Julien Grall <julien@xen.org> Cheers,
diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index ca655ff003..d7bf934077 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -367,7 +367,7 @@ static void __init efi_arch_pre_exit_boot(void) { } -static void __init efi_arch_post_exit_boot(void) +static void __init noreturn efi_arch_post_exit_boot(void) { efi_xen_start(fdt, fdt_totalsize(fdt)); } diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 232972eedf..676d616ff8 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -268,7 +268,7 @@ static void __init noreturn efi_arch_post_exit_boot(void) [stkoff] "i" (STACK_SIZE - sizeof(struct cpu_info)), "D" (&mbi) : "memory" ); - for( ; ; ); /* not reached */ + unreachable(); } static void __init efi_arch_cfg_file_early(EFI_FILE_HANDLE dir_handle, char *section) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 3f1c330afe..1b7dc16056 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1402,7 +1402,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_exit_boot(ImageHandle, SystemTable); efi_arch_post_exit_boot(); - for( ; ; ); /* not reached */ } #ifndef CONFIG_ARM /* TODO - runtime service support */
No functional change. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Jan Beulich <JBeulich@suse.com> CC: Wei Liu <wl@xen.org> CC: Roger Pau Monné <roger.pau@citrix.com> CC: Stefano Stabellini <sstabellini@kernel.org> CC: Julien Grall <julien@xen.org> CC: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com> --- xen/arch/arm/efi/efi-boot.h | 2 +- xen/arch/x86/efi/efi-boot.h | 2 +- xen/common/efi/boot.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)