From de5abd52653ac48a53c61add62fcbdf10ec72a32 Mon Sep 17 00:00:00 2001 From: Kunhui-Li Date: Wed, 1 Dec 2021 13:58:54 +0800 Subject: [PATCH] config_tools: remove CONFIG_LOG_DESTINATION 1. remove LOG_DESTINATION in the related python code, schema and all existing scenario XML files. 2. for MEM_LOGLEVEL, NPK_LOGLEVEL and CONSOLE_LOGLEVEL, update the loglevel range to [0, 5] from [0, 6]. Tracked-On: #6934 Signed-off-by: Kunhui-Li Acked-by: Anthony Xu --- .../data/cfl-k700-i7/hybrid_rt.xml | 1 - misc/config_tools/data/cfl-k700-i7/shared.xml | 1 - .../data/generic_board/hybrid.xml | 1 - .../data/generic_board/hybrid_rt.xml | 1 - .../data/generic_board/partitioned.xml | 1 - .../data/generic_board/shared.xml | 1 - misc/config_tools/data/nuc11tnbi5/hybrid.xml | 1 - .../data/nuc11tnbi5/partitioned.xml | 1 - misc/config_tools/data/nuc11tnbi5/shared.xml | 1 - misc/config_tools/data/qemu/sdc.xml | 1 - misc/config_tools/data/whl-ipc-i5/hybrid.xml | 1 - .../data/whl-ipc-i5/hybrid_rt.xml | 1 - .../data/whl-ipc-i5/partitioned.xml | 1 - misc/config_tools/data/whl-ipc-i5/sdc.xml | 1 - misc/config_tools/data/whl-ipc-i5/shared.xml | 1 - .../config_tools/hv_config/board_defconfig.py | 1 - misc/config_tools/hv_config/hv_item.py | 3 --- misc/config_tools/library/hv_cfg_lib.py | 3 +-- .../scenario_config/scenario_cfg_gen.py | 1 - misc/config_tools/schema/config.xsd | 23 ------------------- misc/config_tools/xforms/config_common.xsl | 4 ---- 21 files changed, 1 insertion(+), 49 deletions(-) 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 0c9cad5c4..33d8d2292 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/data/cfl-k700-i7/shared.xml b/misc/config_tools/data/cfl-k700-i7/shared.xml index 1c5448aea..8d26fb173 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml index b793a24f4..04d6c7e3b 100644 --- a/misc/config_tools/data/generic_board/hybrid.xml +++ b/misc/config_tools/data/generic_board/hybrid.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml index 4909539e5..8cf5b5bf0 100644 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ b/misc/config_tools/data/generic_board/hybrid_rt.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml index 522061c69..b708824a9 100644 --- a/misc/config_tools/data/generic_board/partitioned.xml +++ b/misc/config_tools/data/generic_board/partitioned.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/data/generic_board/shared.xml b/misc/config_tools/data/generic_board/shared.xml index c6077705a..eed742f78 100644 --- a/misc/config_tools/data/generic_board/shared.xml +++ b/misc/config_tools/data/generic_board/shared.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml index 678c0c5b7..f2dbc24b7 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml index 5a5060351..b18a63a15 100644 --- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml +++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/data/nuc11tnbi5/shared.xml b/misc/config_tools/data/nuc11tnbi5/shared.xml index 605212bf7..75e5dca79 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/data/qemu/sdc.xml b/misc/config_tools/data/qemu/sdc.xml index 1098b9aef..4277ccd4e 100644 --- a/misc/config_tools/data/qemu/sdc.xml +++ b/misc/config_tools/data/qemu/sdc.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml index 8886ea5a6..2fe8e6c6f 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y 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 41fa052a8..8e1a19de9 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml index 28fd16203..d73ddf89f 100644 --- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml +++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml index b59858ffb..50dfdf838 100644 --- a/misc/config_tools/data/whl-ipc-i5/sdc.xml +++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/data/whl-ipc-i5/shared.xml b/misc/config_tools/data/whl-ipc-i5/shared.xml index 8d3182cc7..07497e4db 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared.xml @@ -6,7 +6,6 @@ 5 5 3 - 7 y diff --git a/misc/config_tools/hv_config/board_defconfig.py b/misc/config_tools/hv_config/board_defconfig.py index 045d34726..436e2040c 100644 --- a/misc/config_tools/hv_config/board_defconfig.py +++ b/misc/config_tools/hv_config/board_defconfig.py @@ -172,7 +172,6 @@ def get_log_opt(hv_info, config): print("CONFIG_NPK_LOGLEVEL_DEFAULT={}".format(hv_info.log.level.npk), file=config) print("CONFIG_MEM_LOGLEVEL_DEFAULT={}".format(hv_info.log.level.mem), file=config) - print("CONFIG_LOG_DESTINATION={}".format(hv_info.log.dest), file=config) print("CONFIG_CONSOLE_LOGLEVEL_DEFAULT={}".format(hv_info.log.level.console), file=config) diff --git a/misc/config_tools/hv_config/hv_item.py b/misc/config_tools/hv_config/hv_item.py index 9f5a9af47..3ee0a4228 100644 --- a/misc/config_tools/hv_config/hv_item.py +++ b/misc/config_tools/hv_config/hv_item.py @@ -29,18 +29,15 @@ class LogOpt: def __init__(self, hv_file): self.hv_file = hv_file - self.dest = 0 self.release = '' self.level = LogLevel(self.hv_file) def get_info(self): self.release = common.get_hv_item_tag(self.hv_file, "DEBUG_OPTIONS", "RELEASE") - self.dest = common.get_hv_item_tag(self.hv_file, "DEBUG_OPTIONS", "LOG_DESTINATION") self.level.get_info() def check_item(self): hv_cfg_lib.release_check(self.release, "DEBUG_OPTIONS", "RELEASE") - hv_cfg_lib.hv_range_check(self.dest, "DEBUG_OPTIONS", "LOG_DESTINATION", hv_cfg_lib.RANGE_DB['LOG_DESTINATION_BITMAP']) self.level.check_item() diff --git a/misc/config_tools/library/hv_cfg_lib.py b/misc/config_tools/library/hv_cfg_lib.py index 2a30fede3..eac2c0693 100644 --- a/misc/config_tools/library/hv_cfg_lib.py +++ b/misc/config_tools/library/hv_cfg_lib.py @@ -15,8 +15,7 @@ N_Y = ['n', 'y'] SCHEDULER_TYPE = ['SCHED_NOOP', 'SCHED_IORR', 'SCHED_BVT', 'SCHED_PRIO'] RANGE_DB = { - 'LOG_LEVEL':{'min':0,'max':6}, - 'LOG_DESTINATION_BITMAP':{'min':0,'max':7}, + 'LOG_LEVEL':{'min':0,'max':5}, 'EMULATED_MMIO_REGIONS':{'min':0,'max':128}, 'PT_IRQ_ENTRIES':{'min':0,'max':256}, 'IOAPIC_NUM':{'min':1,'max':10}, diff --git a/misc/config_tools/scenario_config/scenario_cfg_gen.py b/misc/config_tools/scenario_config/scenario_cfg_gen.py index 97d75c985..820290f2a 100755 --- a/misc/config_tools/scenario_config/scenario_cfg_gen.py +++ b/misc/config_tools/scenario_config/scenario_cfg_gen.py @@ -75,7 +75,6 @@ def get_scenario_item_values(board_info, scenario_info): scenario_item_values["hv,DEBUG_OPTIONS,MEM_LOGLEVEL"] = hv_cfg_lib.get_select_range("DEBUG_OPTIONS", "LOG_LEVEL") scenario_item_values["hv,DEBUG_OPTIONS,CONSOLE_LOGLEVEL"] = hv_cfg_lib.get_select_range("DEBUG_OPTIONS", "LOG_LEVEL") scenario_item_values["hv,DEBUG_OPTIONS,SERIAL_CONSOLE"] = board_cfg_lib.get_native_ttys_info(board_info) - scenario_item_values["hv,DEBUG_OPTIONS,LOG_DESTINATION"] = hv_cfg_lib.get_select_range("DEBUG_OPTIONS", "LOG_DESTINATION_BITMAP") scenario_item_values["hv,CAPACITIES,MAX_IOAPIC_NUM"] = hv_cfg_lib.get_select_range("CAPACITIES", "IOAPIC_NUM") diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd index a93bb7eda..b46d778f6 100644 --- a/misc/config_tools/schema/config.xsd +++ b/misc/config_tools/schema/config.xsd @@ -55,29 +55,6 @@ memory. Value can be changed at runtime. written to the serial console. - - - Bitmap indicating the destination of log messages. -There are three log destinations available: - -- Bit 0 enables the serial console (``0x1``), -- Bit 1 enables the Service VM log (``0x2``), and -- Bit 2 enables the NPK log (``0x4``). - -For example, a value of ``3`` enables only the -serial console and Service VM logs. Effective only in debug builds (when -:option:`hv.DEBUG_OPTIONS.RELEASE` is ``n``). - - - - Integer value from 0 to 7. - - - - - - - diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl index 4d9b65896..5a5bd4bd8 100644 --- a/misc/config_tools/xforms/config_common.xsl +++ b/misc/config_tools/xforms/config_common.xsl @@ -52,10 +52,6 @@ - - - -