diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
index 42bcf3360..74b2d18c4 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
@@ -65,9 +65,6 @@
3
-
- 0
-
0
0
@@ -94,11 +91,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
- 0
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -118,9 +110,6 @@
2
-
- 0
-
4096
@@ -151,9 +140,6 @@
2
-
- 0
-
512
@@ -175,4 +161,4 @@
./YaaG.img
-
+
\ No newline at end of file
diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
index 79603e9b0..237096d68 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
@@ -87,10 +87,6 @@
y
-
- 0
- 0
-
0
0
@@ -122,14 +118,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
- 0
- 0
- 0
- 0
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -153,11 +141,6 @@
3
-
- 0
- 0
- 0
-
4096
@@ -191,10 +174,6 @@
5
-
- 0
- 0
-
512
@@ -216,4 +195,4 @@
./YaaG.img
-
+
\ No newline at end of file
diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
index 4ad0ad183..8d3267aea 100644
--- a/misc/config_tools/data/cfl-k700-i7/partitioned.xml
+++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
@@ -68,10 +68,6 @@
2
-
- 0
- 0
-
0
0
@@ -110,10 +106,6 @@
3
-
- 0
- 0
-
0
0
@@ -140,4 +132,4 @@
00:14.0 USB controller: Intel Corporation Cannon Lake PCH USB 3.1 xHCI Host Controller (rev 10)
-
+
\ No newline at end of file
diff --git a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
index 9ff217f93..06e7d289b 100644
--- a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
@@ -59,9 +59,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -83,10 +80,6 @@
1
-
- 0
- 0
-
4096
@@ -123,10 +116,6 @@
y
-
- 0
- 0
-
1024
@@ -160,10 +149,6 @@
1
-
- 0
- 0
-
512
@@ -197,10 +182,6 @@
1
-
- 0
- 0
-
512
@@ -234,10 +215,6 @@
1
-
- 0
- 0
-
512
@@ -271,10 +248,6 @@
1
-
- 0
- 0
-
512
@@ -296,4 +269,4 @@
./YaaG.img
-
+
\ No newline at end of file
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 5e3c036f5..5cf91dc2f 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
@@ -65,9 +65,6 @@
3
-
- 0
-
0
0
@@ -95,11 +92,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
- 0
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -118,9 +110,6 @@
2
-
- 0
-
4096
@@ -151,9 +140,6 @@
2
-
- 0
-
512
@@ -175,4 +161,4 @@
./YaaG.img
-
+
\ No newline at end of file
diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml
index 7671e04cc..92b3894a3 100644
--- a/misc/config_tools/data/generic_board/hybrid_rt.xml
+++ b/misc/config_tools/data/generic_board/hybrid_rt.xml
@@ -84,10 +84,6 @@
y
-
- 0
- 0
-
0
0
@@ -116,10 +112,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -141,10 +133,6 @@
1
-
- 0
- 0
-
4096
@@ -175,9 +163,6 @@
1
-
- 0
-
512
@@ -199,4 +184,4 @@
./YaaG.img
-
+
\ No newline at end of file
diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml
index f9ba3c04c..1763d67d5 100644
--- a/misc/config_tools/data/generic_board/partitioned.xml
+++ b/misc/config_tools/data/generic_board/partitioned.xml
@@ -68,10 +68,6 @@
2
-
- 0
- 0
-
0
0
@@ -110,10 +106,6 @@
3
-
- 0
- 0
-
0
0
@@ -140,4 +132,4 @@
00:14.0 USB controller: Intel Corporation Tiger Lake-LP USB 3.2 Gen 2x1 xHCI Host Controller (rev 20)
-
+
\ No newline at end of file
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 db94c8475..cd801e7c1 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
@@ -59,9 +59,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -83,10 +80,6 @@
1
-
- 0
- 0
-
4096
@@ -123,10 +116,6 @@
y
-
- 0
- 0
-
1024
@@ -160,10 +149,6 @@
1
-
- 0
- 0
-
512
@@ -197,10 +182,6 @@
1
-
- 0
- 0
-
512
@@ -234,10 +215,6 @@
1
-
- 0
- 0
-
512
@@ -271,10 +248,6 @@
1
-
- 0
- 0
-
512
@@ -296,4 +269,4 @@
./YaaG.img
-
+
\ No newline at end of file
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 5e3c036f5..5cf91dc2f 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
@@ -65,9 +65,6 @@
3
-
- 0
-
0
0
@@ -95,11 +92,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
- 0
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -118,9 +110,6 @@
2
-
- 0
-
4096
@@ -151,9 +140,6 @@
2
-
- 0
-
512
@@ -175,4 +161,4 @@
./YaaG.img
-
+
\ No newline at end of file
diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
index 365899874..316a52fd3 100644
--- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml
+++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
@@ -68,10 +68,6 @@
2
-
- 0
- 0
-
0
0
@@ -110,10 +106,6 @@
3
-
- 0
- 0
-
0
0
@@ -140,4 +132,4 @@
00:14.0 USB controller: Intel Corporation Tiger Lake-LP USB 3.2 Gen 2x1 xHCI Host Controller (rev 20)
-
+
\ No newline at end of file
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 b44bca4fc..99357438f 100644
--- a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
@@ -59,9 +59,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -83,10 +80,6 @@
1
-
- 0
- 0
-
4096
@@ -123,10 +116,6 @@
y
-
- 0
- 0
-
1024
@@ -160,10 +149,6 @@
1
-
- 0
- 0
-
512
@@ -197,10 +182,6 @@
1
-
- 0
- 0
-
512
@@ -234,10 +215,6 @@
1
-
- 0
- 0
-
512
@@ -271,10 +248,6 @@
1
-
- 0
- 0
-
512
@@ -296,4 +269,4 @@
./YaaG.img
-
+
\ No newline at end of file
diff --git a/misc/config_tools/data/qemu/shared.xml b/misc/config_tools/data/qemu/shared.xml
index df026e23c..a82907c00 100644
--- a/misc/config_tools/data/qemu/shared.xml
+++ b/misc/config_tools/data/qemu/shared.xml
@@ -60,9 +60,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -81,9 +78,6 @@
1
-
- 0
-
None
-
+
\ No newline at end of file
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
index e7a9891ae..8abf9f39e 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
@@ -65,9 +65,6 @@
3
-
- 0
-
0
0
@@ -95,11 +92,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
- 0
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -119,9 +111,6 @@
2
-
- 0
-
4096
@@ -155,9 +144,6 @@
2
-
- 0
-
512
@@ -179,4 +165,4 @@
./YaaG.img
-
+
\ No newline at end of file
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
index ba442e3af..276d6e6d1 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
@@ -68,10 +68,6 @@
2
-
- 0
- 0
-
0
0
@@ -110,10 +106,6 @@
3
-
- 0
- 0
-
0
0
@@ -139,4 +131,4 @@
00:14.0 USB controller: Intel Corporation Tiger Lake-LP USB 3.2 Gen 2x1 xHCI Host Controller (rev 20)
-
+
\ No newline at end of file
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
index 6d1d17c3b..6c4179987 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
@@ -71,9 +71,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -96,10 +93,6 @@
1
-
- 0
- 0
-
4096
@@ -140,10 +133,6 @@
y
-
- 0
- 0
-
1024
@@ -166,4 +155,4 @@
./core-image-weston-intel-corei7-64.wic
-
+
\ No newline at end of file
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index 359b67120..c6c6065e7 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -65,9 +65,6 @@
3
-
- 0
-
0
0
@@ -93,11 +90,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
- 0
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -116,9 +108,6 @@
2
-
- 0
-
4096
@@ -149,9 +138,6 @@
2
-
- 0
-
512
@@ -173,4 +159,4 @@
./YaaG.img
-
+
\ No newline at end of file
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 ff4af6bdb..8ce835471 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
@@ -87,10 +87,6 @@
y
-
- 0
- 0
-
0
0
@@ -122,10 +118,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -147,10 +139,6 @@
1
-
- 0
- 0
-
4096
@@ -182,9 +170,6 @@
1
-
- 0
-
512
@@ -206,4 +191,4 @@
./YaaG.img
-
+
\ No newline at end of file
diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
index 20aaead6c..d8d847876 100644
--- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml
+++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
@@ -68,10 +68,6 @@
2
-
- 0
- 0
-
0
0
@@ -112,10 +108,6 @@
3
-
- 0
- 0
-
0
0
@@ -144,4 +136,4 @@
03:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)
-
+
\ No newline at end of file
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 59b29bb1b..06369be68 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
@@ -59,9 +59,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -83,10 +80,6 @@
1
-
- 0
- 0
-
COM Port 1
@@ -104,10 +97,6 @@
y
-
- 0
- 0
-
1024
@@ -141,10 +130,6 @@
1
-
- 0
- 0
-
COM Port 1
n
@@ -160,10 +145,6 @@
1
-
- 0
- 0
-
COM Port 1
n
@@ -179,10 +160,6 @@
1
-
- 0
- 0
-
COM Port 1
n
@@ -198,11 +175,7 @@
1
-
- 0
- 0
-
COM Port 1
n
-
+
\ No newline at end of file
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 ac3a4e3ee..cec4d65f3 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
@@ -59,9 +59,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -86,10 +83,6 @@
y
-
- 0
- 0
-
2048
@@ -123,10 +116,6 @@
y
-
- 0
- 0
-
COM Port 1
n
@@ -142,10 +131,6 @@
1
-
- 0
- 0
-
COM Port 1
n
@@ -161,10 +146,6 @@
1
-
- 0
- 0
-
COM Port 1
n
@@ -180,10 +161,6 @@
1
-
- 0
- 0
-
COM Port 1
n
@@ -199,11 +176,7 @@
1
-
- 0
- 0
-
COM Port 1
n
-
+
\ No newline at end of file
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 7d6e105ce..66321a8c7 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
@@ -59,9 +59,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -83,10 +80,6 @@
1
-
- 0
- 0
-
4096
@@ -123,10 +116,6 @@
y
-
- 0
- 0
-
COM Port 1
n
@@ -142,10 +131,6 @@
1
-
- 0
- 0
-
COM Port 1
n
@@ -161,10 +146,6 @@
1
-
- 0
- 0
-
COM Port 1
n
@@ -180,10 +161,6 @@
1
-
- 0
- 0
-
COM Port 1
n
@@ -199,11 +176,7 @@
1
-
- 0
- 0
-
COM Port 1
n
-
+
\ No newline at end of file
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 61a57cb4c..a6ddcca9d 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
@@ -59,9 +59,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -83,10 +80,6 @@
1
-
- 0
- 0
-
4096
@@ -124,10 +117,6 @@
y
-
- 0
- 0
-
1024
@@ -161,10 +150,6 @@
1
-
- 0
- 0
-
COM Port 1
n
@@ -180,10 +165,6 @@
1
-
- 0
- 0
-
COM Port 1
n
@@ -199,10 +180,6 @@
1
-
- 0
- 0
-
COM Port 1
n
@@ -218,11 +195,7 @@
1
-
- 0
- 0
-
COM Port 1
n
-
+
\ No newline at end of file
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 7728fadd5..e2bc7421a 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
@@ -59,9 +59,6 @@
SERVICE_VM
ACRN_Service_VM
-
- 0
-
KERNEL_BZIMAGE
Linux_bzImage
@@ -83,10 +80,6 @@
1
-
- 0
- 0
-
4096
@@ -124,10 +117,6 @@
y
-
- 0
- 0
-
1024
@@ -161,10 +150,6 @@
1
-
- 0
- 0
-
512
@@ -198,10 +183,6 @@
1
-
- 0
- 0
-
512
@@ -235,10 +216,6 @@
1
-
- 0
- 0
-
512
@@ -272,10 +249,6 @@
1
-
- 0
- 0
-
512
@@ -297,4 +270,4 @@
./YaaG.img
-
+
\ No newline at end of file