github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-12-10 06:32:35 +00:00
Code Issues Projects Releases Wiki Activity

ACRN:MISC: Terminology for UOS/SOS in misc

Browse Source 
Rename get_sos_wakeup_reason to get_service_vm_wakeup_reason in acrn manager.
rename set_sos_timer to set_service_vm_timer.
rename sos_pci_devs to service_vm_pci_devs.
rename gen_sos_vm to gen_service_vm.
rename sos_used_bdf to service_vm_used_bdf.
rename is-sos-vm to is-service-vm.
rename sos_mmio_range to service_vm_mmio_range.
rename sos_guest_flags to service_vm_guest_flags.
rename get_sos_vmid to get_service_vmid.
rename sos_cpu_affinity to service_vm_cpu_affinity.
rename allocation_sos_vm_node to allocation_service_vm_node.
rename cpus_for_sos to cpus_for_service_vm.
rename sos_vm_cpus to service_vm_cpus.
rename get_sos_vuart_settings to get_service_vm_vuart_settings.
rename sos_extend_all_cpus to service_vm_extend_all_cpus.
rename sos_vm_id to servier_vm_id.
rename sos_vm_index to service_vm_index.
rename sos_vm_num to service_vm_num.
re-generate the board and scenario code by the new python and xml.
delete tdf8532 kernel module in python and shell script.

Tracked-On: #6744
Signed-off-by: Liu Long <long.liu@linux.intel.com>
This commit is contained in:
Liu Long
2021-11-29 13:57:19 +08:00
committed by wenlingz
parent 7a0c7dcadf
commit 5c3a080c03
78 changed files with 914 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
misc/config_tools/library/launch_cfg_lib.py
View File

@@ -208,15 +208,15 @@ def is_config_file_match():
return (err_dic, match)
def get_sos_vmid():
def get_service_vmid():
sos_id = ''
service_vmid = ''
for vm_i,vm_type in common.VM_TYPES.items():
if vm_type == "SERVICE_VM":
sos_id = vm_i
service_vmid = vm_i
break
return sos_id
return service_vmid
def get_bdf_from_tag(config_file, branch_tag, tag_str):
@@ -550,9 +550,9 @@ def get_gpu_vpid():
def user_vm_cpu_affinity(user_vmid_cpu_affinity):
cpu_affinity = {}
sos_vm_id = get_sos_vmid()
service_vm_id = get_service_vmid()
for user_vmid,cpu_affinity_list in user_vmid_cpu_affinity.items():
cpu_affinity[int(user_vmid) + int(sos_vm_id)] = cpu_affinity_list
cpu_affinity[int(user_vmid) + int(service_vm_id)] = cpu_affinity_list
return cpu_affinity
@@ -606,12 +606,12 @@ def set_shm_regions(launch_item_values, scenario_info):
except:
return
sos_vm_id = 0
service_vm_id = 0
for vm_id, vm_type in vm_types.items():
if vm_type in ['SERVICE_VM']:
sos_vm_id = vm_id
service_vm_id = vm_id
elif vm_type in ['POST_STD_VM', 'POST_RT_VM']:
user_vmid = vm_id - sos_vm_id
user_vmid = vm_id - service_vm_id
shm_region_key = 'user_vm:id={},shm_regions,shm_region'.format(user_vmid)
launch_item_values[shm_region_key] = ['']
if shm_enabled == 'y':
@@ -633,13 +633,13 @@ def set_pci_vuarts(launch_item_values, scenario_info):
try:
launch_item_values['user_vm,console_vuart'] = DM_VUART0
vm_types = common.get_leaf_tag_map(scenario_info, 'vm_type')
sos_vm_id = 0
service_vm_id = 0
for vm_id, vm_type in vm_types.items():
if vm_type in ['SERVICE_VM']:
sos_vm_id = vm_id
service_vm_id = vm_id
for vm in list(common.get_config_root(scenario_info)):
if vm.tag == 'vm' and scenario_cfg_lib.VM_DB[vm_types[int(vm.attrib['id'])]]['load_type'] == 'POST_LAUNCHED_VM':
user_vmid = int(vm.attrib['id']) - sos_vm_id
user_vmid = int(vm.attrib['id']) - service_vm_id
pci_vuart_key = 'user_vm:id={},communication_vuarts,communication_vuart'.format(user_vmid)
for elem in list(vm):
if elem.tag == 'communication_vuart':