From ed5d28a84097ca026457a44ab56d0c1ce40d59d3 Mon Sep 17 00:00:00 2001
From: Weiyi Feng <weiyix.feng@intel.com>
Date: Tue, 16 Nov 2021 10:36:06 +0800
Subject: [PATCH] config_tool: update scenario and launch xml for vm_name
 support

update scenario and launch xml for vm_name support

Tracked-On: #6685
Signed-off-by: Weiyi Feng <weiyix.feng@intel.com>
---
 .../data/generic_board/hybrid_launch_2user_vm.xml           | 2 ++
 .../data/generic_board/shared_launch_6user_vm.xml           | 6 ++++++
 .../config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml | 2 ++
 .../config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml | 6 ++++++
 .../data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml      | 1 +
 .../data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml            | 1 +
 .../data/whl-ipc-i5/sdc_launch_1user_vm_zephyr.xml          | 1 +
 .../data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml       | 1 +
 .../data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml      | 1 +
 .../data/whl-ipc-i5/shared_launch_1user_vm_waag.xml         | 1 +
 .../config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml | 2 ++
 .../config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml | 6 ++++++
 12 files changed, 30 insertions(+)

diff --git a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
index 9e98f087c..0c57c35b0 100644
--- a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
@@ -1,6 +1,7 @@
 <acrn-config board="generic_board" scenario="hybrid" user_vm_launcher="2">
   <user_vm id="1">
     <user_vm_type desc="User VM type">WINDOWS</user_vm_type>
+    <vm_name>POST_STD_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">4096</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -47,6 +48,7 @@
   </user_vm>
   <user_vm id="2">
     <user_vm_type desc="User VM type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM2</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
diff --git a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
index 3637c0d8e..0c59d0a44 100644
--- a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
@@ -1,6 +1,7 @@
 <acrn-config board="generic_board" scenario="shared" user_vm_launcher="6">
   <user_vm id="1">
     <user_vm_type desc="UOS type">WINDOWS</user_vm_type>
+    <vm_name>POST_STD_VM1</vm_name>
     <rtos_type desc="UOS Realtime capability">no</rtos_type>
     <mem_size desc="UOS memory size in MByte">4096</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -47,6 +48,7 @@
   </user_vm>
   <user_vm id="2">
     <user_vm_type desc="UOS type">PREEMPT-RT LINUX</user_vm_type>
+    <vm_name>POST_RT_VM1</vm_name>
     <rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>
     <mem_size desc="UOS memory size in MByte">1024</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -93,6 +95,7 @@
   </user_vm>
   <user_vm id="3">
     <user_vm_type desc="UOS type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM2</vm_name>
     <rtos_type desc="UOS Realtime capability">no</rtos_type>
     <mem_size desc="UOS memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -139,6 +142,7 @@
   </user_vm>
   <user_vm id="4">
     <user_vm_type desc="UOS type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM3</vm_name>
     <rtos_type desc="UOS Realtime capability">no</rtos_type>
     <mem_size desc="UOS memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -185,6 +189,7 @@
   </user_vm>
   <user_vm id="5">
     <user_vm_type desc="UOS type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM4</vm_name>
     <rtos_type desc="UOS Realtime capability">no</rtos_type>
     <mem_size desc="UOS memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -231,6 +236,7 @@
   </user_vm>
   <user_vm id="6">
     <user_vm_type desc="UOS type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM5</vm_name>
     <rtos_type desc="UOS Realtime capability">no</rtos_type>
     <mem_size desc="UOS memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
index 3e46d2461..009221d9c 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
@@ -1,6 +1,7 @@
 <acrn-config board="nuc11tnbi5" scenario="hybrid" user_vm_launcher="2">
   <user_vm id="1">
     <user_vm_type desc="User VM type">WINDOWS</user_vm_type>
+    <vm_name>POST_STD_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">4096</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -47,6 +48,7 @@
   </user_vm>
   <user_vm id="2">
     <user_vm_type desc="User VM type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM2</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
diff --git a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
index f84e4ffdf..1f48d063e 100644
--- a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
@@ -1,6 +1,7 @@
 <acrn-config board="nuc11tnbi5" scenario="shared" user_vm_launcher="6">
   <user_vm id="1">
     <user_vm_type desc="User VM type">WINDOWS</user_vm_type>
+    <vm_name>POST_STD_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">4096</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -47,6 +48,7 @@
   </user_vm>
   <user_vm id="2">
     <user_vm_type desc="User VM type">PREEMPT-RT LINUX</user_vm_type>
+    <vm_name>POST_RT_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">Hard RT</rtos_type>
     <mem_size desc="User VM memory size in MByte">1024</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -93,6 +95,7 @@
   </user_vm>
   <user_vm id="3">
     <user_vm_type desc="User VM type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM2</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -139,6 +142,7 @@
   </user_vm>
   <user_vm id="4">
     <user_vm_type desc="User VM type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM3</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -185,6 +189,7 @@
   </user_vm>
   <user_vm id="5">
     <user_vm_type desc="User VM type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM4</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -231,6 +236,7 @@
   </user_vm>
   <user_vm id="6">
     <user_vm_type desc="User VM type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM5</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
index 059ee207b..e3835460e 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
@@ -1,6 +1,7 @@
 <acrn-config board="whl-ipc-i5" scenario="hybrid_rt" user_vm_launcher="1">
   <user_vm id="1">
     <user_vm_type desc="User VM type">WINDOWS</user_vm_type>
+    <vm_name>POST_STD_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">4096</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
diff --git a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml
index 39547013f..6cec1f8b6 100644
--- a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml
@@ -1,6 +1,7 @@
 <acrn-config board="whl-ipc-i5" scenario="sdc" user_vm_launcher="1">
   <user_vm id="1">
     <user_vm_type desc="User VM type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">2048</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
diff --git a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_zephyr.xml b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_zephyr.xml
index 4dc70f6e0..fb7634794 100644
--- a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_zephyr.xml
+++ b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_zephyr.xml
@@ -1,6 +1,7 @@
 <acrn-config board="whl-ipc-i5" scenario="sdc" user_vm_launcher="1">
   <user_vm id="1">
     <user_vm_type desc="User VM type">ZEPHYR</user_vm_type>
+    <vm_name>POST_STD_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">128</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
index 5cda7ba3f..27c5397a9 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
@@ -1,6 +1,7 @@
 <acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="1">
   <user_vm id="2">
     <user_vm_type desc="User VM type">PREEMPT-RT LINUX</user_vm_type>
+    <vm_name>POST_STD_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">Hard RT</rtos_type>
     <mem_size desc="User VM memory size in MByte">1024</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
index 29cbb480e..01c8214ef 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
@@ -1,6 +1,7 @@
 <acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="1">
   <user_vm id="1">
     <user_vm_type desc="User VM type">VXWORKS</user_vm_type>
+    <vm_name>POST_STD_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">Hard RT</rtos_type>
     <mem_size desc="User VM memory size in MByte">2048</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
index 690810303..34aa4ffad 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
@@ -1,6 +1,7 @@
 <acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="1">
   <user_vm id="1">
     <user_vm_type desc="User VM type">WINDOWS</user_vm_type>
+    <vm_name>POST_STD_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">4096</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
index 30864c0bc..97e2b29b5 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
@@ -1,6 +1,7 @@
 <acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="2">
   <user_vm id="1">
     <user_vm_type desc="User VM type">WINDOWS</user_vm_type>
+    <vm_name>POST_STD_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">4096</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -47,6 +48,7 @@
   </user_vm>
   <user_vm id="2">
     <user_vm_type desc="User VM type">PREEMPT-RT LINUX</user_vm_type>
+    <vm_name>POST_RT_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">Hard RT</rtos_type>
     <mem_size desc="User VM memory size in MByte">1024</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
index ea376ff11..f107d611b 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
@@ -1,6 +1,7 @@
 <acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="6">
   <user_vm id="1">
     <user_vm_type desc="User VM type">WINDOWS</user_vm_type>
+    <vm_name>POST_STD_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">4096</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -47,6 +48,7 @@
   </user_vm>
   <user_vm id="2">
     <user_vm_type desc="User VM type">PREEMPT-RT LINUX</user_vm_type>
+    <vm_name>POST_RT_VM1</vm_name>
     <rtos_type desc="User VM Realtime capability">Hard RT</rtos_type>
     <mem_size desc="User VM memory size in MByte">1024</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -93,6 +95,7 @@
   </user_vm>
   <user_vm id="3">
     <user_vm_type desc="User VM type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM2</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -139,6 +142,7 @@
   </user_vm>
   <user_vm id="4">
     <user_vm_type desc="User VM type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM3</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -185,6 +189,7 @@
   </user_vm>
   <user_vm id="5">
     <user_vm_type desc="User VM type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM4</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
@@ -231,6 +236,7 @@
   </user_vm>
   <user_vm id="6">
     <user_vm_type desc="User VM type">YOCTO</user_vm_type>
+    <vm_name>POST_STD_VM5</vm_name>
     <rtos_type desc="User VM Realtime capability">no</rtos_type>
     <mem_size desc="User VM memory size in MByte">512</mem_size>
     <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>