From ca2855f23015789556fbf260f3492fe83d057ea8 Mon Sep 17 00:00:00 2001
From: Wei Liu <weix.w.liu@intel.com>
Date: Thu, 19 Dec 2019 14:16:57 +0800
Subject: [PATCH] acrn-config: add severity setting to scenario config xml

To keep align hypervisor source code for scenario config, need add
the 'severity' item tag into scenario config files.

Tracked-On: #3854
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
---
 misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml      | 5 ++++-
 misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml    | 5 ++++-
 misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml         | 5 ++++-
 misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml        | 6 +++++-
 misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml      | 5 ++++-
 misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml    | 5 ++++-
 misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml         | 5 ++++-
 misc/acrn-config/xmls/config-xmls/apl-up2/sdc2.xml        | 6 +++++-
 misc/acrn-config/xmls/config-xmls/generic/hybrid.xml      | 5 ++++-
 misc/acrn-config/xmls/config-xmls/generic/industry.xml    | 5 ++++-
 misc/acrn-config/xmls/config-xmls/generic/sdc.xml         | 5 ++++-
 misc/acrn-config/xmls/config-xmls/generic/sdc2.xml        | 6 +++++-
 misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml     | 5 ++++-
 misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml   | 5 ++++-
 misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml        | 5 ++++-
 misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc2.xml       | 6 +++++-
 misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml    | 5 ++++-
 misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml  | 5 ++++-
 misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml       | 5 ++++-
 misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc2.xml      | 6 +++++-
 misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml    | 5 ++++-
 misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml   | 5 ++++-
 misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml | 5 ++++-
 misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml      | 5 ++++-
 misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc2.xml     | 6 +++++-
 misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml   | 5 ++++-
 misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml | 5 ++++-
 misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml      | 5 ++++-
 misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc2.xml     | 6 +++++-
 29 files changed, 123 insertions(+), 29 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 5d7002bc9..cd0c6ccbd 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml
@@ -4,12 +4,13 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
     <uuid configurable="0" desc="vm uuid">fc836901-8685-4bc0-8b71-6e31dc36fa47</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SAFETY_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -52,6 +53,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -98,6 +100,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
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 d8b7dfdaa..df084170c 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml
@@ -7,6 +7,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">0x20000000</size>
@@ -53,6 +54,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -74,13 +76,14 @@
     <load_order desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM." readonly="true">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">495ae2e5-2603-4d64-af76-d4bc5a8ec0e5</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>2</pcpu_id>
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_RTVM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
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 59ebbf5e2..9b444b4bf 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -54,6 +55,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -75,6 +77,7 @@
     <load_order readonly="true" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
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 8afed5641..589eb1581 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -53,6 +54,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -80,6 +82,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -107,6 +110,7 @@
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
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 bf5649575..6f6b61625 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml
@@ -4,12 +4,13 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
     <uuid configurable="0" desc="vm uuid">fc836901-8685-4bc0-8b71-6e31dc36fa47</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SAFETY_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -52,6 +53,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -98,6 +100,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
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 9599ec6aa..0ee3e0c0b 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml
@@ -7,6 +7,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">0x20000000</size>
@@ -53,6 +54,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -74,13 +76,14 @@
     <load_order desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM." readonly="true">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">495ae2e5-2603-4d64-af76-d4bc5a8ec0e5</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>2</pcpu_id>
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_RTVM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
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 c59fd5116..7448880b8 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -54,6 +55,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -75,6 +77,7 @@
     <load_order readonly="true" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
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 572f63d80..33a3b0597 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc2.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc2.xml
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -53,6 +54,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -80,6 +82,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -107,6 +110,7 @@
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
diff --git a/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml b/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml
index ff60239f2..a707e44af 100644
--- a/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml
+++ b/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml
@@ -4,12 +4,13 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
     <uuid configurable="0" desc="vm uuid">fc836901-8685-4bc0-8b71-6e31dc36fa47</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SAFETY_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -52,6 +53,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -96,6 +98,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
diff --git a/misc/acrn-config/xmls/config-xmls/generic/industry.xml b/misc/acrn-config/xmls/config-xmls/generic/industry.xml
index 0f36e3588..abd6e6c60 100644
--- a/misc/acrn-config/xmls/config-xmls/generic/industry.xml
+++ b/misc/acrn-config/xmls/config-xmls/generic/industry.xml
@@ -7,6 +7,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">0x20000000</size>
@@ -51,6 +52,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -72,13 +74,14 @@
     <load_order desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM." readonly="true">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">495ae2e5-2603-4d64-af76-d4bc5a8ec0e5</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>2</pcpu_id>
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_RTVM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
diff --git a/misc/acrn-config/xmls/config-xmls/generic/sdc.xml b/misc/acrn-config/xmls/config-xmls/generic/sdc.xml
index 35fea783b..a47d93581 100644
--- a/misc/acrn-config/xmls/config-xmls/generic/sdc.xml
+++ b/misc/acrn-config/xmls/config-xmls/generic/sdc.xml
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -51,6 +52,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -72,6 +74,7 @@
     <load_order readonly="true" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
diff --git a/misc/acrn-config/xmls/config-xmls/generic/sdc2.xml b/misc/acrn-config/xmls/config-xmls/generic/sdc2.xml
index 9d8e61c83..73c2ab2de 100644
--- a/misc/acrn-config/xmls/config-xmls/generic/sdc2.xml
+++ b/misc/acrn-config/xmls/config-xmls/generic/sdc2.xml
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -51,6 +52,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -78,6 +80,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -105,6 +108,7 @@
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml
index 3a4272f7d..dc0f4000c 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml
@@ -4,12 +4,13 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
     <uuid configurable="0" desc="vm uuid">fc836901-8685-4bc0-8b71-6e31dc36fa47</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SAFETY_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -52,6 +53,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -97,6 +99,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml
index d37e8dfbd..ac63484d6 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml
@@ -7,6 +7,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">0x20000000</size>
@@ -52,6 +53,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -73,13 +75,14 @@
     <load_order desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM." readonly="true">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">495ae2e5-2603-4d64-af76-d4bc5a8ec0e5</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>2</pcpu_id>
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_RTVM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml
index 06ead2cf4..a15f11548 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -53,6 +54,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -74,6 +76,7 @@
     <load_order readonly="true" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc2.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc2.xml
index 02a48b109..b27327f28 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc2.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc2.xml
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -52,6 +53,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -79,6 +81,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -106,6 +109,7 @@
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml
index d0f448b5c..420d89ab3 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml
@@ -4,12 +4,13 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
     <uuid configurable="0" desc="vm uuid">fc836901-8685-4bc0-8b71-6e31dc36fa47</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SAFETY_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -52,6 +53,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -97,6 +99,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml
index c40b49416..221d51484 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml
@@ -7,6 +7,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">0x20000000</size>
@@ -52,6 +53,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -73,13 +75,14 @@
     <load_order desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM." readonly="true">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">495ae2e5-2603-4d64-af76-d4bc5a8ec0e5</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>2</pcpu_id>
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_RTVM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml
index 7a06bcb67..155ead044 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -53,6 +54,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -74,6 +76,7 @@
     <load_order readonly="true" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc2.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc2.xml
index 20b172ccf..80c45b8c0 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc2.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc2.xml
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -52,6 +53,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -79,6 +81,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -106,6 +109,7 @@
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
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 e84ba4ff9..66905f7d2 100644
--- a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml
+++ b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml
@@ -8,6 +8,7 @@
             <guest_flag />
         </guest_flags>
         <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+        <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
         <memory>
             <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
             <size configurable="0" desc="The memory size in Bytes for the VM">0x20000000</size>
@@ -51,6 +52,7 @@
             <pcpu_id>1</pcpu_id>
         </vcpu_affinity>
         <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+        <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
         <epc_section desc="epc section">
             <base desc="SGX EPC section base, must be page aligned">0</base>
             <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -72,13 +74,14 @@
         <load_order desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM." readonly="true">POST_LAUNCHED_VM</load_order>
         <uuid configurable="0" desc="vm uuid">495ae2e5-2603-4d64-af76-d4bc5a8ec0e5</uuid>
         <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-            <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+            <guest_flag>0</guest_flag>
         </guest_flags>
         <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
             <pcpu_id>2</pcpu_id>
             <pcpu_id>3</pcpu_id>
         </vcpu_affinity>
         <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+        <severity desc="severity of the guest VM">SEVERITY_RTVM</severity>
         <epc_section desc="epc section">
             <base desc="SGX EPC section base, must be page aligned">0</base>
             <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
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 a593c74d2..cfcff2453 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
@@ -4,12 +4,13 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
     <uuid configurable="0" desc="vm uuid">fc836901-8685-4bc0-8b71-6e31dc36fa47</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SAFETY_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -52,6 +53,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -97,6 +99,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
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 67721828e..91114ca83 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
@@ -7,6 +7,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">0x20000000</size>
@@ -52,6 +53,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -73,13 +75,14 @@
     <load_order desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM." readonly="true">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">495ae2e5-2603-4d64-af76-d4bc5a8ec0e5</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>2</pcpu_id>
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_RTVM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
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 58875d139..e64cc3d4a 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
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -53,6 +54,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -74,6 +76,7 @@
     <load_order readonly="true" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
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 8a888451d..2c80e9081 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
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -52,6 +53,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -79,6 +81,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -106,6 +109,7 @@
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
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 54106be29..f8cb4a2c2 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
@@ -4,12 +4,13 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
     <uuid configurable="0" desc="vm uuid">fc836901-8685-4bc0-8b71-6e31dc36fa47</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SAFETY_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -52,6 +53,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -97,6 +99,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
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 ab2012c5b..87295693c 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
@@ -7,6 +7,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">0x20000000</size>
@@ -52,6 +53,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -73,13 +75,14 @@
     <load_order desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM." readonly="true">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">495ae2e5-2603-4d64-af76-d4bc5a8ec0e5</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>2</pcpu_id>
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_RTVM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
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 df44088bf..34378804c 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
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -53,6 +54,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -74,6 +76,7 @@
     <load_order readonly="true" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
     <uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
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 860a0a59e..8e26dafda 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
@@ -4,9 +4,10 @@
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
     <uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_SOS</severity>
     <memory>
         <start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
         <size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -52,6 +53,7 @@
         <pcpu_id>1</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -79,6 +81,7 @@
         <pcpu_id>2</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -106,6 +109,7 @@
         <pcpu_id>3</pcpu_id>
     </vcpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
+    <severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
     <epc_section desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
         <size desc="SGX EPC section size in Bytes, must be page aligned">0</size>