diff --git a/misc/config_tools/config_app/static/main.js b/misc/config_tools/config_app/static/main.js index 667931c24..9ad04ab43 100644 --- a/misc/config_tools/config_app/static/main.js +++ b/misc/config_tools/config_app/static/main.js @@ -597,18 +597,6 @@ $().ready(function(){ } config_item.remove(); }); - - $('#remove_vm_kata').on('click', function() { - if(confirm("Do you want to remove the VM?")) { - save_scenario("remove_vm_kata"); - } - }); - - $('#add_vm_kata').on('click', function() { - if(confirm("Do you want to add the Kata VM based on generic config?")) { - save_scenario("add_vm_kata"); - } - }); }) diff --git a/misc/config_tools/config_app/templates/scenario.html b/misc/config_tools/config_app/templates/scenario.html index 2e708b8b4..c0e3597a3 100644 --- a/misc/config_tools/config_app/templates/scenario.html +++ b/misc/config_tools/config_app/templates/scenario.html @@ -56,7 +56,6 @@ the source files will be generated into default path and overwirte the previous - @@ -115,11 +114,7 @@ the source files will be generated into default path and overwirte the previous {% if board_info != None and root != None and scenario_item_values %} - {% set vm_kata = [] %} {% for vm in root|list %} - {% if 'desc' in vm.attrib and vm.attrib['desc'] == 'specific for Kata' %} - {% do vm_kata.append(1) %} - {% endif %} {% set first_multi_child = {'IVSHMEM_REGION': 0, 'communication_vuart': 1} %} {% if xpath_dict['/'.join(['/acrn-config', vm.tag])]['configurable'] == 'y' or vm.xpath(xpath_dict['/'.join(['/acrn-config', vm.tag])]['configurable'])%} @@ -149,11 +144,6 @@ the source files will be generated into default path and overwirte the previous Remove this VM {% endif %} - {% if 'desc' in vm.attrib or vm.attrib['desc'] == 'specific for Kata' %} -
- -
- {% endif %} {% endif %} {% endfor %} - {% if not vm_kata and ('scenario' in root.attrib and root.attrib['scenario'] == 'sdc') %} - - {% endif %}
{% for elem in vm|list %} @@ -481,11 +471,6 @@ the source files will be generated into default path and overwirte the previous
- -
{% else %} No setting available. Select one board info and make sure the scenario xml diff --git a/misc/config_tools/config_app/views.py b/misc/config_tools/config_app/views.py index 81a46335c..ac7802dc5 100644 --- a/misc/config_tools/config_app/views.py +++ b/misc/config_tools/config_app/views.py @@ -299,30 +299,7 @@ def save_scenario(): generator = scenario_config_data['generator'] if generator is not None: - if generator == 'remove_vm_kata': - scenario_config.delete_curr_key('vm:desc=specific for Kata') - assign_vm_id(scenario_config) - elif generator == 'add_vm_kata': - vm_list = [] - for vm in list(scenario_config.get_curr_root()): - if vm.tag == 'vm': - vm_list.append(vm.attrib['id']) - if len(vm_list) >= MAX_VM_NUM: - return {'status': 'fail', - 'error_list': {'error': 'Can not add a new VM. Max VM number is {}.'.format(MAX_VM_NUM)}} - - # clone vm kata from generic config - generic_scenario_config = get_generic_scenario_config(scenario_config) - generic_scenario_config_root = generic_scenario_config.get_curr_root() - elem_kata = None - for vm in list(generic_scenario_config_root): - if 'desc' in vm.attrib and vm.attrib['desc'] == 'specific for Kata': - elem_kata = vm - break - if elem_kata is not None: - scenario_config.clone_curr_elem(elem_kata) - assign_vm_id(scenario_config) - elif generator.startswith('add_vm:'): + if generator.startswith('add_vm:'): vm_list = [] for vm in list(scenario_config.get_curr_root()): if vm.tag == 'vm': @@ -445,8 +422,6 @@ def save_launch(): 'Please select a scenario with available post launched VMs.'}} add_vm_id = add_launch_type.split('ID :')[1].replace(')', '').strip() add_launch_type = 'LAUNCH_' + add_launch_type.split()[0] - if add_launch_type == 'LAUNCH_KATA_VM': - add_launch_type = 'LAUNCH_POST_STD_VM' add_launch_id = 1 post_vm_list = get_post_launch_vm_list(scenario_name) for i in range(len(post_vm_list)): @@ -647,7 +622,7 @@ def create_setting(): scenario_config.clone_curr_elem(elem_clos_max, 'hv', 'FEATURES', 'RDT') # for i in range(num_mba_delay): # scenario_config.clone_curr_elem(elem_mba_delay, 'hv', 'FEATURES', 'RDT') - for i in range(8): + for i in range(7): scenario_config.delete_curr_key('vm:id={}'.format(i)) scenario_config = set_default_config(scenario_config) scenario_config.save(create_name) @@ -1084,7 +1059,6 @@ def get_generic_scenario_config(scenario_config, add_vm_type=None): 'SERVICE_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_2user_vm', 'user_vm:id=1'), 'LAUNCH_POST_RT_VM': ('shared_launch_6user_vm', 'user_vm:id=2') } @@ -1278,7 +1252,7 @@ def assign_vm_id(scenario_config): pre_launched_vm_num += 1 elif item.text in ['SERVICE_VM']: sos_vm_num += 1 - elif item.text in ['POST_STD_VM', 'POST_RT_VM', 'KATA_VM']: + elif item.text in ['POST_STD_VM', 'POST_RT_VM']: post_launched_vm_num += 1 pre_launched_vm_index = 0 @@ -1294,7 +1268,7 @@ def assign_vm_id(scenario_config): elif item.text in ['SERVICE_VM']: vm.attrib['id'] = str(sos_vm_index) sos_vm_index += 1 - elif item.text in ['POST_STD_VM', 'POST_RT_VM', 'KATA_VM']: + elif item.text in ['POST_STD_VM', 'POST_RT_VM']: vm.attrib['id'] = str(post_launched_vm_index) post_launched_vm_index += 1 diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml index 2fe98a562..a746f197f 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -60,7 +60,7 @@ PRE_RT_VM - ACRN PRE-LAUNCHED VM0 + PRE_RT_VM0 GUEST_FLAG_LAPIC_PASSTHROUGH GUEST_FLAG_RT @@ -123,7 +123,7 @@ SERVICE_VM - ACRN Service VM + ACRN_Service_VM 0 @@ -185,6 +185,7 @@ POST_STD_VM + POST_STD_VM1 0 @@ -226,6 +227,7 @@ POST_STD_VM + POST_STD_VM2 0 diff --git a/misc/config_tools/data/cfl-k700-i7/shared.xml b/misc/config_tools/data/cfl-k700-i7/shared.xml index b2a6c4d0c..3f5adfbe0 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared.xml @@ -60,7 +60,7 @@ SERVICE_VM - ACRN Service VM + ACRN_Service_VM 0 @@ -111,6 +111,7 @@ POST_STD_VM + POST_STD_VM1 0 @@ -149,6 +150,7 @@ POST_RT_VM + POST_RT_VM1 0 @@ -188,6 +190,7 @@ POST_STD_VM + POST_STD_VM2 0 @@ -227,6 +230,7 @@ POST_STD_VM + POST_STD_VM3 0 @@ -266,6 +270,7 @@ POST_STD_VM + POST_STD_VM4 0 @@ -305,6 +310,7 @@ POST_STD_VM + POST_STD_VM5 0 @@ -342,40 +348,4 @@ n - - KATA_VM - - 0 - 1 - - - 0 - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - n - diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml index 429d68559..1e2b32f79 100644 --- a/misc/config_tools/data/generic_board/hybrid.xml +++ b/misc/config_tools/data/generic_board/hybrid.xml @@ -61,7 +61,7 @@ SAFETY_VM - ACRN PRE-LAUNCHED VM0 + SAFETY_VM0 0 @@ -119,7 +119,7 @@ SERVICE_VM - ACRN Service VM + ACRN_Service_VM 0 @@ -175,6 +175,7 @@ POST_STD_VM + POST_STD_VM1 0 @@ -212,6 +213,7 @@ POST_STD_VM + POST_STD_VM2 0 diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml index 0e85012f1..a0f76db6a 100644 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ b/misc/config_tools/data/generic_board/hybrid_rt.xml @@ -127,7 +127,7 @@ SERVICE_VM - ACRN Service VM + ACRN_Service_VM 0 diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml index ed1c5dde2..2d6bdc8f8 100644 --- a/misc/config_tools/data/generic_board/partitioned.xml +++ b/misc/config_tools/data/generic_board/partitioned.xml @@ -61,7 +61,7 @@ PRE_STD_VM - ACRN PRE-LAUNCHED VM0 + PRE_STD_VM0 0 @@ -122,7 +122,7 @@ PRE_STD_VM - ACRN PRE-LAUNCHED VM1 + PRE_STD_VM1 0 diff --git a/misc/config_tools/data/generic_board/shared.xml b/misc/config_tools/data/generic_board/shared.xml index 01eb551d6..7be305d77 100644 --- a/misc/config_tools/data/generic_board/shared.xml +++ b/misc/config_tools/data/generic_board/shared.xml @@ -61,7 +61,7 @@ SERVICE_VM - ACRN Service VM + ACRN_Service_VM 0 @@ -111,6 +111,7 @@ POST_STD_VM + POST_STD_VM1 0 @@ -150,6 +151,7 @@ POST_RT_VM + POST_RT_VM1 GUEST_FLAG_LAPIC_PASSTHROUGH GUEST_FLAG_RT @@ -190,6 +192,7 @@ POST_STD_VM + POST_STD_VM2 0 @@ -229,6 +232,7 @@ POST_STD_VM + POST_STD_VM3 0 @@ -268,6 +272,7 @@ POST_STD_VM + POST_STD_VM4 0 @@ -307,6 +312,7 @@ POST_STD_VM + POST_STD_VM5 0 @@ -344,40 +350,4 @@ n - - KATA_VM - - 0 - 1 - - - 0 - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - n - diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml index c9b638ed1..076eb39d1 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml @@ -61,7 +61,7 @@ SAFETY_VM - ACRN PRE-LAUNCHED VM0 + SAFETY_VM0 0 @@ -119,7 +119,7 @@ SERVICE_VM - ACRN Service VM + ACRN_Service_VM 0 @@ -175,6 +175,7 @@ POST_STD_VM + POST_STD_VM1 0 @@ -212,6 +213,7 @@ POST_STD_VM + POST_STD_VM2 0 diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml index 1c8cee4d0..186438409 100644 --- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml +++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml @@ -61,7 +61,7 @@ PRE_STD_VM - ACRN PRE-LAUNCHED VM0 + PRE_STD_VM0 0 @@ -122,7 +122,7 @@ PRE_STD_VM - ACRN PRE-LAUNCHED VM1 + PRE_STD_VM1 0 diff --git a/misc/config_tools/data/nuc11tnbi5/shared.xml b/misc/config_tools/data/nuc11tnbi5/shared.xml index 187a7a28e..2417a5225 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared.xml @@ -61,7 +61,7 @@ SERVICE_VM - ACRN Service VM + ACRN_Service_VM 0 @@ -111,6 +111,7 @@ POST_STD_VM + POST_STD_VM1 0 @@ -150,6 +151,7 @@ POST_RT_VM + POST_RT_VM1 GUEST_FLAG_LAPIC_PASSTHROUGH GUEST_FLAG_RT @@ -190,6 +192,7 @@ POST_STD_VM + POST_STD_VM2 0 @@ -229,6 +232,7 @@ POST_STD_VM + POST_STD_VM3 0 @@ -268,6 +272,7 @@ POST_STD_VM + POST_STD_VM4 0 @@ -307,6 +312,7 @@ POST_STD_VM + POST_STD_VM5 0 @@ -344,40 +350,4 @@ n - - KATA_VM - - 0 - 1 - - - 0 - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - n - diff --git a/misc/config_tools/data/qemu/sdc.xml b/misc/config_tools/data/qemu/sdc.xml index 49aee1bf4..4487a88cd 100644 --- a/misc/config_tools/data/qemu/sdc.xml +++ b/misc/config_tools/data/qemu/sdc.xml @@ -60,7 +60,7 @@ SERVICE_VM - ACRN Service VM + ACRN_Service_VM 0 @@ -110,6 +110,7 @@ POST_STD_VM + POST_STD_VM1 0 diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml index 10a28b5d4..efbd67571 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -59,7 +59,7 @@ SAFETY_VM - ACRN PRE-LAUNCHED VM0 + SAFETY_VM0 0 @@ -115,7 +115,7 @@ SERVICE_VM - ACRN Service VM + ACRN_Service_VM 0 @@ -172,6 +172,7 @@ POST_STD_VM + POST_STD_VM1 0 diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml index 0659f2bb6..2a4ec6654 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml @@ -59,7 +59,7 @@ PRE_RT_VM - ACRN PRE-LAUNCHED VM0 + PRE_RT_VM0 GUEST_FLAG_LAPIC_PASSTHROUGH GUEST_FLAG_RT @@ -122,7 +122,7 @@ SERVICE_VM - ACRN Service VM + ACRN_Service_VM 0 @@ -177,6 +177,7 @@ POST_STD_VM + POST_STD_VM1 0 @@ -216,6 +217,7 @@ POST_STD_VM + POST_STD_VM2 0 diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml index d0a496e53..837aa4182 100644 --- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml +++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml @@ -59,7 +59,7 @@ PRE_STD_VM - ACRN PRE-LAUNCHED VM0 + PRE_STD_VM0 0 @@ -121,7 +121,7 @@ PRE_STD_VM - ACRN PRE-LAUNCHED VM1 + PRE_STD_VM1 0 diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml index ea99362c7..ef4aa32b8 100644 --- a/misc/config_tools/data/whl-ipc-i5/sdc.xml +++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml @@ -59,7 +59,7 @@ SERVICE_VM - ACRN Service VM + ACRN_Service_VM 0 @@ -109,6 +109,7 @@ POST_STD_VM + POST_STD_VM1 0 @@ -146,38 +147,4 @@ n - - KATA_VM - - 3 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - n - diff --git a/misc/config_tools/data/whl-ipc-i5/shared.xml b/misc/config_tools/data/whl-ipc-i5/shared.xml index 03f6f827a..33f439669 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared.xml @@ -59,7 +59,7 @@ SERVICE_VM - ACRN Service VM + ACRN_Service_VM 0 @@ -110,6 +110,7 @@ POST_STD_VM + POST_STD_VM1 0 @@ -148,6 +149,7 @@ POST_RT_VM + POST_RT_VM1 0 @@ -187,6 +189,7 @@ POST_STD_VM + POST_STD_VM2 0 @@ -226,6 +229,7 @@ POST_STD_VM + POST_STD_VM3 0 @@ -265,6 +269,7 @@ POST_STD_VM + POST_STD_VM4 0 @@ -304,6 +309,7 @@ POST_STD_VM + POST_STD_VM5 0 @@ -341,40 +347,4 @@ n - - KATA_VM - - 0 - 1 - - - 0 - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - - - INVALID_PCI_BASE - - - INVALID_PCI_BASE - 1 - 1 - - n - diff --git a/misc/config_tools/launch_config/com.py b/misc/config_tools/launch_config/com.py index c04667f7e..a678da07b 100644 --- a/misc/config_tools/launch_config/com.py +++ b/misc/config_tools/launch_config/com.py @@ -558,12 +558,10 @@ def dm_arg_set(names, sel, virt_io, dm, sriov, vmid, config): boot_image_type(dm, vmid, config) - # uuid get sos_vmid = launch_cfg_lib.get_sos_vmid() - scenario_uuid = launch_cfg_lib.get_scenario_uuid(vmid, sos_vmid) # clearlinux/android/alios - print('acrn-dm -A -m $mem_size -s 0:0,hostbridge -U {} \\'.format(scenario_uuid), file=config) + print('acrn-dm -A -m $mem_size -s 0:0,hostbridge \\', file=config) if launch_cfg_lib.is_linux_like(user_vm_type) or user_vm_type in ("ANDROID", "ALIOS"): if user_vm_type in ("ANDROID", "ALIOS"): print(' $npk_virt \\', file=config) diff --git a/misc/config_tools/library/common.py b/misc/config_tools/library/common.py index 4a9241e1d..091970d50 100644 --- a/misc/config_tools/library/common.py +++ b/misc/config_tools/library/common.py @@ -38,7 +38,7 @@ BOARD_INFO_FILE = "" SCENARIO_INFO_FILE = "" LAUNCH_INFO_FILE = "" VM_TYPES = {} -MAX_VM_NUM = 8 +MAX_VM_NUM = 32 MAX_VUART_NUM = 8 diff --git a/misc/config_tools/library/launch_cfg_lib.py b/misc/config_tools/library/launch_cfg_lib.py index 871666e7c..dda2f1cdf 100644 --- a/misc/config_tools/library/launch_cfg_lib.py +++ b/misc/config_tools/library/launch_cfg_lib.py @@ -208,28 +208,6 @@ def is_config_file_match(): return (err_dic, match) -def get_vm_uuid_idx(vm_type, user_vmid): - - i_cnt = 0 - for vm_i,vm_t in common.VM_TYPES.items(): - if vm_t == vm_type and vm_i <= user_vmid: - i_cnt += 1 - if i_cnt > 0: - i_cnt -= 1 - - return i_cnt - - -def get_scenario_uuid(user_vmid, sos_vmid): - # {id_num:uuid} (id_num:0~max) - scenario_uuid = '' - vm_id = user_vmid + sos_vmid - i_cnt = get_vm_uuid_idx(common.VM_TYPES[vm_id], vm_id) - scenario_uuid = scenario_cfg_lib.VM_DB[common.VM_TYPES[vm_id]]['uuid'][i_cnt] - return scenario_uuid - - - def get_sos_vmid(): sos_id = '' @@ -627,7 +605,7 @@ def set_shm_regions(launch_item_values, scenario_info): for vm_id, vm_type in vm_types.items(): if vm_type in ['SERVICE_VM']: sos_vm_id = vm_id - elif vm_type in ['POST_STD_VM', 'POST_RT_VM', 'KATA_VM']: + elif vm_type in ['POST_STD_VM', 'POST_RT_VM']: user_vmid = vm_id - sos_vm_id shm_region_key = 'user_vm:id={},shm_regions,shm_region'.format(user_vmid) launch_item_values[shm_region_key] = [''] diff --git a/misc/config_tools/library/scenario_cfg_lib.py b/misc/config_tools/library/scenario_cfg_lib.py index f1c950bb6..d955929f3 100644 --- a/misc/config_tools/library/scenario_cfg_lib.py +++ b/misc/config_tools/library/scenario_cfg_lib.py @@ -38,33 +38,20 @@ COMMUNICATE_VM_ID = [] ERR_LIST = {} -KATA_VM_COUNT = 0 PT_SUB_PCI = {} PT_SUB_PCI['ethernet'] = ['Ethernet controller', 'Network controller', '802.1a controller', '802.1b controller', 'Wireless controller'] PT_SUB_PCI['sata'] = ['SATA controller'] PT_SUB_PCI['nvme'] = ['Non-Volatile memory controller'] PT_SUB_PCI['usb'] = ['USB controller'] -UUID_DB = { - 'SERVICE_VM':['dbbbd434-7a57-4216-a12c-2201f1ab0240'], - 'SAFETY_VM':['fc836901-8685-4bc0-8b71-6e31dc36fa47'], - 'PRE_STD_VM':['26c5e0d8-8f8a-47d8-8109-f201ebd61a5e', 'dd87ce08-66f9-473d-bc58-7605837f935e'], - 'POST_STD_VM':['d2795438-25d6-11e8-864e-cb7a18b34643', '615db82a-e189-4b4f-8dbb-d321343e4ab3', - '38158821-5208-4005-b72a-8a609e4190d0', 'a6750180-f87a-48d2-91d9-4e7f62b6519e', 'd1816e4a-a9bb-4cb4-a066-3f1a8a5ce73f'], - 'POST_RT_VM':['495ae2e5-2603-4d64-af76-d4bc5a8ec0e5'], - 'KATA_VM':['a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f'], - 'PRE_RT_VM':['b2a92bec-ca6b-11ea-b106-3716a8ba0bb9'], -} - VM_DB = { - 'SERVICE_VM':{'load_type':'SERVICE_VM', 'severity':'SEVERITY_SERVICE_VM', 'uuid':UUID_DB['SERVICE_VM']}, - 'SAFETY_VM':{'load_type':'PRE_LAUNCHED_VM', 'severity':'SEVERITY_SAFETY_VM', 'uuid':UUID_DB['SAFETY_VM']}, - 'PRE_RT_VM':{'load_type':'PRE_LAUNCHED_VM', 'severity':'SEVERITY_RTVM', 'uuid':UUID_DB['PRE_RT_VM']}, - 'PRE_STD_VM':{'load_type':'PRE_LAUNCHED_VM', 'severity':'SEVERITY_STANDARD_VM', 'uuid':UUID_DB['PRE_STD_VM']}, - 'POST_STD_VM':{'load_type':'POST_LAUNCHED_VM', 'severity':'SEVERITY_STANDARD_VM', 'uuid':UUID_DB['POST_STD_VM']}, - 'POST_RT_VM':{'load_type':'POST_LAUNCHED_VM', 'severity':'SEVERITY_RTVM', 'uuid':UUID_DB['POST_RT_VM']}, - 'KATA_VM':{'load_type':'POST_LAUNCHED_VM', 'severity':'SEVERITY_STANDARD_VM', 'uuid':UUID_DB['KATA_VM']}, - 'PRE_RT_VM':{'load_type':'PRE_LAUNCHED_VM', 'severity':'SEVERITY_RTVM', 'uuid':UUID_DB['PRE_RT_VM']}, + 'SERVICE_VM':{'load_type':'SERVICE_VM', 'severity':'SEVERITY_SERVICE_VM'}, + 'SAFETY_VM':{'load_type':'PRE_LAUNCHED_VM', 'severity':'SEVERITY_SAFETY_VM'}, + 'PRE_RT_VM':{'load_type':'PRE_LAUNCHED_VM', 'severity':'SEVERITY_RTVM'}, + 'PRE_STD_VM':{'load_type':'PRE_LAUNCHED_VM', 'severity':'SEVERITY_STANDARD_VM'}, + 'POST_STD_VM':{'load_type':'POST_LAUNCHED_VM', 'severity':'SEVERITY_STANDARD_VM'}, + 'POST_RT_VM':{'load_type':'POST_LAUNCHED_VM', 'severity':'SEVERITY_RTVM'}, + 'PRE_RT_VM':{'load_type':'PRE_LAUNCHED_VM', 'severity':'SEVERITY_RTVM'}, } LOAD_VM_TYPE = list(VM_DB.keys()) @@ -246,11 +233,9 @@ def load_vm_check(load_vms, item): :param item: vm name item in xml :return: None """ - global KATA_VM_COUNT sos_vm_ids = [] pre_vm_ids = [] post_vm_ids = [] - kata_vm_ids = [] rt_vm_ids = [] for order_i, load_str in load_vms.items(): if not load_str: @@ -271,39 +256,14 @@ def load_vm_check(load_vms, item): if "POST_STD_VM" == load_str: post_vm_ids.append(order_i) - if "KATA_VM" == load_str: - kata_vm_ids.append(order_i) - if "POST_RT_VM" == load_str: rt_vm_ids.append(order_i) - KATA_VM_COUNT = len(kata_vm_ids) - if len(kata_vm_ids) > len(UUID_DB["KATA_VM"]): - key = "vm:id={},{}".format(kata_vm_ids[0], item) - ERR_LIST[key] = "KATA VM number should not be greater than {}".format(len(UUID_DB["KATA_VM"])) - return - - if len(rt_vm_ids) > len(UUID_DB["POST_RT_VM"]): - key = "vm:id={},{}".format(rt_vm_ids[0], item) - ERR_LIST[key] = "POST RT VM number should not be greater than {}".format(len(UUID_DB["POST_RT_VM"])) - return - if len(sos_vm_ids) > 1: key = "vm:id={},{}".format(sos_vm_ids[0], item) ERR_LIST[key] = "Service VM number should not be greater than 1" return - if len(post_vm_ids) > len(UUID_DB["POST_STD_VM"]): - key = "vm:id={},{}".format(post_vm_ids[0], item) - ERR_LIST[key] = "POST Standard vm number should not be greater than {}".format(len(UUID_DB["POST_STD_VM"])) - return - - max_pre_launch_vms = len(UUID_DB["PRE_STD_VM"]) + len(UUID_DB["SAFETY_VM"]) + len(UUID_DB["PRE_RT_VM"]) - if len(pre_vm_ids) > max_pre_launch_vms: - key = "vm:id={},{}".format(pre_vm_ids[0], item) - ERR_LIST[key] = "PRE Launched VM number should not be greater than {}".format(max_pre_launch_vms) - return - if post_vm_ids and sos_vm_ids: if post_vm_ids[0] < sos_vm_ids[-1]: key = "vm:id={},{}".format(post_vm_ids[0], item) diff --git a/misc/config_tools/scenario_config/vm_configurations_c.py b/misc/config_tools/scenario_config/vm_configurations_c.py index 532f89b66..499e06d76 100644 --- a/misc/config_tools/scenario_config/vm_configurations_c.py +++ b/misc/config_tools/scenario_config/vm_configurations_c.py @@ -31,9 +31,6 @@ def get_pre_vm_type(vm_type, vm_i): def get_post_vm_type(vm_type, vm_i): - if vm_type == "KATA_VM": - return "CONFIG_KATA_VM(1)" - if vm_type == "POST_RT_VM": return "CONFIG_POST_RT_VM(1)" diff --git a/misc/config_tools/scenario_config/vm_configurations_h.py b/misc/config_tools/scenario_config/vm_configurations_h.py index 789804e7e..bbb3ecfc7 100644 --- a/misc/config_tools/scenario_config/vm_configurations_h.py +++ b/misc/config_tools/scenario_config/vm_configurations_h.py @@ -28,14 +28,12 @@ def scenario_vm_num(scenario_items, config): print("", file=config) print("/* SERVICE_VM_NUM can only be 0U or 1U;", file=config) print(" * When SERVICE_VM_NUM is 0U, MAX_POST_VM_NUM must be 0U too;", file=config) - print(" * MAX_POST_VM_NUM must be bigger than CONFIG_MAX_KATA_VM_NUM;", file=config) print(" */", file=config) load_type_cnt = scenario_items['vm'].load_order_cnt print("#define PRE_VM_NUM\t\t\t{}U".format(load_type_cnt.pre_vm), file=config) print("#define SERVICE_VM_NUM\t\t\t{}U".format(load_type_cnt.sos_vm), file=config) print("#define MAX_POST_VM_NUM\t\t\t{}U".format(load_type_cnt.post_vm), file=config) - print("#define CONFIG_MAX_KATA_VM_NUM\t\t{}U".format(scenario_cfg_lib.KATA_VM_COUNT), file=config) def gen_pre_launch_vm(scenario_items, config): diff --git a/misc/config_tools/schema/VMtypes.xsd b/misc/config_tools/schema/VMtypes.xsd index a39ead6ac..8c1d9922b 100644 --- a/misc/config_tools/schema/VMtypes.xsd +++ b/misc/config_tools/schema/VMtypes.xsd @@ -12,8 +12,7 @@ - ``PRE_RT_VM`` pre-launched real-time capable VM - ``SERVICE_VM`` pre-launched Service VM - ``POST_STD_VM`` post-launched Standard VM -- ``POST_RT_VM`` post-launched real-time capable VM -- ``KATA_VM`` post-launched Kata Container VM +- ``POST_RT_VM`` post-launched real-time capable VM @@ -22,7 +21,6 @@ - diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd index 6ddabdc84..405a9fcf2 100644 --- a/misc/config_tools/schema/config.xsd +++ b/misc/config_tools/schema/config.xsd @@ -247,11 +247,6 @@ initialization. - - - Maximum number of KATA VM. - - Maximum number of PCI devices. @@ -349,7 +344,7 @@ If this value is empty, then the default value will be calculated from informati Specify the VM type. - + Specify the VM name shown in the hypervisor console ``vm_list`` command. @@ -360,7 +355,8 @@ hypervisor console ``vm_list`` command. - + + @@ -557,6 +553,11 @@ to launch post-launched User VMs. - + + + + + + diff --git a/misc/config_tools/static_allocators/lib/lib.py b/misc/config_tools/static_allocators/lib/lib.py index 3a1918e24..0e08c9447 100644 --- a/misc/config_tools/static_allocators/lib/lib.py +++ b/misc/config_tools/static_allocators/lib/lib.py @@ -12,7 +12,7 @@ import common, board_cfg_lib from collections import namedtuple PRE_LAUNCHED_VMS_TYPE = ["SAFETY_VM", "PRE_RT_VM", "PRE_STD_VM"] -POST_LAUNCHED_VMS_TYPE = ["POST_STD_VM", "POST_RT_VM", "KATA_VM"] +POST_LAUNCHED_VMS_TYPE = ["POST_STD_VM", "POST_RT_VM"] SERVICE_VM_TYPE = ["SERVICE_VM"] class BusDevFunc(namedtuple( diff --git a/misc/config_tools/xforms/lib.xsl b/misc/config_tools/xforms/lib.xsl index 941c04cdf..b2ee7aa53 100644 --- a/misc/config_tools/xforms/lib.xsl +++ b/misc/config_tools/xforms/lib.xsl @@ -472,21 +472,6 @@ - - - - - - - - - - - - - - - diff --git a/misc/config_tools/xforms/vm_configurations.h.xsl b/misc/config_tools/xforms/vm_configurations.h.xsl index e57b4e0dd..61ddc5223 100644 --- a/misc/config_tools/xforms/vm_configurations.h.xsl +++ b/misc/config_tools/xforms/vm_configurations.h.xsl @@ -37,12 +37,11 @@ - + -