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

acrn-config: remove hard code UUID from config xmls

Browse Source 
To keep align hv source code changes, config tool doese below changes:
1. Remove UUID from scenario config files.
2. Remove severity from scenario config files.
3. Use vm type to instead load order type.
4. Use the mapped UUID data base for launch vm script configurations.
5. Unify the ui_entry_api for '--out'

Tracked-On: #4641
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
Acked-by: Terry Zou <terry.zou@intel.com>
This commit is contained in:
Wei Liu
2020-04-16 16:50:11 +08:00
committed by wenlingz
parent 86e467f682
commit a12b746a18
10 changed files with 166 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
misc/acrn-config/launch_config/launch_cfg_gen.py
View File

@@ -86,10 +86,10 @@ def validate_launch_setting(board_info, scenario_info, launch_info):
return (launch_cfg_lib.ERR_LIST, pt_sel, virtio, dm)
def ui_entry_api(board_info, scenario_info, launch_info):
def ui_entry_api(board_info, scenario_info, launch_info, out):
err_dic = {}
arg_list = ['launch_cfg_gen.py', '--board', board_info, '--scenario', scenario_info, '--launch', launch_info, '--uosid', '0']
arg_list = ['launch_cfg_gen.py', '--board', board_info, '--scenario', scenario_info, '--launch', launch_info, '--uosid', '0', '--out', out]
err_dic = common.prepare()
if err_dic:
@@ -148,9 +148,6 @@ def main(args):
if err_dic:
return err_dic
if output_folder:
common.ACRN_CONFIG_TARGET = os.path.abspath(output_folder) + '/'
# check env
err_dic = common.prepare()
if err_dic:
@@ -201,10 +198,13 @@ def main(args):
# create output directory
board_name = names['board_name']
if common.ACRN_CONFIG_TARGET:
output = common.ACRN_CONFIG_TARGET + '/' + board_name + '/output/'
if output_folder:
if os.path.isabs(output_folder):
output = os.path.join(output_folder + '/' + board_name, 'output/')
else:
output = os.path.join(ACRN_PATH + output_folder + '/' + board_name, 'output/')
else:
output = ACRN_CONFIG_DEF + '/' + board_name + '/output/'
output = os.path.join(ACRN_CONFIG_DEF + board_name, 'output/')
common.mkdir(output)
# generate launch script