From 9f8231e7ba4912fe517441e8044935e28c7e16c1 Mon Sep 17 00:00:00 2001 From: hangliu1 Date: Thu, 17 Feb 2022 03:35:23 -0500 Subject: [PATCH] config tool: xml change for vm_type and load_order change vm_type and add load_order in all scenario xml Tracked-On: #6690 Signed-off-by: hangliu1 --- misc/config_tools/data/cfl-k700-i7/hybrid.xml | 12 +++++++---- .../data/cfl-k700-i7/hybrid_rt.xml | 12 +++++++---- .../data/cfl-k700-i7/partitioned.xml | 6 ++++-- misc/config_tools/data/cfl-k700-i7/shared.xml | 21 ++++++++++++------- .../data/generic_board/hybrid.xml | 12 +++++++---- .../data/generic_board/hybrid_rt.xml | 12 +++++++---- .../data/generic_board/partitioned.xml | 6 ++++-- .../data/generic_board/shared.xml | 21 ++++++++++++------- misc/config_tools/data/nuc11tnbi5/hybrid.xml | 12 +++++++---- .../data/nuc11tnbi5/partitioned.xml | 6 ++++-- misc/config_tools/data/nuc11tnbi5/shared.xml | 21 ++++++++++++------- misc/config_tools/data/qemu/shared.xml | 6 ++++-- .../data/tgl-vecow-spc-7100-Corei7/hybrid.xml | 12 +++++++---- .../tgl-vecow-spc-7100-Corei7/partitioned.xml | 6 ++++-- .../data/tgl-vecow-spc-7100-Corei7/shared.xml | 9 +++++--- misc/config_tools/data/whl-ipc-i5/hybrid.xml | 9 +++++--- .../data/whl-ipc-i5/hybrid_rt.xml | 12 +++++++---- .../data/whl-ipc-i5/partitioned.xml | 6 ++++-- misc/config_tools/data/whl-ipc-i5/sdc.xml | 6 ++++-- misc/config_tools/data/whl-ipc-i5/shared.xml | 21 ++++++++++++------- 20 files changed, 152 insertions(+), 76 deletions(-) diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid.xml b/misc/config_tools/data/cfl-k700-i7/hybrid.xml index 2c30854da..1e720552d 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid.xml @@ -54,7 +54,8 @@ - SAFETY_VM + STANDARD_VM + PRE_LAUNCHED_VM SAFETY_VM0 0 @@ -112,7 +113,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -164,7 +166,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 @@ -202,7 +205,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM2 0 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 aef54ffde..aae96da8d 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -60,7 +60,8 @@ - PRE_RT_VM + RTVM + PRE_LAUNCHED_VM PRE_RT_VM0 GUEST_FLAG_LAPIC_PASSTHROUGH @@ -123,7 +124,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -179,7 +181,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 @@ -221,7 +224,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM2 0 diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml index 99039b085..83e419474 100644 --- a/misc/config_tools/data/cfl-k700-i7/partitioned.xml +++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml @@ -54,7 +54,8 @@ - PRE_STD_VM + STANDARD_VM + PRE_LAUNCHED_VM PRE_STD_VM0 0 @@ -115,7 +116,8 @@ - PRE_STD_VM + STANDARD_VM + PRE_LAUNCHED_VM PRE_STD_VM1 0 diff --git a/misc/config_tools/data/cfl-k700-i7/shared.xml b/misc/config_tools/data/cfl-k700-i7/shared.xml index cd6f5e3e7..560b7f389 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared.xml @@ -47,7 +47,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -92,7 +93,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 @@ -131,7 +133,8 @@ - POST_RT_VM + RTVM + POST_LAUNCHED_VM POST_RT_VM1 0 @@ -171,7 +174,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM2 0 @@ -211,7 +215,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM3 0 @@ -251,7 +256,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM4 0 @@ -291,7 +297,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM5 0 diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml index ee33610f4..5c9c1054b 100644 --- a/misc/config_tools/data/generic_board/hybrid.xml +++ b/misc/config_tools/data/generic_board/hybrid.xml @@ -54,7 +54,8 @@ - SAFETY_VM + STANDARD_VM + PRE_LAUNCHED_VM SAFETY_VM0 0 @@ -112,7 +113,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -163,7 +165,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 @@ -201,7 +204,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM2 0 diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml index 422f5e6c3..5ae925de5 100644 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ b/misc/config_tools/data/generic_board/hybrid_rt.xml @@ -73,7 +73,8 @@ - PRE_RT_VM + RTVM + PRE_LAUNCHED_VM PRE_RT_VM0 GUEST_FLAG_LAPIC_PASSTHROUGH @@ -133,7 +134,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -182,7 +184,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 @@ -222,7 +225,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM2 0 diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml index 2b4b279bc..6ea32dc86 100644 --- a/misc/config_tools/data/generic_board/partitioned.xml +++ b/misc/config_tools/data/generic_board/partitioned.xml @@ -54,7 +54,8 @@ - PRE_STD_VM + STANDARD_VM + PRE_LAUNCHED_VM PRE_STD_VM0 0 @@ -115,7 +116,8 @@ - PRE_STD_VM + STANDARD_VM + PRE_LAUNCHED_VM PRE_STD_VM1 0 diff --git a/misc/config_tools/data/generic_board/shared.xml b/misc/config_tools/data/generic_board/shared.xml index 962ae2fd6..c10b229f8 100644 --- a/misc/config_tools/data/generic_board/shared.xml +++ b/misc/config_tools/data/generic_board/shared.xml @@ -54,7 +54,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -99,7 +100,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 @@ -139,7 +141,8 @@ n - POST_RT_VM + RTVM + POST_LAUNCHED_VM POST_RT_VM1 GUEST_FLAG_LAPIC_PASSTHROUGH @@ -180,7 +183,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM2 0 @@ -220,7 +224,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM3 0 @@ -260,7 +265,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM4 0 @@ -300,7 +306,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM5 0 diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml index dce873ae5..24e3fc410 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml @@ -54,7 +54,8 @@ - SAFETY_VM + STANDARD_VM + PRE_LAUNCHED_VM SAFETY_VM0 0 @@ -112,7 +113,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -163,7 +165,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 @@ -201,7 +204,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM2 0 diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml index ac9ddb6d4..69890ee1f 100644 --- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml +++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml @@ -54,7 +54,8 @@ - PRE_STD_VM + STANDARD_VM + PRE_LAUNCHED_VM PRE_STD_VM0 0 @@ -115,7 +116,8 @@ - PRE_STD_VM + STANDARD_VM + PRE_LAUNCHED_VM PRE_STD_VM1 0 diff --git a/misc/config_tools/data/nuc11tnbi5/shared.xml b/misc/config_tools/data/nuc11tnbi5/shared.xml index 457cded76..2a82da3e6 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared.xml @@ -54,7 +54,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -99,7 +100,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 @@ -139,7 +141,8 @@ n - POST_RT_VM + RTVM + POST_LAUNCHED_VM POST_RT_VM1 GUEST_FLAG_LAPIC_PASSTHROUGH @@ -180,7 +183,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM2 0 @@ -220,7 +224,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM3 0 @@ -260,7 +265,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM4 0 @@ -300,7 +306,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM5 0 diff --git a/misc/config_tools/data/qemu/shared.xml b/misc/config_tools/data/qemu/shared.xml index 64cec7009..832c47880 100644 --- a/misc/config_tools/data/qemu/shared.xml +++ b/misc/config_tools/data/qemu/shared.xml @@ -47,7 +47,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -91,7 +92,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 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 e209d2d44..99f0c693c 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 @@ -54,7 +54,8 @@ - SAFETY_VM + STANDARD_VM + PRE_LAUNCHED_VM SAFETY_VM0 0 @@ -112,7 +113,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -164,7 +166,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 @@ -202,7 +205,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM2 0 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 b4e680393..4ebf47755 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 @@ -54,7 +54,8 @@ - PRE_STD_VM + STANDARD_VM + PRE_LAUNCHED_VM PRE_STD_VM0 0 @@ -115,7 +116,8 @@ - PRE_STD_VM + STANDARD_VM + PRE_LAUNCHED_VM PRE_STD_VM1 0 diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml index b55f0b148..7b412eff5 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml @@ -54,7 +54,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -107,7 +108,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 @@ -155,7 +157,8 @@ PRIO_LOW - POST_RT_VM + RTVM + POST_LAUNCHED_VM POST_RT_VM1 GUEST_FLAG_LAPIC_PASSTHROUGH diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml index f7213342e..a072d39d6 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -46,7 +46,8 @@ - SAFETY_VM + STANDARD_VM + PRE_LAUNCHED_VM SAFETY_VM0 0 @@ -102,7 +103,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -153,7 +155,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml index 31fdbebd4..fb24c36d3 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml @@ -59,7 +59,8 @@ - PRE_RT_VM + RTVM + PRE_LAUNCHED_VM PRE_RT_VM0 GUEST_FLAG_LAPIC_PASSTHROUGH @@ -122,7 +123,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -171,7 +173,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 @@ -211,7 +214,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM2 0 diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml index ace31c468..59e12a3f5 100644 --- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml +++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml @@ -46,7 +46,8 @@ - PRE_STD_VM + STANDARD_VM + PRE_LAUNCHED_VM PRE_STD_VM0 0 @@ -108,7 +109,8 @@ - PRE_STD_VM + STANDARD_VM + PRE_LAUNCHED_VM PRE_STD_VM1 0 diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml index f36f90c11..6b8a5c4f7 100644 --- a/misc/config_tools/data/whl-ipc-i5/sdc.xml +++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml @@ -46,7 +46,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -90,7 +91,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 diff --git a/misc/config_tools/data/whl-ipc-i5/shared.xml b/misc/config_tools/data/whl-ipc-i5/shared.xml index cd5c57cb0..6515575b8 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared.xml @@ -46,7 +46,8 @@ - SERVICE_VM + STANDARD_VM + SERVICE_VM ACRN_Service_VM 0 @@ -91,7 +92,8 @@ - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM1 0 @@ -130,7 +132,8 @@ - POST_RT_VM + RTVM + POST_LAUNCHED_VM POST_RT_VM1 0 @@ -170,7 +173,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM2 0 @@ -210,7 +214,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM3 0 @@ -250,7 +255,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM4 0 @@ -290,7 +296,8 @@ n - POST_STD_VM + STANDARD_VM + POST_LAUNCHED_VM POST_STD_VM5 0