OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

hv: add Kconfig parameter to define the Service VM EFI bootloader 

Add a Kconfig parameter called UEFI_OS_LOADER_NAME to hold the Service VM EFI
bootloader to be run by the ACRN hypervisor. A new string manipulation function
to convert from (char *) to (CHAR16 *) has been added to facilitate the
implementation.

The default value is set to systemd-boot (bootloaderx64.efi)

Tracked-On: #2793
Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
This commit is contained in:
Geoffroy Van Cutsem 2019-11-07 09:02:02 +01:00 committed by wenlingz
parent 058b03c3a7
commit 51a43dab79
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hypervisor/arch/x86/Kconfig
View File

@ -296,3 +296,11 @@ config MAX_KATA_VM_NUM
int "Maximum number of Kata Containers in SOS"
range 0 1
default 0
config UEFI_OS_LOADER_NAME
string "UEFI OS loader name"
default "\\EFI\\org.clearlinux\\bootloaderx64.efi"
help
Name of the UEFI bootloader that starts the Service VM. This is
typically the systemd-boot or Grub bootloader but could be any other
UEFI executable.

3
misc/efi-stub/boot.c
View File

@ -394,7 +394,6 @@ fail:
}
#define DEFAULT_UEFI_OS_LOADER_NAME L"\\EFI\\org.clearlinux\\bootloaderx64.efi"
/**
* efi_main - The entry point for the OS loader image.
* @image: firmware-allocated handle that identifies the image
@ -460,7 +459,7 @@ efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *_table)
* bootloader name to be used. Fall back to the default bootloader
* as specified in config.h
*/
bootloader_name = DEFAULT_UEFI_OS_LOADER_NAME;
bootloader_name = ch8_2_ch16(CONFIG_UEFI_OS_LOADER_NAME, strlen(CONFIG_UEFI_OS_LOADER_NAME));
}
section = ".hv";

15
misc/efi-stub/stdlib.h
View File

@ -108,4 +108,19 @@ static inline char *ch16_2_ch8(CHAR16 *str16, UINTN len)
return str8;
}
static inline CHAR16 *ch8_2_ch16(char *str8, UINTN len)
{
UINTN i;
CHAR16 *str16;
str16 = AllocatePool((len + 1) * sizeof(CHAR16));
for (i = 0; i < len; i++)
str16[i] = str8[i];
str16[len] = 0;
return str16;
}
#endif /* __STDLIB_H__ */