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

config tool: add load_order and redefine vm_type

Browse Source 
This patch includes:
1.add load_order(PRE_LAUNCHED_VM/SERVICE_VM/POST_LAUNCHED_VM) parameter
2.change vm_type parameter to values as RTVM, STANDARD_VM, TEE, REE
  TEE and REE are hide in UI.
3.deduce vm severity in vm_configuration from vm_type and load_order

This patch not includes:
change for scenario_config and functions called by scenario_config about checking

v2->v3:
*Refine template load_order

v1->v2:
*Change variable name from vm_type to load_order
*Change LoadOptionType to LoadOrderType
*Change VMOptionsType to VMType
*Add TEE_VM/REE_VM description
*Refine acrn:is-pre-launched-vm

Tracked-On: #6690
Signed-off-by: hangliu1 <hang1.liu@linux.intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
hangliu1
2022-02-17 03:06:05 -05:00
committed by acrnsi-robot
parent bb9db70c97
commit 816a88f7f7
26 changed files with 215 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
misc/config_tools/launch_config/launch_cfg_gen.py
View File

@@ -314,8 +314,8 @@ def main(board_xml, scenario_xml, launch_xml, user_vm_id, out_dir):
scenario_etree = etree.parse(scenario_xml)
launch_etree = etree.parse(launch_xml)
service_vm_id = eval_xpath(scenario_etree, "//vm[vm_type='SERVICE_VM']/@id")
post_vms = scenario_etree.xpath("//vm[starts-with(vm_type, 'POST_')]")
service_vm_id = eval_xpath(scenario_etree, "//vm[load_order='SERVICE_VM']/@id")
post_vms = scenario_etree.xpath("//vm[starts-with(load_order, 'POST_')]")
if service_vm_id is None and len(post_vms) > 0:
logging.error("The scenario does not define a service VM so no launch scripts will be generated for the post-launched VMs in the scenario.")
return 1