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

config_tools: remove LOG_BUF_SIZE

Browse Source 
remove LOG_BUF_SIZE in the related python code, schema and
all existing scenario XML files.

Tracked-On: #6690
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-11-23 16:40:03 +08:00 committed by wenlingz
parent 0d59577fe4
commit 11fb6341be
19 changed files with 0 additions and 29 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -170,7 +170,6 @@ def get_capacities(hv_info, config):
def get_log_opt(hv_info, config): def get_log_opt(hv_info, config):
print("CONFIG_LOG_BUF_SIZE={}".format(hv_info.log.buf_size), file=config)
print("CONFIG_NPK_LOGLEVEL_DEFAULT={}".format(hv_info.log.level.npk), file=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_MEM_LOGLEVEL_DEFAULT={}".format(hv_info.log.level.mem), file=config)
print("CONFIG_LOG_DESTINATION={}".format(hv_info.log.dest), file=config) print("CONFIG_LOG_DESTINATION={}".format(hv_info.log.dest), file=config)

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

@ -31,19 +31,16 @@ class LogOpt:
self.hv_file = hv_file self.hv_file = hv_file
self.dest = 0 self.dest = 0
self.release = '' self.release = ''
self.buf_size = 0
self.level = LogLevel(self.hv_file) self.level = LogLevel(self.hv_file)
def get_info(self): def get_info(self):
self.release = common.get_hv_item_tag(self.hv_file, "DEBUG_OPTIONS", "RELEASE") 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.dest = common.get_hv_item_tag(self.hv_file, "DEBUG_OPTIONS", "LOG_DESTINATION")
self.buf_size = common.get_hv_item_tag(self.hv_file, "DEBUG_OPTIONS", "LOG_BUF_SIZE")
self.level.get_info() self.level.get_info()
def check_item(self): def check_item(self):
hv_cfg_lib.release_check(self.release, "DEBUG_OPTIONS", "RELEASE") 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']) hv_cfg_lib.hv_range_check(self.dest, "DEBUG_OPTIONS", "LOG_DESTINATION", hv_cfg_lib.RANGE_DB['LOG_DESTINATION_BITMAP'])
hv_cfg_lib.hv_size_check(self.buf_size, "DEBUG_OPTIONS", "LOG_BUF_SIZE")
self.level.check_item() self.level.check_item()

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

@ -78,12 +78,6 @@ serial console and Service VM logs. Effective only in debug builds (when
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:element> </xs:element>
<xs:element name="LOG_BUF_SIZE" type="HexFormat" default="0x40000">
<xs:annotation>
<xs:documentation>Capacity (in bytes) of logbuf for each
physical CPU, for example, ``0x40000``.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:all> </xs:all>
</xs:complexType> </xs:complexType>

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

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