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

acrn-config: move cpu affinity macro to misc_cfg_h.py

Browse Source 
so that vm_configurations.h/vm_configurations.c are consistent for different boards

Tracked-On: #5229
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
This commit is contained in:
dongshen 2020-09-07 14:56:31 -07:00 committed by wenlingz
parent 0ad3dd4654
commit ba0e466618
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
misc/acrn-config/board_config/misc_cfg_h.py
View File

@ -149,6 +149,29 @@ def clos_per_vm_gen(config):
print("#define VM{0}_VCPU_CLOS\t\t\t{1}".format(i, clos_config['clos_map']), file=config) print("#define VM{0}_VCPU_CLOS\t\t\t{1}".format(i, clos_config['clos_map']), file=config)
def cpu_affinity_output(cpu_bits, i, config):
if "SOS_VM" == common.VM_TYPES[i]:
print("", file=config)
print("#define SOS_VM_CONFIG_CPU_AFFINITY {0}".format(
cpu_bits['cpu_map']), file=config)
else:
print("#define VM{0}_CONFIG_CPU_AFFINITY {1}".format(
i, cpu_bits['cpu_map']), file=config)
def cpu_affinity_per_vm_gen(config):
cpus_per_vm = common.get_leaf_tag_map(
common.SCENARIO_INFO_FILE, "cpu_affinity", "pcpu_id")
for vm_i,_ in common.VM_TYPES.items():
cpu_bits = scenario_cfg_lib.cpus_assignment(cpus_per_vm, vm_i)
cpu_affinity_output(cpu_bits, vm_i, config)
print("", file=config)
def generate_file(config): def generate_file(config):
""" """
Start to generate board.c Start to generate board.c
@ -251,6 +274,8 @@ def generate_file(config):
sos_bootarg_diff(sos_cmdlines, config) sos_bootarg_diff(sos_cmdlines, config)
print("", file=config) print("", file=config)
cpu_affinity_per_vm_gen(config)
common_clos_max = board_cfg_lib.get_common_clos_max() common_clos_max = board_cfg_lib.get_common_clos_max()
max_mba_clos_entries = common_clos_max max_mba_clos_entries = common_clos_max
max_cache_clos_entries = common_clos_max max_cache_clos_entries = common_clos_max

25
misc/acrn-config/scenario_config/vm_configurations_h.py
View File

@ -23,24 +23,6 @@ def gen_common_header(config):
print("{0}".format(VM_HEADER_DEFINE), file=config) print("{0}".format(VM_HEADER_DEFINE), file=config)
def cpu_affinity_output(vm_info, i, config):
"""
Output the macro pcpu affinity bitmap
:param vm_info: the data structure have all the xml items values
:param i: the index of vm id
:param config: file pointor to store the information
"""
cpu_bits = vm_info.get_cpu_bitmap(i)
if "SOS_VM" == common.VM_TYPES[i]:
print("", file=config)
print("#define SOS_VM_CONFIG_CPU_AFFINITY {0}".format(
cpu_bits['cpu_map']), file=config)
else:
print("#define VM{0}_CONFIG_CPU_AFFINITY {1}".format(
i, cpu_bits['cpu_map']), file=config)
def scenario_vm_num(scenario_items, config): def scenario_vm_num(scenario_items, config):
print("", file=config) print("", file=config)
@ -65,8 +47,6 @@ def gen_pre_launch_vm(scenario_items, config):
vm_i += 1 vm_i += 1
continue continue
cpu_bits = vm_info.get_cpu_bitmap(vm_i)
cpu_affinity_output(vm_info, vm_i, config)
print("#define VM{0}_CONFIG_MEM_START_HPA {1}UL".format( print("#define VM{0}_CONFIG_MEM_START_HPA {1}UL".format(
vm_i, vm_info.mem_info.mem_start_hpa[vm_i]), file=config) vm_i, vm_info.mem_info.mem_start_hpa[vm_i]), file=config)
print("#define VM{0}_CONFIG_MEM_SIZE {1}UL".format( print("#define VM{0}_CONFIG_MEM_SIZE {1}UL".format(
@ -97,7 +77,6 @@ def gen_post_launch_header(scenario_items, config):
continue continue
is_post_vm_available = True is_post_vm_available = True
cpu_affinity_output(vm_info, vm_i, config)
if vm_info.shmem.shmem_enabled == 'y' and vm_i in vm_info.shmem.shmem_num.keys(): if vm_info.shmem.shmem_enabled == 'y' and vm_i in vm_info.shmem.shmem_num.keys():
print("#define VM{}_CONFIG_PCI_DEV_NUM {}U".format(vm_i, print("#define VM{}_CONFIG_PCI_DEV_NUM {}U".format(vm_i,
@ -122,10 +101,6 @@ def gen_sos_header(scenario_items, config):
print("\t\t\t\t\tSOS_IDLE\t\\", file=config) print("\t\t\t\t\tSOS_IDLE\t\\", file=config)
print("\t\t\t\t\tSOS_BOOTARGS_DIFF", file=config) print("\t\t\t\t\tSOS_BOOTARGS_DIFF", file=config)
vm_info = scenario_items['vm']
for vm_i,vm_type in common.VM_TYPES.items():
if vm_type == 'SOS_VM':
cpu_affinity_output(vm_info, vm_i, config)
print("", file=config) print("", file=config)