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

add CONFIG_VM0_DESC support

Browse Source 
if defined CONFIG_VM0_DESC, HV will use predefined vm0_desc to config
VM0, otherwise, HV will run VM0 with all physical cpus.

Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Jason Chen CJ
2018-05-30 20:06:26 +08:00
committed by lijinxia
parent 22833787ce
commit 589c72382a
6 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hypervisor/arch/x86/guest/vm.c
View File

@@ -29,6 +29,7 @@ static void init_vm(struct vm_description *vm_desc,
struct vm *vm_handle)
{
/* Populate VM attributes from VM description */
#ifdef CONFIG_VM0_DESC
if (is_vm0(vm_handle)) {
/* Allocate all cpus to vm0 at the beginning */
vm_handle->hw.num_vcpus = phys_cpu_num;
@@ -37,6 +38,9 @@ static void init_vm(struct vm_description *vm_desc,
vm_handle->hw.num_vcpus = vm_desc->vm_hw_num_cores;
vm_handle->hw.exp_num_vcpus = vm_desc->vm_hw_num_cores;
}
#else
vm_handle->hw.num_vcpus = vm_desc->vm_hw_num_cores;
#endif
}
/* return a pointer to the virtual machine structure associated with
@@ -339,6 +343,10 @@ int prepare_vm0(void)
struct vm *vm = NULL;
struct vm_description *vm_desc = &vm0_desc;
#ifndef CONFIG_VM0_DESC
vm_desc->vm_hw_num_cores = phys_cpu_num;
#endif
err = create_vm(vm_desc, &vm);
if (err != 0) {
return err;
@@ -360,6 +368,7 @@ int prepare_vm0(void)
return err;
}
#ifdef CONFIG_VM0_DESC
static inline bool vcpu_in_vm_desc(struct vcpu *vcpu,
struct vm_description *vm_desc)
{
@@ -404,3 +413,4 @@ void vm_fixup(struct vm *vm)
vm->hw.num_vcpus = vm->hw.exp_num_vcpus;
}
}
#endif

2
hypervisor/arch/x86/guest/vmcall.c
View File

@@ -39,10 +39,12 @@ int vmcall_vmexit_handler(struct vcpu *vcpu)
/* Dispatch the hypercall handler */
switch (hypcall_id) {
case HC_GET_API_VERSION:
#ifdef CONFIG_VM0_DESC
/* vm0 will call HC_GET_API_VERSION as first hypercall, fixup
* vm0 vcpu here.
*/
vm_fixup(vm);
#endif
ret = hcall_get_api_version(vm, param1);
break;