From 6182b192c61c6bc5b977294fc0f86fdc73eec58d Mon Sep 17 00:00:00 2001 From: Ziheng Li Date: Wed, 25 May 2022 19:03:45 +0800 Subject: [PATCH] misc: remove clos element for vCAT refine Updated the scenario xml file in misc/config-tools/data folder, and deleted the clos node in xml file. Tracked-On: #6690 Signed-off-by: Ziheng Li --- .../cfl-k700-i7/hybrid_launch_2user_vm.xml | 16 +--------- .../data/cfl-k700-i7/hybrid_rt.xml | 23 +-------------- .../data/cfl-k700-i7/partitioned.xml | 10 +------ .../cfl-k700-i7/shared_launch_6user_vm.xml | 29 +------------------ .../generic_board/hybrid_launch_2user_vm.xml | 16 +--------- .../data/generic_board/hybrid_rt.xml | 17 +---------- .../data/generic_board/partitioned.xml | 10 +------ .../generic_board/shared_launch_6user_vm.xml | 29 +------------------ .../nuc11tnbi5/hybrid_launch_2user_vm.xml | 16 +--------- .../data/nuc11tnbi5/partitioned.xml | 10 +------ .../nuc11tnbi5/shared_launch_6user_vm.xml | 29 +------------------ misc/config_tools/data/qemu/shared.xml | 8 +---- .../data/tgl-vecow-spc-7100-Corei7/hybrid.xml | 16 +--------- .../tgl-vecow-spc-7100-Corei7/partitioned.xml | 10 +------ .../shared_launch_2user_vm.xml | 13 +-------- misc/config_tools/data/whl-ipc-i5/hybrid.xml | 16 +--------- .../hybrid_rt_launch_1user_vm_waag.xml | 17 +---------- .../data/whl-ipc-i5/partitioned.xml | 10 +------ .../shared_launch_1user_vm_hardrt.xml | 29 +------------------ .../shared_launch_1user_vm_vxworks.xml | 29 +------------------ .../shared_launch_1user_vm_waag.xml | 29 +------------------ .../whl-ipc-i5/shared_launch_2user_vm.xml | 29 +------------------ .../whl-ipc-i5/shared_launch_6user_vm.xml | 29 +------------------ 23 files changed, 23 insertions(+), 417 deletions(-) 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 5d34c18ca..dd3486e18 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 b0ecf7891..b74917f59 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 c1b807b16..db626afd2 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 eeab9928f..a48c976ba 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 af099642c..c793b1edc 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 5f12af882..b8a869eb2 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 e2f7b9397..1d155eac3 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 e722f3304..206dd0d75 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 af099642c..c793b1edc 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 1602ac1f2..c94b8ac3c 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 a54d1f8a0..50240a3a2 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 10f0cfdf1..18e617ac0 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 264750d52..9097106d0 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 ae2ffbdcf..53908fc69 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 88a27d63b..27bc5d524 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 e5fe0765f..cd83afb34 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 98089a6aa..8a7896ce8 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 613078872..5241e2a43 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 4a4ec6470..4ea1d1781 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 62bf129cf..7b1e9ee13 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 b2ac0bfe2..62843d8da 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 cdbcaf38c..fbfe17478 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 f0b37b853..b330427fb 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