github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-05-31 03:15:42 +00:00
Code Issues Projects Releases Wiki Activity

config tool: change vm_type to required field

Browse Source 
hide vm_type in UI for service vm, and change it to
required field, since lack of it in xml may lead to
wrong inference for vm severity.

Tracked-On: #6690
Signed-off-by: hangliu1 <hang1.liu@linux.intel.com>
This commit is contained in:
hangliu1 2022-06-09 21:10:52 +08:00 committed by acrnsi-robot
parent ea8651cbd6
commit cfd677c782
19 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,6 +90,7 @@
</vm>
<vm id="1">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -161,4 +162,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

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

@ -117,6 +117,7 @@
</vm>
<vm id="1">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -195,4 +196,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

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

@ -58,6 +58,7 @@
</hv>
<vm id="0">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -269,4 +270,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

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

@ -91,6 +91,7 @@
</vm>
<vm id="1">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -161,4 +162,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

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

@ -111,6 +111,7 @@
</vm>
<vm id="1">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -184,4 +185,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

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

@ -58,6 +58,7 @@
</hv>
<vm id="0">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -269,4 +270,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

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

@ -91,6 +91,7 @@
</vm>
<vm id="1">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -161,4 +162,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

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

@ -58,6 +58,7 @@
</hv>
<vm id="0">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -269,4 +270,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

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

@ -59,6 +59,7 @@
</hv>
<vm id="0">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -80,4 +81,4 @@
</cpu_affinity>
<console_vuart>None</console_vuart>
</vm>
</acrn-config>
</acrn-config>

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

@ -91,6 +91,7 @@
</vm>
<vm id="1">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -165,4 +166,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

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

@ -70,6 +70,7 @@
</hv>
<vm id="0">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -155,4 +156,4 @@
<block>./core-image-weston-intel-corei7-64.wic</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

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

@ -89,6 +89,7 @@
</vm>
<vm id="1">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -159,4 +160,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

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

@ -117,6 +117,7 @@
</vm>
<vm id="1">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -191,4 +192,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

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

@ -58,6 +58,7 @@
</hv>
<vm id="0">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -178,4 +179,4 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>
</acrn-config>

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

@ -58,6 +58,7 @@
</hv>
<vm id="0">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -179,4 +180,4 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>
</acrn-config>

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

@ -58,6 +58,7 @@
</hv>
<vm id="0">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -179,4 +180,4 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>
</acrn-config>

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

@ -58,6 +58,7 @@
</hv>
<vm id="0">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -198,4 +199,4 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>
</acrn-config>

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

@ -58,6 +58,7 @@
</hv>
<vm id="0">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
@ -270,4 +271,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

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

@ -305,7 +305,7 @@ Refer to :ref:`vuart_config` for detailed vUART settings.</xs:documentation>
<xs:documentation>Specify the name used to identify this VM. The VM name will be shown in the hypervisor console vm_list command.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="vm_type" type="VMType" minOccurs="0">
<xs:element name="vm_type" type="VMType">
<xs:annotation acrn:title="VM type" acrn:views="basic">
<xs:documentation>Select the VM type. A standard VM (``STANDARD_VM``) is for general-purpose applications, such as human-machine interface (HMI). A real-time VM (``RTVM``) offers special features for time-sensitive applications.</xs:documentation>
</xs:annotation>