acrn-config: remove hard code UUID from config xmls

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

View File

@@ -515,15 +515,11 @@ def dm_arg_set(names, sel, virt_io, dm, vmid, config):
boot_image_type(dm, vmid, config)
# uuid get
scenario_uuid = launch_cfg_lib.get_scenario_uuid()
scenario_uuid = launch_cfg_lib.get_scenario_uuid(vmid)
sos_vmid = launch_cfg_lib.get_sos_vmid()
if not str(sos_vmid).isnumeric():
sos_vmid = 0
key = "launch config err:"
launch_cfg_lib.ERR_LIST[key] = "There is no SOS_VM in scenario config file!"
# clearlinux/android/alios
dm_str = 'acrn-dm -A -m $mem_size -s 0:0,hostbridge -U {}'.format(scenario_uuid[vmid + sos_vmid])
dm_str = 'acrn-dm -A -m $mem_size -s 0:0,hostbridge -U {}'.format(scenario_uuid)
if uos_type in ("CLEARLINUX", "ANDROID", "ALIOS"):
if uos_type == "CLEARLINUX":
print("{} \\".format(dm_str), file=config)