mirror of
https://github.com/projectacrn/acrn-hypervisor.git
synced 2025-09-07 20:00:13 +00:00
config_tools: remove KATA and replace UUID with vmname to identify a vm
1. remove CONFIG_KATA_VM, CONFIG_MAX_KATA_VM_NUM and KATA_VM related code. 2. remove KATA_VM in scenario xml files. 3. remove KATA vm type in UI. 4. remove UUID DB. 5. remove uuid in the launch script generation logic. 6. use vmname to identify a vm. (eg: <name>ACRN_SOS_VM</name>) add the check logic to ensure vm name is a must-set item, not duplicated, and the string length is [1-15] and the whitespace is not allowed. 7. enlarge the max VM num to 32. Tracked-On: #6685 Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
This commit is contained in:
@@ -61,7 +61,7 @@
|
||||
</hv>
|
||||
<vm id="0">
|
||||
<vm_type>SAFETY_VM</vm_type>
|
||||
<name>ACRN PRE-LAUNCHED VM0</name>
|
||||
<name>SAFETY_VM0</name>
|
||||
<guest_flags>
|
||||
<guest_flag>0</guest_flag>
|
||||
</guest_flags>
|
||||
@@ -119,7 +119,7 @@
|
||||
</vm>
|
||||
<vm id="1">
|
||||
<vm_type>SERVICE_VM</vm_type>
|
||||
<name>ACRN Service VM</name>
|
||||
<name>ACRN_Service_VM</name>
|
||||
<guest_flags>
|
||||
<guest_flag>0</guest_flag>
|
||||
</guest_flags>
|
||||
@@ -175,6 +175,7 @@
|
||||
</vm>
|
||||
<vm id="2">
|
||||
<vm_type>POST_STD_VM</vm_type>
|
||||
<name>POST_STD_VM1</name>
|
||||
<guest_flags>
|
||||
<guest_flag>0</guest_flag>
|
||||
</guest_flags>
|
||||
@@ -212,6 +213,7 @@
|
||||
</vm>
|
||||
<vm id="3">
|
||||
<vm_type>POST_STD_VM</vm_type>
|
||||
<name>POST_STD_VM2</name>
|
||||
<guest_flags>
|
||||
<guest_flag>0</guest_flag>
|
||||
</guest_flags>
|
||||
|
@@ -127,7 +127,7 @@
|
||||
</vm>
|
||||
<vm id="1">
|
||||
<vm_type>SERVICE_VM</vm_type>
|
||||
<name>ACRN Service VM</name>
|
||||
<name>ACRN_Service_VM</name>
|
||||
<guest_flags>
|
||||
<guest_flag>0</guest_flag>
|
||||
</guest_flags>
|
||||
|
@@ -61,7 +61,7 @@
|
||||
</hv>
|
||||
<vm id="0">
|
||||
<vm_type>PRE_STD_VM</vm_type>
|
||||
<name>ACRN PRE-LAUNCHED VM0</name>
|
||||
<name>PRE_STD_VM0</name>
|
||||
<guest_flags>
|
||||
<guest_flag>0</guest_flag>
|
||||
</guest_flags>
|
||||
@@ -122,7 +122,7 @@
|
||||
</vm>
|
||||
<vm id="1">
|
||||
<vm_type>PRE_STD_VM</vm_type>
|
||||
<name>ACRN PRE-LAUNCHED VM1</name>
|
||||
<name>PRE_STD_VM1</name>
|
||||
<guest_flags>
|
||||
<guest_flag>0</guest_flag>
|
||||
</guest_flags>
|
||||
|
@@ -61,7 +61,7 @@
|
||||
</hv>
|
||||
<vm id="0">
|
||||
<vm_type>SERVICE_VM</vm_type>
|
||||
<name>ACRN Service VM</name>
|
||||
<name>ACRN_Service_VM</name>
|
||||
<guest_flags>
|
||||
<guest_flag>0</guest_flag>
|
||||
</guest_flags>
|
||||
@@ -111,6 +111,7 @@
|
||||
</vm>
|
||||
<vm id="1">
|
||||
<vm_type>POST_STD_VM</vm_type>
|
||||
<name>POST_STD_VM1</name>
|
||||
<guest_flags>
|
||||
<guest_flag>0</guest_flag>
|
||||
</guest_flags>
|
||||
@@ -150,6 +151,7 @@
|
||||
</vm>
|
||||
<vm id="2">
|
||||
<vm_type>POST_RT_VM</vm_type>
|
||||
<name>POST_RT_VM1</name>
|
||||
<guest_flags>
|
||||
<guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
|
||||
<guest_flag>GUEST_FLAG_RT</guest_flag>
|
||||
@@ -190,6 +192,7 @@
|
||||
</vm>
|
||||
<vm id="3">
|
||||
<vm_type>POST_STD_VM</vm_type>
|
||||
<name>POST_STD_VM2</name>
|
||||
<guest_flags>
|
||||
<guest_flag>0</guest_flag>
|
||||
</guest_flags>
|
||||
@@ -229,6 +232,7 @@
|
||||
</vm>
|
||||
<vm id="4">
|
||||
<vm_type>POST_STD_VM</vm_type>
|
||||
<name>POST_STD_VM3</name>
|
||||
<guest_flags>
|
||||
<guest_flag>0</guest_flag>
|
||||
</guest_flags>
|
||||
@@ -268,6 +272,7 @@
|
||||
</vm>
|
||||
<vm id="5">
|
||||
<vm_type>POST_STD_VM</vm_type>
|
||||
<name>POST_STD_VM4</name>
|
||||
<guest_flags>
|
||||
<guest_flag>0</guest_flag>
|
||||
</guest_flags>
|
||||
@@ -307,6 +312,7 @@
|
||||
</vm>
|
||||
<vm id="6">
|
||||
<vm_type>POST_STD_VM</vm_type>
|
||||
<name>POST_STD_VM5</name>
|
||||
<guest_flags>
|
||||
<guest_flag>0</guest_flag>
|
||||
</guest_flags>
|
||||
@@ -344,40 +350,4 @@
|
||||
</communication_vuart>
|
||||
<PTM>n</PTM>
|
||||
</vm>
|
||||
<vm id="7">
|
||||
<vm_type>KATA_VM</vm_type>
|
||||
<cpu_affinity>
|
||||
<pcpu_id>0</pcpu_id>
|
||||
<pcpu_id>1</pcpu_id>
|
||||
</cpu_affinity>
|
||||
<clos>
|
||||
<vcpu_clos>0</vcpu_clos>
|
||||
<vcpu_clos>0</vcpu_clos>
|
||||
</clos>
|
||||
<epc_section>
|
||||
<base>0</base>
|
||||
<size>0</size>
|
||||
</epc_section>
|
||||
<legacy_vuart id="0">
|
||||
<type>VUART_LEGACY_PIO</type>
|
||||
<base>INVALID_COM_BASE</base>
|
||||
<irq>COM1_IRQ</irq>
|
||||
</legacy_vuart>
|
||||
<legacy_vuart id="1">
|
||||
<type>VUART_LEGACY_PIO</type>
|
||||
<base>INVALID_COM_BASE</base>
|
||||
<irq>COM2_IRQ</irq>
|
||||
<target_vm_id>0</target_vm_id>
|
||||
<target_uart_id>0</target_uart_id>
|
||||
</legacy_vuart>
|
||||
<console_vuart id="0">
|
||||
<base>INVALID_PCI_BASE</base>
|
||||
</console_vuart>
|
||||
<communication_vuart id="1">
|
||||
<base>INVALID_PCI_BASE</base>
|
||||
<target_vm_id>1</target_vm_id>
|
||||
<target_uart_id>1</target_uart_id>
|
||||
</communication_vuart>
|
||||
<PTM>n</PTM>
|
||||
</vm>
|
||||
</acrn-config>
|
||||
|
Reference in New Issue
Block a user