OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

acrn-config: fix issue of acrn build failed on industry scenario when ivshmem configured 

add extern acrn_vm_pci_dev_config variables in vm_configuration.c
when ivshmem configured on scenarios with ivshmem configured.

Tracked-On: #5298

Signed-off-by: Shuang Zheng <shuang.zheng@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Shuang Zheng 2020-09-10 13:19:17 +08:00 committed by wenlingz
parent 557704458e
commit 70861b35b9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
misc/acrn-config/scenario_config/vm_configurations_c.py
View File

@ -404,7 +404,7 @@ def gen_post_launch_vm(vm_type, vm_i, scenario_items, config):
print("\t},", file=config) print("\t},", file=config)
def pre_launch_definition(vm_info, config): def declare_pci_devs(vm_info, config):
for vm_i,vm_type in common.VM_TYPES.items(): for vm_i,vm_type in common.VM_TYPES.items():
if scenario_cfg_lib.VM_DB[vm_type]['load_type'] not in ["PRE_LAUNCHED_VM", "POST_LAUNCHED_VM"]: if scenario_cfg_lib.VM_DB[vm_type]['load_type'] not in ["PRE_LAUNCHED_VM", "POST_LAUNCHED_VM"]:
@ -424,10 +424,19 @@ def generate_file(scenario_items, config):
err_dic = {} err_dic = {}
vm_info = scenario_items['vm'] vm_info = scenario_items['vm']
gen_source_header(config) gen_source_header(config)
pci_dev_config_flag = False
for vm_i,pci_dev_num in vm_info.cfg_pci.pci_dev_num.items(): for vm_i,pci_dev_num in vm_info.cfg_pci.pci_dev_num.items():
if pci_dev_num >= 2: if pci_dev_num >= 2:
pre_launch_definition(vm_info, config) pci_dev_config_flag = True
break break
if vm_info.shmem.shmem_enabled == 'y':
for vm_id, shm_num in vm_info.shmem.shmem_num.items():
if shm_num > 0:
pci_dev_config_flag = True
break
if pci_dev_config_flag:
declare_pci_devs(vm_info, config)
if (board_cfg_lib.is_matched_board(("ehl-crb-b")) if (board_cfg_lib.is_matched_board(("ehl-crb-b"))
and vm_info.pt_intx_info.phys_gsi.get(0) is not None and vm_info.pt_intx_info.phys_gsi.get(0) is not None