From eb341caa8380fec356f6a119498fd5315715815b Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Thu, 16 Apr 2020 11:52:04 +0800 Subject: [PATCH] acrn-config: Use vm_type to instead load_type/uuid/severity in config Use vm_type to instead combination of load_type/uuid/severity in config xmls. Tracked-On: #4641 Signed-off-by: Wei Liu Acked-by: Victor Sun Acked-by: Terry Zou --- .../xmls/config-xmls/apl-mrb/hybrid.xml | 12 +++--------- .../xmls/config-xmls/apl-mrb/industry.xml | 12 +++--------- .../config-xmls/apl-mrb/logical_partition.xml | 6 ++---- .../acrn-config/xmls/config-xmls/apl-mrb/sdc.xml | 12 +++--------- .../xmls/config-xmls/apl-mrb/sdc2.xml | 16 ++++------------ .../apl-up2-n3350/logical_partition.xml | 6 ++---- .../xmls/config-xmls/apl-up2/hybrid.xml | 12 +++--------- .../xmls/config-xmls/apl-up2/industry.xml | 12 +++--------- .../config-xmls/apl-up2/logical_partition.xml | 6 ++---- .../acrn-config/xmls/config-xmls/apl-up2/sdc.xml | 12 +++--------- .../xmls/config-xmls/apl-up2/sdc2.xml | 16 ++++------------ .../xmls/config-xmls/generic/hybrid.xml | 12 +++--------- .../xmls/config-xmls/generic/industry.xml | 12 +++--------- .../config-xmls/generic/logical_partition.xml | 4 ++-- .../acrn-config/xmls/config-xmls/generic/sdc.xml | 12 +++--------- .../xmls/config-xmls/generic/sdc2.xml | 16 ++++------------ .../xmls/config-xmls/nuc6cayh/hybrid.xml | 12 +++--------- .../xmls/config-xmls/nuc6cayh/industry.xml | 12 +++--------- .../config-xmls/nuc6cayh/logical_partition.xml | 6 ++---- .../xmls/config-xmls/nuc6cayh/sdc.xml | 12 +++--------- .../xmls/config-xmls/nuc6cayh/sdc2.xml | 16 ++++------------ .../xmls/config-xmls/nuc7i7dnb/hybrid.xml | 12 +++--------- .../xmls/config-xmls/nuc7i7dnb/industry.xml | 12 +++--------- .../config-xmls/nuc7i7dnb/logical_partition.xml | 6 ++---- .../xmls/config-xmls/nuc7i7dnb/sdc.xml | 12 +++--------- .../xmls/config-xmls/nuc7i7dnb/sdc2.xml | 16 ++++------------ .../xmls/config-xmls/tgl-rvp/industry.xml | 12 +++--------- .../xmls/config-xmls/whl-ipc-i5/hybrid.xml | 12 +++--------- .../xmls/config-xmls/whl-ipc-i5/industry.xml | 12 +++--------- .../config-xmls/whl-ipc-i5/logical_partition.xml | 6 ++---- .../xmls/config-xmls/whl-ipc-i5/sdc.xml | 12 +++--------- .../xmls/config-xmls/whl-ipc-i5/sdc2.xml | 16 ++++------------ .../xmls/config-xmls/whl-ipc-i7/hybrid.xml | 12 +++--------- .../xmls/config-xmls/whl-ipc-i7/industry.xml | 12 +++--------- .../config-xmls/whl-ipc-i7/logical_partition.xml | 6 ++---- .../xmls/config-xmls/whl-ipc-i7/sdc.xml | 12 +++--------- .../xmls/config-xmls/whl-ipc-i7/sdc2.xml | 16 ++++------------ 37 files changed, 110 insertions(+), 312 deletions(-) diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml index a7657e4af..fdaba809f 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + SAFETY_VM ACRN PRE-LAUNCHED VM0 - fc836901-8685-4bc0-8b71-6e31dc36fa47 0 @@ -62,7 +61,6 @@ 0 - SEVERITY_SAFETY_VM 0 0 @@ -99,16 +97,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -146,8 +142,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -157,7 +152,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml index 3e762cffc..e523155b5 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 0x20000000 @@ -97,8 +95,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -108,7 +105,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -127,8 +123,7 @@ - POST_LAUNCHED_VM - 495ae2e5-2603-4d64-af76-d4bc5a8ec0e5 + POST_RT_VM 0 @@ -139,7 +134,6 @@ 0 - SEVERITY_RTVM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml index a08ad2288..07dabfb48 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM0 - 26c5e0d8-8f8a-47d8-8109-f201ebd61a5e @@ -101,9 +100,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM1 - dd87ce08-66f9-473d-bc58-7605837f935e GUEST_FLAG_RT GUEST_FLAG_LAPIC_PASSTHROUGH diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml index 3486d91da..3ed008586 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -97,8 +95,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -109,7 +106,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -128,12 +124,10 @@ - POST_LAUNCHED_VM - a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f + KATA_VM 0 - SEVERITY_STANDARD_VM 3 diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml index a449181bb..da7861b15 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -97,8 +95,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -108,7 +105,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -127,8 +123,7 @@ - POST_LAUNCHED_VM - 615db82a-e189-4b4f-8dbb-d321343e4ab3 + POST_STD_VM 0 @@ -138,7 +133,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -157,8 +151,7 @@ - POST_LAUNCHED_VM - 38158821-5208-4005-b72a-8a609e4190d0 + POST_STD_VM 0 @@ -168,7 +161,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml index eceea1597..3d29dfb6b 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM0 - 26c5e0d8-8f8a-47d8-8109-f201ebd61a5e @@ -101,9 +100,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM1 - dd87ce08-66f9-473d-bc58-7605837f935e GUEST_FLAG_RT GUEST_FLAG_LAPIC_PASSTHROUGH diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml index f72cbb9dc..4c5dc7d0a 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + SAFETY_VM ACRN PRE-LAUNCHED VM0 - fc836901-8685-4bc0-8b71-6e31dc36fa47 0 @@ -62,7 +61,6 @@ 0 - SEVERITY_SAFETY_VM 0 0 @@ -99,16 +97,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -146,8 +142,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -157,7 +152,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml index 29fba3fcf..664dffadf 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 3 - SEVERITY_SOS 0 0x20000000 @@ -97,8 +95,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -108,7 +105,6 @@ 3 - SEVERITY_STANDARD_VM 0 0 @@ -127,8 +123,7 @@ - POST_LAUNCHED_VM - 495ae2e5-2603-4d64-af76-d4bc5a8ec0e5 + POST_RT_VM 0 @@ -140,7 +135,6 @@ 1 0 - SEVERITY_RTVM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml index 82bd6ad15..b096e68ee 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM0 - 26c5e0d8-8f8a-47d8-8109-f201ebd61a5e @@ -102,9 +101,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM1 - dd87ce08-66f9-473d-bc58-7605837f935e GUEST_FLAG_RT GUEST_FLAG_LAPIC_PASSTHROUGH diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml index 1b6e47579..339e6199a 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -97,8 +95,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -109,7 +106,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -128,12 +124,10 @@ - POST_LAUNCHED_VM - a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f + KATA_VM 0 - SEVERITY_STANDARD_VM 3 diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc2.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc2.xml index b2bec38fe..9ee60d44c 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc2.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc2.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -97,8 +95,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -108,7 +105,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -127,8 +123,7 @@ - POST_LAUNCHED_VM - 615db82a-e189-4b4f-8dbb-d321343e4ab3 + POST_STD_VM 0 @@ -138,7 +133,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -157,8 +151,7 @@ - POST_LAUNCHED_VM - 38158821-5208-4005-b72a-8a609e4190d0 + POST_STD_VM 0 @@ -168,7 +161,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml b/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml index a9dbf1e39..6026d93f0 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + SAFETY_VM ACRN PRE-LAUNCHED VM0 - fc836901-8685-4bc0-8b71-6e31dc36fa47 0 @@ -62,7 +61,6 @@ 0 - SEVERITY_SAFETY_VM 0 0 @@ -99,16 +97,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -144,8 +140,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -155,7 +150,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/generic/industry.xml b/misc/acrn-config/xmls/config-xmls/generic/industry.xml index 8aeeb0fab..1a0a4df0a 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/industry.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 0x20000000 @@ -95,8 +93,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -106,7 +103,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -125,8 +121,7 @@ - POST_LAUNCHED_VM - 495ae2e5-2603-4d64-af76-d4bc5a8ec0e5 + POST_RT_VM 0 @@ -137,7 +132,6 @@ 0 - SEVERITY_RTVM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml index 92f598ac9..ea29bfbfb 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml @@ -50,7 +50,7 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM0 26c5e0d8-8f8a-47d8-8109-f201ebd61a5e @@ -100,7 +100,7 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM1 dd87ce08-66f9-473d-bc58-7605837f935e diff --git a/misc/acrn-config/xmls/config-xmls/generic/sdc.xml b/misc/acrn-config/xmls/config-xmls/generic/sdc.xml index 8c4b4b76f..4fffe9fee 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/sdc.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -95,8 +93,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -106,7 +103,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -125,12 +121,10 @@ - POST_LAUNCHED_VM - a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f + KATA_VM 0 - SEVERITY_STANDARD_VM 1 diff --git a/misc/acrn-config/xmls/config-xmls/generic/sdc2.xml b/misc/acrn-config/xmls/config-xmls/generic/sdc2.xml index 36a681484..4b025a6df 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/sdc2.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/sdc2.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -95,8 +93,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -106,7 +103,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -125,8 +121,7 @@ - POST_LAUNCHED_VM - 615db82a-e189-4b4f-8dbb-d321343e4ab3 + POST_STD_VM 0 @@ -136,7 +131,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -155,8 +149,7 @@ - POST_LAUNCHED_VM - 38158821-5208-4005-b72a-8a609e4190d0 + POST_STD_VM 0 @@ -166,7 +159,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml index 99c36954f..877c77a0d 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + SAFETY_VM ACRN PRE-LAUNCHED VM0 - fc836901-8685-4bc0-8b71-6e31dc36fa47 0 @@ -62,7 +61,6 @@ 0 - SEVERITY_SAFETY_VM 0 0 @@ -99,16 +97,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -145,8 +141,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -156,7 +151,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml index 64006233f..7f3004912 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 0x20000000 @@ -97,8 +95,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -108,7 +105,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -127,8 +123,7 @@ - POST_LAUNCHED_VM - 495ae2e5-2603-4d64-af76-d4bc5a8ec0e5 + POST_RT_VM 0 @@ -139,7 +134,6 @@ 0 - SEVERITY_RTVM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml index a11af9178..68121b33e 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM0 - 26c5e0d8-8f8a-47d8-8109-f201ebd61a5e @@ -102,9 +101,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM1 - dd87ce08-66f9-473d-bc58-7605837f935e GUEST_FLAG_RT GUEST_FLAG_LAPIC_PASSTHROUGH diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml index d3ee68a53..16a482887 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -97,8 +95,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -109,7 +106,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -128,12 +124,10 @@ - POST_LAUNCHED_VM - a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f + KATA_VM 0 - SEVERITY_STANDARD_VM 3 diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc2.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc2.xml index 5c57966b2..d3c503dc3 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc2.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc2.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -97,8 +95,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -108,7 +105,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -127,8 +123,7 @@ - POST_LAUNCHED_VM - 615db82a-e189-4b4f-8dbb-d321343e4ab3 + POST_STD_VM 0 @@ -138,7 +133,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -157,8 +151,7 @@ - POST_LAUNCHED_VM - 38158821-5208-4005-b72a-8a609e4190d0 + POST_STD_VM 0 @@ -168,7 +161,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml index 8a3311047..87a32d8c6 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + SAFETY_VM ACRN PRE-LAUNCHED VM0 - fc836901-8685-4bc0-8b71-6e31dc36fa47 0 @@ -62,7 +61,6 @@ 0 - SEVERITY_SAFETY_VM 0 0 @@ -99,16 +97,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -145,8 +141,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -156,7 +151,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml index 6f0fb6f35..2e87951c5 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 0x20000000 @@ -96,8 +94,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -107,7 +104,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -126,8 +122,7 @@ - POST_LAUNCHED_VM - 495ae2e5-2603-4d64-af76-d4bc5a8ec0e5 + POST_RT_VM 0 @@ -138,7 +133,6 @@ 0 - SEVERITY_RTVM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml index 723fa7c2e..6240f3065 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM0 - 26c5e0d8-8f8a-47d8-8109-f201ebd61a5e @@ -103,9 +102,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM1 - dd87ce08-66f9-473d-bc58-7605837f935e GUEST_FLAG_RT GUEST_FLAG_LAPIC_PASSTHROUGH diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml index 65aba391a..f7a2205e4 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -96,8 +94,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -108,7 +105,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -127,12 +123,10 @@ - POST_LAUNCHED_VM - a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f + KATA_VM 0 - SEVERITY_STANDARD_VM 3 diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc2.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc2.xml index 5811e6e8f..27b7afb19 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc2.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc2.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -96,8 +94,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -107,7 +104,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -126,8 +122,7 @@ - POST_LAUNCHED_VM - 615db82a-e189-4b4f-8dbb-d321343e4ab3 + POST_STD_VM 0 @@ -137,7 +132,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -156,8 +150,7 @@ - POST_LAUNCHED_VM - 38158821-5208-4005-b72a-8a609e4190d0 + POST_STD_VM 0 @@ -167,7 +160,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml index a82cb20d6..572890c64 100644 --- a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 - SEVERITY_SOS 0 0x20000000 @@ -94,8 +92,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM @@ -105,7 +102,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -124,8 +120,7 @@ - POST_LAUNCHED_VM - 495ae2e5-2603-4d64-af76-d4bc5a8ec0e5 + POST_RT_VM 0 @@ -136,7 +131,6 @@ 0 - SEVERITY_RTVM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml index 7b182c153..5788824b0 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + SAFETY_VM ACRN PRE-LAUNCHED VM0 - fc836901-8685-4bc0-8b71-6e31dc36fa47 0 @@ -62,7 +61,6 @@ 0 - SEVERITY_SAFETY_VM 0 0 @@ -99,16 +97,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -145,8 +141,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -156,7 +151,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml index a86071568..7fcd13605 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 0x20000000 @@ -96,8 +94,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -107,7 +104,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -126,8 +122,7 @@ - POST_LAUNCHED_VM - 495ae2e5-2603-4d64-af76-d4bc5a8ec0e5 + POST_RT_VM 0 @@ -138,7 +133,6 @@ 0 - SEVERITY_RTVM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml index 161f349c3..96d13c66e 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM0 - 26c5e0d8-8f8a-47d8-8109-f201ebd61a5e @@ -102,9 +101,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM1 - dd87ce08-66f9-473d-bc58-7605837f935e GUEST_FLAG_RT GUEST_FLAG_LAPIC_PASSTHROUGH diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml index e772ceee6..301b348d5 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -96,8 +94,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -108,7 +105,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -127,12 +123,10 @@ - POST_LAUNCHED_VM - a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f + KATA_VM 0 - SEVERITY_STANDARD_VM 3 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc2.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc2.xml index f7d5b0df3..e65070f5c 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc2.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc2.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -96,8 +94,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -107,7 +104,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -126,8 +122,7 @@ - POST_LAUNCHED_VM - 615db82a-e189-4b4f-8dbb-d321343e4ab3 + POST_STD_VM 0 @@ -137,7 +132,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -156,8 +150,7 @@ - POST_LAUNCHED_VM - 38158821-5208-4005-b72a-8a609e4190d0 + POST_STD_VM 0 @@ -167,7 +160,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml index 967c59e83..ba23677a4 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + SAFETY_VM ACRN PRE-LAUNCHED VM0 - fc836901-8685-4bc0-8b71-6e31dc36fa47 0 @@ -62,7 +61,6 @@ 0 - SEVERITY_SAFETY_VM 0 0 @@ -99,16 +97,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -145,8 +141,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -156,7 +151,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml index 228613fbe..6776096a5 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 0x20000000 @@ -96,8 +94,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -107,7 +104,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -126,8 +122,7 @@ - POST_LAUNCHED_VM - 495ae2e5-2603-4d64-af76-d4bc5a8ec0e5 + POST_RT_VM 0 @@ -138,7 +133,6 @@ 0 - SEVERITY_RTVM 0 0 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml index 119dd1fa1..9f2bec613 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml @@ -50,9 +50,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM0 - 26c5e0d8-8f8a-47d8-8109-f201ebd61a5e @@ -102,9 +101,8 @@ - PRE_LAUNCHED_VM + PRE_STD_VM ACRN PRE-LAUNCHED VM1 - dd87ce08-66f9-473d-bc58-7605837f935e GUEST_FLAG_RT GUEST_FLAG_LAPIC_PASSTHROUGH diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml index feda2de94..209606d93 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -96,8 +94,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -108,7 +105,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -127,12 +123,10 @@ - POST_LAUNCHED_VM - a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f + KATA_VM 0 - SEVERITY_STANDARD_VM 3 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc2.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc2.xml index f883bf9ef..ca47da675 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc2.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc2.xml @@ -50,16 +50,14 @@ - SOS_VM + SOS_VM ACRN SOS VM - dbbbd434-7a57-4216-a12c-2201f1ab0240 0 0 - SEVERITY_SOS 0 CONFIG_SOS_RAM_SIZE @@ -96,8 +94,7 @@ - POST_LAUNCHED_VM - d2795438-25d6-11e8-864e-cb7a18b34643 + POST_STD_VM 0 @@ -107,7 +104,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -126,8 +122,7 @@ - POST_LAUNCHED_VM - 615db82a-e189-4b4f-8dbb-d321343e4ab3 + POST_STD_VM 0 @@ -137,7 +132,6 @@ 0 - SEVERITY_STANDARD_VM 0 0 @@ -156,8 +150,7 @@ - POST_LAUNCHED_VM - 38158821-5208-4005-b72a-8a609e4190d0 + POST_STD_VM 0 @@ -167,7 +160,6 @@ 0 - SEVERITY_STANDARD_VM 0 0