github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-23 09:47:44 +00:00
Code Issues Projects Releases Wiki Activity

HV: Refine 'hv_main()' function usage

Browse Source 
'hv_main()' wraps several logic which has no dependencies
   each other(enable VMX, prepare to create service os VM..),
   in this case, split this function to make code logic clear.

   remove 'is_vm0_bsp()' & 'hv_main()'
Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yonghua Huang
2018-08-03 21:58:02 +08:00
committed by lijinxia
parent 9d9c97d668
commit 2299926a88
5 changed files with 11 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
hypervisor/common/hv_main.c
View File

@@ -107,48 +107,6 @@ void vcpu_thread(struct vcpu *vcpu)
} while (1);
}
static bool is_vm0_bsp(uint16_t pcpu_id)
{
#ifdef CONFIG_VM0_DESC
return pcpu_id == vm0_desc.vm_pcpu_ids[0];
#else
return pcpu_id == BOOT_CPU_ID;
#endif
}
int32_t hv_main(uint16_t pcpu_id)
{
int32_t ret;
pr_info("%s, Starting common entry point for CPU %hu",
__func__, pcpu_id);
if (pcpu_id != get_cpu_id()) {
pr_err("%s, cpu_id %hu mismatch\n", __func__, pcpu_id);
return -EINVAL;
}
/* Enable virtualization extensions */
ret = exec_vmxon_instr(pcpu_id);
if (ret != 0) {
return ret;
}
/* X2APIC mode is disabled by default. */
x2apic_enabled = false;
if (is_vm0_bsp(pcpu_id)) {
ret = prepare_vm0();
if (ret != 0) {
return ret;
}
}
default_idle();
return 0;
}
#ifdef HV_DEBUG
void get_vmexit_profile(char *str_arg, int str_max)
{

3
hypervisor/common/hypercall.c
View File

@@ -161,9 +161,6 @@ int32_t hcall_create_vm(struct vm *vm, uint64_t param)
{
int32_t ret = 0;
struct vm *target_vm = NULL;
/* VM are created from hv_main() directly
* Here we just return the vmid for DM
*/
struct acrn_create_vm cv;
struct vm_description vm_desc;