github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-26 07:21:37 +00:00
Code Issues Projects Releases Wiki Activity

config_tools: remove CONFIG_LOG_DESTINATION

Browse Source 
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 <kunhuix.li@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Kunhui-Li 2021-12-01 13:58:54 +08:00 committed by wenlingz
parent 28560c1db7
commit de5abd5265
21 changed files with 1 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/cfl-k700-i7/shared.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/generic_board/hybrid.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/generic_board/hybrid_rt.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/generic_board/partitioned.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/generic_board/shared.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/nuc11tnbi5/hybrid.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/nuc11tnbi5/partitioned.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/nuc11tnbi5/shared.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/qemu/sdc.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/whl-ipc-i5/hybrid.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/whl-ipc-i5/partitioned.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/whl-ipc-i5/sdc.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/data/whl-ipc-i5/shared.xml
View File

@ -6,7 +6,6 @@
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
<LOG_DESTINATION>7</LOG_DESTINATION>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC>y</RELOC>

1
misc/config_tools/hv_config/board_defconfig.py
View File

@ -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)

3
misc/config_tools/hv_config/hv_item.py
View File

@ -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()

3
misc/config_tools/library/hv_cfg_lib.py
View File

@ -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},

1
misc/config_tools/scenario_config/scenario_cfg_gen.py
View File

@ -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")

23
misc/config_tools/schema/config.xsd
View File

@ -55,29 +55,6 @@ memory. Value can be changed at runtime.</xs:documentation>
written to the serial console.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="LOG_DESTINATION" default="7">
<xs:annotation>
<xs:documentation>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``).</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:annotation>
<xs:documentation>Integer value from 0 to 7.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<xs:minInclusive value="0" />
<xs:maxInclusive value="7" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:all>
</xs:complexType>

4
misc/config_tools/xforms/config_common.xsl
View File

@ -52,10 +52,6 @@
<xsl:with-param name="value" select="CONSOLE_LOGLEVEL" />
</xsl:call-template>
<xsl:call-template name="integer-by-key">
<xsl:with-param name="key" select="'LOG_DESTINATION'" />
</xsl:call-template>
<xsl:apply-templates select="SERIAL_CONSOLE" />
</xsl:template>