acrn-config: remove 'scenario' dependency from acrn config tool

For purpose weaken 'scenario' from config tool, remove 'scenario' dependency
from config tool.

Tracked-On: #4641
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
Acked-by: Terry Zou <terry.zou@intel.com>

Author: Wei Liu

misc/acrn-config/board_config/board_cfg_gen.py

@@ -40,6 +40,7 @@ def main(args):
     common.BOARD_INFO_FILE = params['--board']
     common.SCENARIO_INFO_FILE = params['--scenario']
     common.get_vm_num(params['--scenario'])
+    common.get_vm_types()
 
     # get board name
     (err_dic, board) = common.get_board_name()

misc/acrn-config/board_config/misc_cfg_h.py

@@ -48,27 +48,18 @@ def sos_bootarg_diff(sos_cmdlines, config):
 def parse_boot_info():
 
     err_dic = {}
-    vm_types = []
 
-    (err_dic, scenario_name) = common.get_scenario_name()
-    if err_dic:
-        return (err_dic, sos_cmdlines, sos_rootfs, vuart0_dic, vuart1_dic, vm_types)
-
-    if scenario_name != "logical_partition":
-        sos_cmdlines = common.get_sub_leaf_tag(common.SCENARIO_INFO_FILE, "board_private", "bootargs")
-        sos_rootfs = common.get_sub_leaf_tag(common.SCENARIO_INFO_FILE, "board_private", "rootfs")
+    if 'SOS_VM' in common.VM_TYPES.values():
+        sos_cmdlines = list(common.get_leaf_tag_map(common.SCENARIO_INFO_FILE, "board_private", "bootargs").values())
+        sos_rootfs = list(common.get_leaf_tag_map(common.SCENARIO_INFO_FILE, "board_private", "rootfs").values())
         (err_dic, vuart0_dic, vuart1_dic) = board_cfg_lib.get_board_private_vuart("board_private", "console")
     else:
-        sos_cmdlines = common.get_sub_leaf_tag(common.SCENARIO_INFO_FILE, "os_config", "bootargs")
+        sos_cmdlines = list(common.get_leaf_tag_map(common.SCENARIO_INFO_FILE, "os_config", "bootargs").values())
 
-        sos_rootfs = common.get_sub_leaf_tag(common.SCENARIO_INFO_FILE, "os_config", "rootfs")
+        sos_rootfs = list(common.get_leaf_tag_map(common.SCENARIO_INFO_FILE, "os_config", "rootfs").values())
         (err_dic, vuart0_dic, vuart1_dic) = board_cfg_lib.get_board_private_vuart("os_config", "console")
 
-    for i in range(common.VM_COUNT):
-        vm_type = board_cfg_lib.get_order_type_by_vmid(i)
-        vm_types.append(vm_type)
-
-    return (err_dic, sos_cmdlines, sos_rootfs, vuart0_dic, vuart1_dic, vm_types)
+    return (err_dic, sos_cmdlines, sos_rootfs, vuart0_dic, vuart1_dic)
 
 
 def find_hi_mmio_window(config):
@@ -129,7 +120,7 @@ def generate_file(config):
         return err_dic
 
     # parse sos_bootargs/rootfs/console
-    (err_dic, sos_cmdlines, sos_rootfs, vuart0_dic, vuart1_dic, vm_types) = parse_boot_info()
+    (err_dic, sos_cmdlines, sos_rootfs, vuart0_dic, vuart1_dic) = parse_boot_info()
     if err_dic:
         return err_dic
 
@@ -176,7 +167,7 @@ def generate_file(config):
 
     # sos rootfs and console
     print("", file=config)
-    if "SOS_VM" in vm_types:
+    if "SOS_VM" in common.VM_TYPES.values():
         print('#define SOS_ROOTFS\t\t"root={} "'.format(sos_rootfs[0]), file=config)
         if ttys_n:
             print('#define SOS_CONSOLE\t\t"console={} "'.format(ttys_n), file=config)
@@ -185,12 +176,12 @@ def generate_file(config):
 
     # sos com base/irq
     i_type = 0
-    for vm_type in vm_types:
+    for vm_i,vm_type in common.VM_TYPES.items():
         if vm_type == "SOS_VM":
+            i_type = vm_i
             break
-        i_type += 1
 
-    if "SOS_VM" in vm_types:
+    if "SOS_VM" in common.VM_TYPES.values():
         if vuart0_dic:
             print("#define SOS_COM1_BASE\t\t{}U".format(vuart0_port_base), file=config)
             print("#define SOS_COM1_IRQ\t\t{}U".format(vuart0_irq), file=config)
@@ -204,7 +195,7 @@ def generate_file(config):
 
     # sos boot command line
     print("", file=config)
-    if "SOS_VM" in vm_types:
+    if "SOS_VM" in common.VM_TYPES.values():
         sos_bootarg_diff(sos_cmdlines, config)
 
     # set macro for HIDDEN PTDEVS

misc/acrn-config/hv_config/board_defconfig.py

@@ -85,14 +85,10 @@ def get_serial_type():
     # Get ttySx information from board config file
     ttys_lines = board_cfg_lib.get_info(common.BOARD_INFO_FILE, "<TTYS_INFO>", "</TTYS_INFO>")
 
-    (err_dic, scenario_name) = common.get_scenario_name()
-    if scenario_name == "logical_partition":
-        ttyn = 'ttyS0'
-    else:
-        # Get ttySx from scenario config file which selected by user
-        (err_dic, ttyn) = board_cfg_lib.parser_vuart_console()
-        if err_dic:
-            hv_cfg_lib.ERR_LIST.update(err_dic)
+    # Get ttySx from scenario config file which selected by user
+    (err_dic, ttyn) = board_cfg_lib.parser_vuart_console()
+    if err_dic:
+        hv_cfg_lib.ERR_LIST.update(err_dic)
 
     # query the serial type from board config file
     for line in ttys_lines:
@@ -189,7 +185,6 @@ def get_capacities(hv_info, config):
     print("CONFIG_MAX_IOAPIC_NUM={}".format(hv_info.cap.max_ioapic_num), file=config)
     print("CONFIG_MAX_IR_ENTRIES={}".format(hv_info.cap.max_ir_entries), file=config)
     print("CONFIG_MAX_PCI_DEV_NUM={}".format(hv_info.cap.max_pci_dev_num), file=config)
-    print("CONFIG_MAX_KATA_VM_NUM={}".format(hv_info.cap.max_kata_vm_num), file=config)
     print("CONFIG_MAX_IOAPIC_LINES={}".format(hv_info.cap.max_ioapic_lines), file=config)
     print("CONFIG_MAX_PT_IRQ_ENTRIES={}".format(hv_info.cap.max_pt_irq_entries), file=config)
     print("CONFIG_MAX_MSIX_TABLE_NUM={}".format(hv_info.cap.max_msix_table_num), file=config)
@@ -219,7 +214,6 @@ def generate_file(hv_info, config):
     if hv_info.log.release == 'y':
         print("CONFIG_RELEASE=y", file=config)
     print('CONFIG_BOARD="{}"'.format(board_name), file=config)
-    print("CONFIG_{}=y".format(scenario_name.upper()), file=config)
 
     get_memory(hv_info, config)
     get_miscfg(hv_info, config)

misc/acrn-config/launch_config/launch_cfg_gen.py

@@ -164,6 +164,7 @@ def main(args):
     common.BOARD_INFO_FILE = board_info_file
     common.SCENARIO_INFO_FILE = scenario_info_file
     common.LAUNCH_INFO_FILE = launch_info_file
+    common.get_vm_types()
 
     # get post vm dic
     post_num_list = launch_cfg_lib.get_post_num_list()

misc/acrn-config/library/board_cfg_lib.py

@@ -170,19 +170,6 @@ def clos_info_parser(board_info):
     return get_max_clos_mask(board_info)
 
 
-def get_order_type_by_vmid(idx):
-    """
-    This is get pre launched vm count
-    :param idx: index of vm id
-    :return: vm type of index to vmid
-    """
-    (err_dic, order_type) = common.get_load_order_by_vmid(common.SCENARIO_INFO_FILE, common.VM_COUNT, idx)
-    if err_dic:
-        ERR_LIST.update(err_dic)
-
-    return order_type
-
-
 def get_valid_irq(board_info):
     """
      This is get available irq from board info file
@@ -254,8 +241,7 @@ def parser_vuart_console():
     3. ttyS2
     """
     ttys_n = ''
-    (err_dic, scenario_name) = common.get_scenario_name()
-
+    err_dic = {}
     ttys = common.get_hv_item_tag(common.SCENARIO_INFO_FILE, "DEBUG_OPTIONS", "SERIAL_CONSOLE")
 
     if not ttys or ttys == None:
@@ -345,6 +331,9 @@ def get_vuart_info_id(config_file, idx):
     vm_id = 0
     root = common.get_config_root(config_file)
     for item in root:
+        if item.tag == "vm":
+            vm_id = int(item.attrib['id'])
+
         for sub in item:
             tmp_vuart = {}
             for leaf in sub:
@@ -355,9 +344,6 @@ def get_vuart_info_id(config_file, idx):
             if tmp_vuart and sub.tag == "vuart":
                 tmp_tag[vm_id] = tmp_vuart
 
-        if item.tag == "vm":
-            vm_id += 1
-
     return tmp_tag
 
 

misc/acrn-config/library/common.py

@@ -31,6 +31,7 @@
 BOARD_INFO_FILE = ""
 SCENARIO_INFO_FILE = ""
 LAUNCH_INFO_FILE = ""
+VM_TYPES = {}
 
 class MultiItem():
 
@@ -204,36 +205,19 @@ def is_config_file_match():
         return (err_dic, False)
 
 
-def find_index_guest_flag(flag):
+def find_tmp_flag(flag):
     """
     Find the index in GUEST_FLAG by flag
     :param flag: flag contained by GUEST_FLAG
     :return: index of GUEST_FLAG
     """
-    if not flag or flag == '0':
-        return '0'
+    if flag == None or flag == '0':
+        return '0UL'
 
-    if not flag.isnumeric():
-        for i in range(len(GUEST_FLAG)):
-            if flag == GUEST_FLAG[i]:
-                flag_str = i
-                return flag_str
-
-def find_tmp_flag(leaf_text):
-    """
-    Get flag and append the value
-    :param leaf_text: it is a value of guest flag item
-    :return: a list of flag or none
-    """
-    tmp_flag = []
-    tmp_flag = find_index_guest_flag(leaf_text)
-    #flag_index = find_index_guest_flag(leaf_text)
-    #if flag_index == '0':
-    #    tmp_flag.append(0)
-    #else:
-    #    tmp_flag.append(flag_index)
-
-    return tmp_flag
+    flag_str = ''
+    for i in range(len(GUEST_FLAG)):
+        if flag == GUEST_FLAG[i]:
+            return flag_str
 
 
 def get_config_root(config_file):
@@ -266,67 +250,12 @@ def get_vm_num(config_file):
     VM_COUNT = vm_count
 
 
-# TODO: This will be abandonment in future
-def get_sub_leaf_tag(config_file, branch_tag, tag_str=''):
-    """
-     This is get tag value by tag_str from config file
-     :param config_file: it is a file what contains information for script to read from
-     :param branch_tag: it is key of patter to config file branch tag item
-     :param tag_str: it is key of pattern to config file leaf tag item
-     :return: value of tag_str item
-     """
-    tmp_tag = []
-    root = get_config_root(config_file)
-    for item in root:
-        # for each 2th level item
-        for sub in item:
-            tmp_flag = []
-            tmp_cpus = []
-            if sub.tag == branch_tag:
-                if not tag_str:
-                    tmp_tag.append(sub.text)
-                    continue
-
-                # for each 3rd level item
-                for leaf in sub:
-                    if leaf.tag == tag_str and tag_str not in MULTI_ITEM and sub.tag != "vuart":
-                        tmp_tag.append(leaf.text)
-                        continue
-
-                    # get guest flag for logical partition vm1
-                    if leaf.tag == "guest_flag" and tag_str == "guest_flag":
-                        t_flag = find_tmp_flag(leaf.text)
-                        tmp_flag.append(t_flag)
-                        #continue
-
-                    # get cpu for vm
-                    if leaf.tag == "pcpu_id" and tag_str == "pcpu_id":
-                        tmp_cpus.append(leaf.text)
-                        continue
-
-                    # get vcpu_clos for vm
-                    if leaf.tag == "vcpu_clos" and tag_str == "vcpu_clos":
-                        tmp_cpus.append(leaf.text)
-                        continue
-
-                # append guest flags for each vm
-                if tmp_flag and tag_str == "guest_flag":
-                    tmp_tag.append(tmp_flag)
-                    continue
-
-                # append cpus for vm
-                if tmp_cpus and tag_str == "pcpu_id":
-                    tmp_tag.append(tmp_cpus)
-                    continue
-
-    return tmp_tag
-
-
 def get_leaf_value(tmp, tag_str, leaf):
 
     # get guest flag for logical partition vm1
     if leaf.tag == "guest_flag" and tag_str == "guest_flag":
         t_flag = find_tmp_flag(leaf.text)
+        #print("--debug: tag:{},{}".format(tag_str), t_flag)
         tmp.multi.guest_flag.append(t_flag)
 
     # get cpu for vm
@@ -355,7 +284,6 @@ def get_sub_value(tmp, tag_str, vm_id):
     # append guest flags for each vm
     if tmp.multi.guest_flag and tag_str == "guest_flag":
         tmp.tag[vm_id] = tmp.multi.guest_flag
-        tmp.tag.append(tmp.multi.guest_flag)
 
     # append cpus for vm
     if tmp.multi.pcpu_id and tag_str == "pcpu_id":
@@ -442,37 +370,6 @@ def get_hv_item_tag(config_file, branch_tag, tag_str=''):
     return tmp
 
 
-def order_type_map_vmid(config_file, vm_count):
-    """
-    This is mapping table for {id:order type}
-    :param config_file: it is a file what contains information for script to read from
-    :param vm_count: vm number
-    :return: table of id:order type dictionary
-    """
-    order_id_dic = {}
-    load_type_list = get_sub_leaf_tag(config_file, "load_order")
-    for i in range(vm_count):
-        order_id_dic[i] = load_type_list[i]
-
-    return order_id_dic
-
-
-def get_load_order_by_vmid(config_file, vm_count, idx):
-    """
-    Get load order by vm id
-    :param config_file: it is a file what contains information for script to read from
-    :param vm_count: vm number
-    :param idx: index of vm id
-    :return: table of id:order type dictionary
-    """
-    err_dic = {}
-    order_id_dic = order_type_map_vmid(config_file, vm_count)
-    if idx >= vm_count or not order_id_dic:
-        err_dic['vm number: failue'] = "Toatal vm number is less than index number"
-
-    return (err_dic, order_id_dic[idx])
-
-
 def undline_name(name):
     """
     This convert name which has contain '-' to '_'
@@ -519,3 +416,8 @@ def num2int(str_value):
         val = int(str_value, 16)
 
     return val
+
+
+def get_vm_types():
+    global VM_TYPES
+    VM_TYPES = get_leaf_tag_map(SCENARIO_INFO_FILE, "load_order")

misc/acrn-config/library/launch_cfg_lib.py

@@ -166,9 +166,8 @@ def post_vm_cnt(config_file):
     :return: number of post launched vm
     """
     post_launch_cnt = 0
-    load_type_list = common.get_sub_leaf_tag(config_file, "load_order")
 
-    for vm_type in load_type_list:
+    for vm_type in common.VM_TYPES.values():
         if vm_type == "POST_LAUNCHED_VM":
             post_launch_cnt += 1