With all architectures no longer wanting an image name in the command line handling, drop the parameter and forgo making one up.
Signed-off-by: Andrew Cooper <[email protected]> --- CC: Jan Beulich <[email protected]> CC: Roger Pau Monné <[email protected]> CC: Wei Liu <[email protected]> CC: Stefano Stabellini <[email protected]> CC: Julien Grall <[email protected]> CC: Volodymyr Babchuk <[email protected]> CC: Bertrand Marquis <[email protected]> CC: Michal Orzel <[email protected]> --- xen/arch/arm/efi/efi-boot.h | 3 +-- xen/arch/x86/efi/efi-boot.h | 3 +-- xen/common/efi/boot.c | 15 +-------------- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 59d217667ff3..6e6db2445566 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -454,8 +454,7 @@ static void __init efi_arch_memory_setup(void) { } -static void __init efi_arch_handle_cmdline(CHAR16 *image_name, - CHAR16 *cmdline_options, +static void __init efi_arch_handle_cmdline(CHAR16 *cmdline_options, const char *cfgfile_options) { union string name; diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 1a2a2dd83c9b..86467da301e5 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -303,8 +303,7 @@ static void __init efi_arch_cfg_file_late(const EFI_LOADED_IMAGE *image, } } -static void __init efi_arch_handle_cmdline(CHAR16 *image_name, - CHAR16 *cmdline_options, +static void __init efi_arch_handle_cmdline(CHAR16 *cmdline_options, const char *cfgfile_options) { union string name; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index e5e86f22b2b2..61108199188f 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1462,21 +1462,8 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, } } - /* - * EFI_LOAD_OPTION does not supply an image name as first component: - * Make one up. - */ - if ( argc && !*argv ) - { - EFI_FILE_HANDLE handle = get_parent_handle(loaded_image, - &file_name); - - handle->Close(handle); - *argv = file_name; - } - name.s = get_value(&cfg, section.s, "options"); - efi_arch_handle_cmdline(argc ? *argv : NULL, options, name.s); + efi_arch_handle_cmdline(options, name.s); if ( !base_video ) { base-commit: f96e2f64576cdbb147391c7cb399d393385719a9 -- 2.30.2
