github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-17 15:51:34 +00:00
Code Issues Projects Releases Wiki Activity

acrn-config: fix the issue of failure to create a new launch setting.

Browse Source 
When creating a new launch setting, config app can't fine the
scenario config which caused the app failed to load the new
launch setting.

Tracked-On: #5282

Signed-off-by: Shuang Zheng <shuang.zheng@intel.com>
Reviewed-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Shuang Zheng 2020-09-07 06:05:20 +00:00 committed by wenlingz
parent c4815f1c98
commit f4a5b7fc68
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/acrn-config/config_app/static/main.js
View File

@ -30,7 +30,7 @@ $().ready(function(){
alert(result.status); alert(result.status);
} }
window.location.reload(); window.location = 'http://'+ window.location.host+"/scenario";
}, },
error: function(e){ error: function(e){
console.log(e.status); console.log(e.status);
@ -141,7 +141,7 @@ $().ready(function(){
data : JSON.stringify(data), data : JSON.stringify(data),
success : function(result) { success : function(result) {
console.log(result); console.log(result);
window.location.reload(true); window.location = 'http://'+ window.location.host+"/scenario";
}, },
error : function(e){ error : function(e){
console.log(e.status); console.log(e.status);

3
misc/acrn-config/config_app/views.py
View File

@ -388,7 +388,8 @@ def save_launch():
if not error_list: if not error_list:
launch_config.save(launch_config_data['new_launch_name']) launch_config.save(launch_config_data['new_launch_name'])
if old_launch_name != launch_config_data['new_launch_name']: if old_launch_name != launch_config_data['new_launch_name']:
os.remove(os.path.join(current_app.config.get('CONFIG_PATH'), xml_configs[1], old_launch_name + '.xml')) os.remove(os.path.join(current_app.config.get('CONFIG_PATH'), xml_configs[1], 'user_defined',
old_launch_name + '.xml'))
if os.path.isfile(tmp_launch_file): if os.path.isfile(tmp_launch_file):
os.remove(tmp_launch_file) os.remove(tmp_launch_file)

9
misc/acrn-config/library/launch_cfg_lib.py
View File

@ -568,9 +568,12 @@ def is_linux_like(uos_type):
def set_shm_regions(launch_item_values, scenario_info): def set_shm_regions(launch_item_values, scenario_info):
raw_shmem_regions = common.get_hv_item_tag(scenario_info, "FEATURES", "IVSHMEM", "IVSHMEM_REGION") try:
vm_types = common.get_leaf_tag_map(scenario_info, "vm_type") raw_shmem_regions = common.get_hv_item_tag(scenario_info, "FEATURES", "IVSHMEM", "IVSHMEM_REGION")
shm_enabled = common.get_hv_item_tag(scenario_info, "FEATURES", "IVSHMEM", "IVSHMEM_ENABLED") vm_types = common.get_leaf_tag_map(scenario_info, "vm_type")
shm_enabled = common.get_hv_item_tag(scenario_info, "FEATURES", "IVSHMEM", "IVSHMEM_ENABLED")
except:
return
sos_vm_id = 0 sos_vm_id = 0
for vm_id, vm_type in vm_types.items(): for vm_id, vm_type in vm_types.items():