github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-02 17:34:27 +00:00
Code Issues Projects Releases Wiki Activity

move buildtype above debugoptions in the scenario schema

Browse Source 
(adding to release_3.0 branch)

DX/UI recommendation is to move the build type parameter outside of the
debugoptions section. This breaks existing schema files, so also update
scenario XML files in the code tree to match.

Update the xforms xsl script with the same change to the buildtype
option location in schema XML files.

Tracked-On: #5692

Signed-off-by: David B. Kinder <david.b.kinder@intel.com>
This commit is contained in:
David B. Kinder
2022-05-26 09:23:55 -07:00
committed by acrnsi-robot
parent ee27303bed
commit 27601281ff
24 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

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

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/cfl-k700-i7/partitioned.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

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

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

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

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

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

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/qemu/shared.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

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

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

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

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

2
misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
View File

@@ -1,7 +1,7 @@
<acrn-config> <acrn-config>
<hv> <hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS> <DEBUG_OPTIONS>
<BUILD_TYPE>debug</BUILD_TYPE>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE> <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL> <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL> <NPK_LOGLEVEL>5</NPK_LOGLEVEL>

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

@@ -13,16 +13,6 @@
</xs:annotation> </xs:annotation>
<xs:all> <xs:all>
<xs:element name="BUILD_TYPE" type="BuildType" default="debug">
<xs:annotation acrn:title="Build type" acrn:views="basic">
<xs:documentation>Select the build type:
* ``Debug`` enables the debug shell, prints, and logs.
* ``Release`` optimizes the ACRN binary for deployment and turns off all debug infrastructure.
These settings can only be changed at build time.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="SERIAL_CONSOLE" type="SerialConsoleType" default="None"> <xs:element name="SERIAL_CONSOLE" type="SerialConsoleType" default="None">
<xs:annotation acrn:title="Serial console port" acrn:views="basic" <xs:annotation acrn:title="Serial console port" acrn:views="basic"
acrn:options="//ttys/serial[type != '0']/dev_path/text(), 'None' "> acrn:options="//ttys/serial[type != '0']/dev_path/text(), 'None' ">
@@ -255,6 +245,16 @@ These settings can only be changed at build time.</xs:documentation>
<xs:complexType name="HVConfigType"> <xs:complexType name="HVConfigType">
<xs:all> <xs:all>
<xs:element name="BUILD_TYPE" type="BuildType" default="debug">
<xs:annotation acrn:title="Build type" acrn:views="basic">
<xs:documentation>Select the build type:
* ``Debug`` enables the debug shell, prints, and logs.
* ``Release`` optimizes the ACRN binary for deployment and turns off all debug infrastructure.
These settings can only be changed at build time.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="FEATURES" type="FeatureOptionsType"> <xs:element name="FEATURES" type="FeatureOptionsType">
<xs:annotation acrn:title="Hypervisor features" acrn:views="basic, advanced"> <xs:annotation acrn:title="Hypervisor features" acrn:views="basic, advanced">
</xs:annotation> </xs:annotation>