github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-21 05:02:24 +00:00
Code Issues Projects Releases Wiki Activity

config_tools: rename scenario xml

Browse Source 
1. Rename industry.xml to shared.xml
2. Rename logical_partition.xml to partitioned.xml.
3. Update the name in view.py correspondingly.

Tracked-On: #6315
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
This commit is contained in:
Kunhui-Li 2021-07-21 19:45:24 +08:00 committed by wenlingz
parent 9f85c14594
commit eee6244225
40 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
misc/config_tools/config_app/views.py
View File

@ -614,7 +614,7 @@ def create_setting():
scenario_file = os.path.join(setting_path, create_name + '.xml')
if mode == 'create':
template_file_name = 'industry'
template_file_name = 'shared'
src_file_name = os.path.join(current_app.config.get('DEFAULT_CONFIG_PATH'), 'generic_board', template_file_name + '.xml')
else: # load
src_file_name = os.path.join(current_app.config.get('DEFAULT_CONFIG_PATH'), board_type, default_name + '.xml')
@ -1067,15 +1067,15 @@ def get_generic_scenario_config(scenario_config, add_vm_type=None):
if add_vm_type is not None:
vm_dict = {
'PRE_STD_VM': ('logical_partition', 'vm:id=0'),
'PRE_STD_VM': ('partitioned', 'vm:id=0'),
'PRE_RT_VM': ('hybrid_rt', 'vm:id=0'),
'SAFETY_VM': ('hybrid', 'vm:id=0'),
'SOS_VM': ('industry', 'vm:id=0'),
'POST_STD_VM': ('industry', 'vm:id=1'),
'POST_RT_VM': ('industry', 'vm:id=2'),
'KATA_VM': ('industry', 'vm:id=7'),
'SOS_VM': ('shared', 'vm:id=0'),
'POST_STD_VM': ('shared', 'vm:id=1'),
'POST_RT_VM': ('shared', 'vm:id=2'),
'KATA_VM': ('shared', 'vm:id=7'),
'LAUNCH_POST_STD_VM': ('hybrid_launch_2uos', 'uos:id=1'),
'LAUNCH_POST_RT_VM': ('industry_launch_6uos', 'uos:id=2')
'LAUNCH_POST_RT_VM': ('shared_launch_6uos', 'uos:id=2')
}
config_path = os.path.join(current_app.config.get('DEFAULT_CONFIG_PATH'), 'generic_board')
generic_scenario_config = XmlConfig(config_path)

2
misc/config_tools/data/cfl-k700-i7/industry.xml → misc/config_tools/data/cfl-k700-i7/shared.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<acrn-config board="cfl-k700-i7" scenario="industry">
<acrn-config board="cfl-k700-i7" scenario="shared">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/ehl-crb-b/logical_partition.xml → misc/config_tools/data/ehl-crb-b/partitioned.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<acrn-config board="ehl-crb-b" scenario="logical_partition">
<acrn-config board="ehl-crb-b" scenario="partitioned">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/ehl-crb-b/industry.xml → misc/config_tools/data/ehl-crb-b/shared.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<acrn-config board="ehl-crb-b" scenario="industry">
<acrn-config board="ehl-crb-b" scenario="shared">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_hardrt.xml → misc/config_tools/data/ehl-crb-b/shared_launch_1uos_hardrt.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="nuc7i7dnb" scenario="industry" uos_launcher="1">
<acrn-config board="ehl-crb-b" scenario="shared" uos_launcher="1">
<uos id="2">
<uos_type desc="UOS type">PREEMPT-RT LINUX</uos_type>
<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>

2
misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_vxworks.xml → misc/config_tools/data/ehl-crb-b/shared_launch_1uos_vxworks.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="nuc7i7dnb" scenario="industry" uos_launcher="1">
<acrn-config board="ehl-crb-b" scenario="shared" uos_launcher="1">
<uos id="1">
<uos_type desc="UOS type">VXWORKS</uos_type>
<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>

2
misc/config_tools/data/ehl-crb-b/industry_launch_1uos_waag.xml → misc/config_tools/data/ehl-crb-b/shared_launch_1uos_waag.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="ehl-crb-b" scenario="industry" uos_launcher="1">
<acrn-config board="ehl-crb-b" scenario="shared" uos_launcher="1">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/tgl-rvp/industry_launch_2uos.xml → misc/config_tools/data/ehl-crb-b/shared_launch_2uos.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="tgl-rvp" scenario="industry" uos_launcher="2">
<acrn-config board="ehl-crb-b" scenario="shared" uos_launcher="2">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/ehl-crb-b/industry_launch_6uos.xml → misc/config_tools/data/ehl-crb-b/shared_launch_6uos.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="ehl-crb-b" scenario="industry" uos_launcher="6">
<acrn-config board="ehl-crb-b" scenario="shared" uos_launcher="6">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/nuc11tnbi5/logical_partition.xml → misc/config_tools/data/generic_board/partitioned.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="nuc11tnbi5" scenario="logical_partition">
<acrn-config board="generic_board" scenario="partitioned">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/generic_board/industry.xml → misc/config_tools/data/generic_board/shared.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="generic_board" scenario="industry">
<acrn-config board="generic_board" scenario="shared">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/generic_board/logical_partition.xml → misc/config_tools/data/nuc11tnbi5/partitioned.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="generic_board" scenario="logical_partition">
<acrn-config board="nuc11tnbi5" scenario="partitioned">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/nuc11tnbi5/industry.xml → misc/config_tools/data/nuc11tnbi5/shared.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="nuc11tnbi5" scenario="industry">
<acrn-config board="nuc11tnbi5" scenario="shared">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/nuc11tnbi5/industry_launch_6uos.xml → misc/config_tools/data/nuc11tnbi5/shared_launch_6uos.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="nuc11tnbi5" scenario="industry" uos_launcher="6">
<acrn-config board="nuc11tnbi5" scenario="shared" uos_launcher="6">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/nuc7i7dnb/logical_partition.xml → misc/config_tools/data/nuc7i7dnb/partitioned.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<acrn-config board="nuc7i7dnb" scenario="logical_partition">
<acrn-config board="nuc7i7dnb" scenario="partitioned">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/nuc7i7dnb/industry.xml → misc/config_tools/data/nuc7i7dnb/shared.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<acrn-config board="nuc7i7dnb" scenario="industry">
<acrn-config board="nuc7i7dnb" scenario="shared">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/ehl-crb-b/industry_launch_1uos_hardrt.xml → misc/config_tools/data/nuc7i7dnb/shared_launch_1uos_hardrt.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="ehl-crb-b" scenario="industry" uos_launcher="1">
<acrn-config board="nuc7i7dnb" scenario="shared" uos_launcher="1">
<uos id="2">
<uos_type desc="UOS type">PREEMPT-RT LINUX</uos_type>
<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>

2
misc/config_tools/data/ehl-crb-b/industry_launch_1uos_vxworks.xml → misc/config_tools/data/nuc7i7dnb/shared_launch_1uos_vxworks.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="ehl-crb-b" scenario="industry" uos_launcher="1">
<acrn-config board="nuc7i7dnb" scenario="shared" uos_launcher="1">
<uos id="1">
<uos_type desc="UOS type">VXWORKS</uos_type>
<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>

2
misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_waag.xml → misc/config_tools/data/nuc7i7dnb/shared_launch_1uos_waag.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="nuc7i7dnb" scenario="industry" uos_launcher="1">
<acrn-config board="nuc7i7dnb" scenario="shared" uos_launcher="1">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/nuc7i7dnb/industry_launch_2uos.xml → misc/config_tools/data/nuc7i7dnb/shared_launch_2uos.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="nuc7i7dnb" scenario="industry" uos_launcher="2">
<acrn-config board="nuc7i7dnb" scenario="shared" uos_launcher="2">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/nuc7i7dnb/industry_launch_6uos.xml → misc/config_tools/data/nuc7i7dnb/shared_launch_6uos.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="nuc7i7dnb" scenario="industry" uos_launcher="6">
<acrn-config board="nuc7i7dnb" scenario="shared" uos_launcher="6">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/tgl-rvp/logical_partition.xml → misc/config_tools/data/tgl-rvp/partitioned.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<acrn-config board="tgl-rvp" scenario="logical_partition">
<acrn-config board="tgl-rvp" scenario="partitioned">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/tgl-rvp/industry.xml → misc/config_tools/data/tgl-rvp/shared.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="tgl-rvp" scenario="industry">
<acrn-config board="tgl-rvp" scenario="shared">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/tgl-rvp/industry_launch_1uos_waag.xml → misc/config_tools/data/tgl-rvp/shared_launch_1uos_waag.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="tgl-rvp" scenario="industry" uos_launcher="1">
<acrn-config board="tgl-rvp" scenario="shared" uos_launcher="1">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/ehl-crb-b/industry_launch_2uos.xml → misc/config_tools/data/tgl-rvp/shared_launch_2uos.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="ehl-crb-b" scenario="industry" uos_launcher="2">
<acrn-config board="tgl-rvp" scenario="shared" uos_launcher="2">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/tgl-rvp/industry_launch_6uos.xml → misc/config_tools/data/tgl-rvp/shared_launch_6uos.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="tgl-rvp" scenario="industry" uos_launcher="6">
<acrn-config board="tgl-rvp" scenario="shared" uos_launcher="6">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/whl-ipc-i5/logical_partition.xml → misc/config_tools/data/whl-ipc-i5/partitioned.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<acrn-config board="whl-ipc-i5" scenario="logical_partition">
<acrn-config board="whl-ipc-i5" scenario="partitioned.xml">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/whl-ipc-i5/industry.xml → misc/config_tools/data/whl-ipc-i5/shared.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<acrn-config board="whl-ipc-i5" scenario="industry">
<acrn-config board="whl-ipc-i5" scenario="shared">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_hardrt.xml → misc/config_tools/data/whl-ipc-i5/shared_launch_1uos_hardrt.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i5" scenario="industry" uos_launcher="1">
<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="1">
<uos id="2">
<uos_type desc="UOS type">PREEMPT-RT LINUX</uos_type>
<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>

2
misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_vxworks.xml → misc/config_tools/data/whl-ipc-i5/shared_launch_1uos_vxworks.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i7" scenario="industry" uos_launcher="1">
<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="1">
<uos id="1">
<uos_type desc="UOS type">VXWORKS</uos_type>
<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>

2
misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_waag.xml → misc/config_tools/data/whl-ipc-i5/shared_launch_1uos_waag.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i7" scenario="industry" uos_launcher="1">
<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="1">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/whl-ipc-i7/industry_launch_2uos.xml → misc/config_tools/data/whl-ipc-i5/shared_launch_2uos.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i7" scenario="industry" uos_launcher="2">
<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="2">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/whl-ipc-i5/industry_launch_6uos.xml → misc/config_tools/data/whl-ipc-i5/shared_launch_6uos.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i5" scenario="industry" uos_launcher="6">
<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="6">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/whl-ipc-i7/logical_partition.xml → misc/config_tools/data/whl-ipc-i7/partitioned.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<acrn-config board="whl-ipc-i7" scenario="logical_partition">
<acrn-config board="whl-ipc-i7" scenario="partitioned">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/whl-ipc-i7/industry.xml → misc/config_tools/data/whl-ipc-i7/shared.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<acrn-config board="whl-ipc-i7" scenario="industry">
<acrn-config board="whl-ipc-i7" scenario="shared">
<hv>
<DEBUG_OPTIONS>
<RELEASE>n</RELEASE>

2
misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_hardrt.xml → misc/config_tools/data/whl-ipc-i7/shared_launch_1uos_hardrt.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i7" scenario="industry" uos_launcher="1">
<acrn-config board="whl-ipc-i7" scenario="shared" uos_launcher="1">
<uos id="2">
<uos_type desc="UOS type">PREEMPT-RT LINUX</uos_type>
<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>

2
misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_vxworks.xml → misc/config_tools/data/whl-ipc-i7/shared_launch_1uos_vxworks.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i5" scenario="industry" uos_launcher="1">
<acrn-config board="whl-ipc-i7" scenario="shared" uos_launcher="1">
<uos id="1">
<uos_type desc="UOS type">VXWORKS</uos_type>
<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>

2
misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_waag.xml → misc/config_tools/data/whl-ipc-i7/shared_launch_1uos_waag.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i5" scenario="industry" uos_launcher="1">
<acrn-config board="whl-ipc-i7" scenario="shared" uos_launcher="1">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/whl-ipc-i5/industry_launch_2uos.xml → misc/config_tools/data/whl-ipc-i7/shared_launch_2uos.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i5" scenario="industry" uos_launcher="2">
<acrn-config board="whl-ipc-i7" scenario="shared" uos_launcher="2">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/whl-ipc-i7/industry_launch_6uos.xml → misc/config_tools/data/whl-ipc-i7/shared_launch_6uos.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i7" scenario="industry" uos_launcher="6">
<acrn-config board="whl-ipc-i7" scenario="shared" uos_launcher="6">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>