github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-22 05:30:24 +00:00
Code Issues Projects Releases Wiki Activity

DM: Add long option to enable trusty

Browse Source 
The trusty enabled or not will be passed to HV
with create vm hypercall. It's passed to vSBL within
config page also.

Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Yin Fengwei 2018-04-02 22:22:01 +08:00 committed by Jack Ren
parent 731c0d41f9
commit f1e801dfeb
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devicemodel/core/main.c
View File

@ -74,6 +74,7 @@ char *vmname;
int guest_ncpus; int guest_ncpus;
char *guest_uuid_str; char *guest_uuid_str;
char *vsbl_file_name; char *vsbl_file_name;
uint8_t trusty_enabled;
bool stdio_in_use; bool stdio_in_use;
static int guest_vmexit_on_hlt, guest_vmexit_on_pause; static int guest_vmexit_on_hlt, guest_vmexit_on_pause;
@ -129,7 +130,7 @@ usage(int code)
"Usage: %s [-abehuwxACHPSWY] [-c vcpus] [-g <gdb port>] [-l <lpc>]\n" "Usage: %s [-abehuwxACHPSWY] [-c vcpus] [-g <gdb port>] [-l <lpc>]\n"
" %*s [-m mem] [-p vcpu:hostcpu] [-s <pci>] [-U uuid] \n" " %*s [-m mem] [-p vcpu:hostcpu] [-s <pci>] [-U uuid] \n"
" %*s [--vsbl vsbl_file_name] [--part_info part_info_name]\n" " %*s [--vsbl vsbl_file_name] [--part_info part_info_name]\n"
" %*s <vm>\n" " %*s [--enable_trusty] <vm>\n"
" -a: local apic is in xAPIC mode (deprecated)\n" " -a: local apic is in xAPIC mode (deprecated)\n"
" -A: create ACPI tables\n" " -A: create ACPI tables\n"
" -c: # cpus (default 1)\n" " -c: # cpus (default 1)\n"
@ -156,7 +157,8 @@ usage(int code)
" -B: bootargs for kernel\n" " -B: bootargs for kernel\n"
" -v: version\n" " -v: version\n"
" --vsbl: vsbl file path\n" " --vsbl: vsbl file path\n"
" --part_info: guest partition info file path\n", " --part_info: guest partition info file path\n"
" --enable_trusty: enable trusty for guest\n",
progname, (int)strlen(progname), "", (int)strlen(progname), "", progname, (int)strlen(progname), "", (int)strlen(progname), "",
(int)strlen(progname), ""); (int)strlen(progname), "");
@ -555,6 +557,7 @@ sig_handler_term(int signo)
enum { enum {
CMD_OPT_VSBL = 1000, CMD_OPT_VSBL = 1000,
CMD_OPT_PART_INFO, CMD_OPT_PART_INFO,
CMD_OPT_TRUSTY_ENABLE,
}; };
static struct option long_options[] = { static struct option long_options[] = {
@ -589,6 +592,8 @@ static struct option long_options[] = {
/* Following cmd option only has long option */ /* Following cmd option only has long option */
{"vsbl", required_argument, 0, CMD_OPT_VSBL}, {"vsbl", required_argument, 0, CMD_OPT_VSBL},
{"part_info", required_argument, 0, CMD_OPT_PART_INFO}, {"part_info", required_argument, 0, CMD_OPT_PART_INFO},
{"enable_trusty", no_argument, 0,
CMD_OPT_TRUSTY_ENABLE},
{0, 0, 0, 0 }, {0, 0, 0, 0 },
}; };
@ -737,6 +742,9 @@ main(int argc, char *argv[])
exit(1); exit(1);
} }
break; break;
case CMD_OPT_TRUSTY_ENABLE:
trusty_enabled = 1;
break;
case 'h': case 'h':
usage(0); usage(0);
default: default:

1
devicemodel/core/sw_load_vsbl.c
View File

@ -282,6 +282,7 @@ acrn_sw_load_vsbl(struct vmctx *ctx)
*vsbl_entry = *((uint32_t *) vsbl_start_addr); *vsbl_entry = *((uint32_t *) vsbl_start_addr);
vsbl_para->boot_device_address = boot_blk_bdf; vsbl_para->boot_device_address = boot_blk_bdf;
vsbl_para->trusty_enabled = trusty_enabled;
return 0; return 0;
} }

1
devicemodel/core/vmmapi.c
View File

@ -149,6 +149,7 @@ vm_open(const char *name)
ctx->lowmem_limit = 2 * GB; ctx->lowmem_limit = 2 * GB;
ctx->name = (char *)(ctx + 1); ctx->name = (char *)(ctx + 1);
strcpy(ctx->name, name); strcpy(ctx->name, name);
create_vm.secure_world_enabled = trusty_enabled;
while (retry > 0) { while (retry > 0) {
error = ioctl(ctx->fd, IC_CREATE_VM, &create_vm); error = ioctl(ctx->fd, IC_CREATE_VM, &create_vm);

1
devicemodel/include/dm.h
View File

@ -38,6 +38,7 @@
struct vmctx; struct vmctx;
extern int guest_ncpus; extern int guest_ncpus;
extern char *guest_uuid_str; extern char *guest_uuid_str;
extern uint8_t trusty_enabled;
extern char *vsbl_file_name; extern char *vsbl_file_name;
extern char *vmname; extern char *vmname;
extern bool stdio_in_use; extern bool stdio_in_use;