github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-08 18:14:53 +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 eb341caa83
commit ccef1af1f0
10 changed files with 162 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
misc/acrn-config/board_config/board_cfg_gen.py
View File

@@ -54,20 +54,22 @@ def main(args):
err_dic['board config: Not match'] = "The board xml and scenario xml should be matched"
return err_dic
if common.ACRN_CONFIG_TARGET:
board_dir = common.ACRN_CONFIG_TARGET + board + '/'
if params['--out']:
if os.path.isabs(params['--out']):
board_dir = params['--out'] + board + '/'
config_board_kconfig = board_dir + GEN_FILE[4]
else:
board_dir = ACRN_PATH + params['--out'] + board + '/'
config_board_kconfig = board_dir + GEN_FILE[4]
else:
board_dir = ACRN_CONFIG_DEF + board + '/'
config_board_kconfig = board_dir + GEN_FILE[4]
common.mkdir(board_dir)
config_pci = board_dir + GEN_FILE[0]
config_board = board_dir + GEN_FILE[1]
config_acpi = board_dir + board + GEN_FILE[2]
config_misc_cfg = board_dir + GEN_FILE[3]
if common.ACRN_CONFIG_TARGET:
config_board_kconfig = common.ACRN_CONFIG_TARGET + board + GEN_FILE[4]
else:
config_board_kconfig = ACRN_CONFIG_DEF + board + GEN_FILE[4]
# generate board.c
with open(config_board, 'w+') as config:
@@ -97,9 +99,9 @@ def main(args):
return err_dic
def ui_entry_api(board_info, scenario_info):
def ui_entry_api(board_info, scenario_info, out):
arg_list = ['board_cfg_gen.py', '--board', board_info, '--scenario', scenario_info]
arg_list = ['board_cfg_gen.py', '--board', board_info, '--scenario', scenario_info, '--out', out]
err_dic = common.prepare()
if err_dic: