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

hv: Build mptable for guest if VM type is Pre-Launched

Browse Source 
ACRN builds mptable for pre-launched VMs. It uses CONFIG_PARTITION_MODE
to compile mptable source code and related support. This patch removes
the macro and checks if the type of VM is pre-launched to build mptable.

Tracked-On: #2941
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Sainath Grandhi
2019-04-05 11:26:02 -07:00
committed by Eddie Dong
parent 869de39757
commit 16a2af5715
9 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hypervisor/dm/vmptable.c
View File

@@ -57,7 +57,7 @@ static struct mptable_info mptable_template = {
static struct proc_entry proc_entry_template = {
.type = MPCT_ENTRY_PROCESSOR,
.apic_version = LAPIC_VERSION,
.apic_version = LAPIC_VERSION_NUM,
.cpu_flags = PROCENTRY_FLAG_EN,
.cpu_signature = MPEP_SIG,
.feature_flags = MPEP_FEATURES
@@ -78,7 +78,9 @@ static uint8_t mpt_compute_checksum(void *base, size_t len)
}
/**
* @pre vm_config != NULL
* @pre vm != NULL
* @pre vm->vm_id < CONFIG_MAX_VM_NUM
* @pre vm_configs[vm->vm_id].mptable != NULL
*/
int32_t mptable_build(struct acrn_vm *vm)
{
@@ -90,11 +92,12 @@ int32_t mptable_build(struct acrn_vm *vm)
uint16_t i;
uint16_t vcpu_num;
uint64_t pcpu_bitmap = 0U;
struct mptable_info *mptable = &vm->mptable;
struct mptable_info *mptable;
struct acrn_vm_config *vm_config;
vm_config = get_vm_config(vm->vm_id);
vcpu_num = get_vm_pcpu_nums(vm_config);
mptable = vm_config->mptable;
vcpu_num = vm_config->cpu_num;
pcpu_bitmap = vm_config->pcpu_bitmap;
(void *)memcpy_s((void *)mptable, sizeof(struct mptable_info),
(const void *)&mptable_template, sizeof(struct mptable_info));