github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-11 13:49:39 +00:00
Code Issues Projects Releases Wiki Activity

dm: add option to boot OVMF from acrn-dm

Browse Source 
Use '--ovmf <OVMF image location>' when launching acrn-dm.

Tracked-On: #1832
Signed-off-by: Peter Fang <peter.fang@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Peter Fang
2018-12-12 01:46:16 -08:00
committed by wenlingz
parent 9e97fd0680
commit d8c4e7d367
6 changed files with 180 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
devicemodel/core/main.c
View File

@@ -83,6 +83,7 @@ char *vmname;
int guest_ncpus;
char *guest_uuid_str;
char *vsbl_file_name;
char *ovmf_file_name;
char *kernel_file_name;
char *elf_file_name;
uint8_t trusty_enabled;
@@ -158,6 +159,7 @@ usage(int code)
" --dump: show build-in VM configurations\n"
#endif
" --vsbl: vsbl file path\n"
" --ovmf: ovmf file path\n"
" --part_info: guest partition info file path\n"
" --enable_trusty: enable trusty for guest\n"
" --ptdev_no_reset: disable reset check for ptdev\n"
@@ -242,6 +244,9 @@ high_bios_size(void)
{
size_t size = 0;
if (ovmf_file_name)
size = ovmf_image_size();
return roundup2(size, 2 * MB);
}
@@ -715,6 +720,7 @@ sig_handler_term(int signo)
enum {
CMD_OPT_VSBL = 1000,
CMD_OPT_OVMF,
CMD_OPT_PART_INFO,
CMD_OPT_TRUSTY_ENABLE,
CMD_OPT_VIRTIO_POLL_ENABLE,
@@ -752,6 +758,7 @@ static struct option long_options[] = {
{"dump", required_argument, 0, CMD_OPT_DUMP},
#endif
{"vsbl", required_argument, 0, CMD_OPT_VSBL},
{"ovmf", required_argument, 0, CMD_OPT_OVMF},
{"part_info", required_argument, 0, CMD_OPT_PART_INFO},
{"enable_trusty", no_argument, 0,
CMD_OPT_TRUSTY_ENABLE},
@@ -864,11 +871,17 @@ dm_run(int argc, char *argv[])
print_version();
break;
case CMD_OPT_VSBL:
if (acrn_parse_vsbl(optarg) != 0) {
if (high_bios_size() == 0 && acrn_parse_vsbl(optarg) != 0) {
errx(EX_USAGE, "invalid vsbl param %s", optarg);
exit(1);
}
break;
case CMD_OPT_OVMF:
if (!vsbl_file_name && acrn_parse_ovmf(optarg) != 0) {
errx(EX_USAGE, "invalid ovmf param %s", optarg);
exit(1);
}
break;
case CMD_OPT_PART_INFO:
if (acrn_parse_guest_part_info(optarg) != 0) {
errx(EX_USAGE,