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

Rename the xml file and generate launch script from uos to user_vm.

Browse Source 
Tracked-On: #6744
Signed-off-by: Liu Long long.liu@linux.intel.com

Signed-off-by: Liu Long <long.liu@linux.intel.com>
This commit is contained in:
Liu Long 2021-11-03 08:46:00 +08:00 committed by wenlingz
parent 3124097a78
commit 7f846b7ecf
13 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/config_tools/data/nuc11tnbi5/hybrid_launch_2uos.xml → misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="nuc11tnbi5" scenario="hybrid" uos_launcher="2">
<acrn-config board="generic_board" scenario="hybrid" user_vm_launcher="2">
<user_vm id="1">
<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>

2
misc/config_tools/data/generic_board/shared_launch_6uos.xml → misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="generic_board" scenario="shared" uos_launcher="6">
<acrn-config board="generic_board" scenario="shared" user_vm_launcher="6">
<user_vm id="1">
<user_vm_type desc="UOS type">WINDOWS</user_vm_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>

2
misc/config_tools/data/generic_board/hybrid_launch_2uos.xml → misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="generic_board" scenario="hybrid" uos_launcher="2">
<acrn-config board="nuc11tnbi5" scenario="hybrid" user_vm_launcher="2">
<user_vm id="1">
<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>

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

@ -1,4 +1,4 @@
<acrn-config board="nuc11tnbi5" scenario="shared" uos_launcher="6">
<acrn-config board="nuc11tnbi5" scenario="shared" user_vm_launcher="6">
<user_vm id="1">
<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>

2
misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1uos_waag.xml → misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i5" scenario="hybrid_rt" uos_launcher="1">
<acrn-config board="whl-ipc-i5" scenario="hybrid_rt" user_vm_launcher="1">
<user_vm id="1">
<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>

2
misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_laag.xml → misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i5" scenario="sdc" uos_launcher="1">
<acrn-config board="whl-ipc-i5" scenario="sdc" user_vm_launcher="1">
<user_vm id="1">
<user_vm_type desc="User VM type">YOCTO</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>

2
misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_zephyr.xml → misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_zephyr.xml
View File

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i5" scenario="sdc" uos_launcher="1">
<acrn-config board="whl-ipc-i5" scenario="sdc" user_vm_launcher="1">
<user_vm id="1">
<user_vm_type desc="User VM type">ZEPHYR</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>

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

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="1">
<acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="1">
<user_vm id="2">
<user_vm_type desc="User VM type">PREEMPT-RT LINUX</user_vm_type>
<rtos_type desc="User VM Realtime capability">Hard RT</rtos_type>

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

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="1">
<acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="1">
<user_vm id="1">
<user_vm_type desc="User VM type">VXWORKS</user_vm_type>
<rtos_type desc="User VM Realtime capability">Hard RT</rtos_type>

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

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="1">
<acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="1">
<user_vm id="1">
<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>

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

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="2">
<acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="2">
<user_vm id="1">
<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>

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

@ -1,4 +1,4 @@
<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="6">
<acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="6">
<user_vm id="1">
<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>

6
misc/config_tools/launch_config/launch_cfg_gen.py
View File

@ -32,7 +32,7 @@ def get_launch_item_values(board_info, scenario_info=None):
# pre passthrough device for ui
launch_item_values["user_vm,passthrough_devices,usb_xdci"] = pthru.avl["usb_xdci"]
launch_item_values["uos,passthrough_devices,gpu"] = pthru.avl["gpu"]
launch_item_values["user_vm,passthrough_devices,gpu"] = pthru.avl["gpu"]
launch_item_values["user_vm,passthrough_devices,ipu"] = pthru.avl["ipu"]
launch_item_values["user_vm,passthrough_devices,ipu_i2c"] = pthru.avl["ipu_i2c"]
launch_item_values["user_vm,passthrough_devices,cse"] = pthru.avl["cse"]
@ -225,7 +225,7 @@ def main(args):
# generate launch script
if vm_th:
script_name = "launch_uos_id{}.sh".format(vm_th)
script_name = "launch_user_vm_id{}.sh".format(vm_th)
launch_script_file = os.path.join(output, script_name)
with open(launch_script_file, mode = 'w', newline=None, encoding='utf-8') as config:
err_dic = generate_script_file(names, pt_sel, virt_io.dev, dm.args, sriov.dev, vm_th, config)
@ -233,7 +233,7 @@ def main(args):
return err_dic
else:
for post_vm_i in post_num_list:
script_name = "launch_uos_id{}.sh".format(post_vm_i)
script_name = "launch_user_vm_id{}.sh".format(post_vm_i)
launch_script_file = os.path.join(output, script_name)
with open(launch_script_file, mode = 'w', newline='\n', encoding='utf-8') as config:
err_dic = generate_script_file(names, pt_sel, virt_io.dev, dm.args, sriov.dev, post_vm_i, config)