Re: [Xen-devel] [PATCH v2 11/23] efi: split out efi_init()

[Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>]

On Mon, Jul 20, 2015 at 04:29:06PM +0200, Daniel Kiper wrote:
> ..which initializes basic EFI variables. We want to re-use this
> code to support multiboot2 protocol on EFI platforms.
> 
> Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>

Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
> v2 - suggestions/fixes:
>    - improve commit message
>      (suggested by Jan Beulich).
> ---
>  xen/common/efi/boot.c |   28 +++++++++++++++++-----------
>  1 file changed, 17 insertions(+), 11 deletions(-)
> 
> diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
> index 1f188fe..6f327cd 100644
> --- a/xen/common/efi/boot.c
> +++ b/xen/common/efi/boot.c
> @@ -595,6 +595,22 @@ static char *__init get_value(const struct file *cfg, const char *section,
>      return NULL;
>  }
>  
> +static void __init efi_init(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
> +{
> +    efi_ih = ImageHandle;
> +    efi_bs = SystemTable->BootServices;
> +    efi_bs_revision = efi_bs->Hdr.Revision;
> +    efi_rs = SystemTable->RuntimeServices;
> +    efi_ct = SystemTable->ConfigurationTable;
> +    efi_num_ct = SystemTable->NumberOfTableEntries;
> +    efi_version = SystemTable->Hdr.Revision;
> +    efi_fw_vendor = SystemTable->FirmwareVendor;
> +    efi_fw_revision = SystemTable->FirmwareRevision;
> +
> +    StdOut = SystemTable->ConOut;
> +    StdErr = SystemTable->StdErr ?: StdOut;
> +}
> +
>  static void __init setup_efi_pci(void)
>  {
>      EFI_STATUS status;
> @@ -721,18 +737,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
>      set_bit(EFI_PLATFORM, &efi.flags);
>  #endif
>  
> -    efi_ih = ImageHandle;
> -    efi_bs = SystemTable->BootServices;
> -    efi_bs_revision = efi_bs->Hdr.Revision;
> -    efi_rs = SystemTable->RuntimeServices;
> -    efi_ct = SystemTable->ConfigurationTable;
> -    efi_num_ct = SystemTable->NumberOfTableEntries;
> -    efi_version = SystemTable->Hdr.Revision;
> -    efi_fw_vendor = SystemTable->FirmwareVendor;
> -    efi_fw_revision = SystemTable->FirmwareRevision;
> +    efi_init(ImageHandle, SystemTable);
>  
> -    StdOut = SystemTable->ConOut;
> -    StdErr = SystemTable->StdErr ?: StdOut;
>      use_cfg_file = efi_arch_use_config_file(SystemTable);
>  
>      status = efi_bs->HandleProtocol(ImageHandle, &loaded_image_guid,
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel