Skip to content

Commit ca2855f

Browse files
Wei Liuwenlingz
authored andcommitted
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>
1 parent a408553 commit ca2855f

File tree

29 files changed

+123
-29
lines changed

29 files changed

+123
-29
lines changed

misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
<name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
55
<uuid configurable="0" desc="vm uuid">fc836901-8685-4bc0-8b71-6e31dc36fa47</uuid>
66
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
7-
<guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
7+
<guest_flag>0</guest_flag>
88
</guest_flags>
99
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
1010
<pcpu_id>3</pcpu_id>
1111
</vcpu_affinity>
1212
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
13+
<severity desc="severity of the guest VM">SEVERITY_SAFETY_VM</severity>
1314
<epc_section desc="epc section">
1415
<base desc="SGX EPC section base, must be page aligned">0</base>
1516
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -52,6 +53,7 @@
5253
<guest_flag>0</guest_flag>
5354
</guest_flags>
5455
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
56+
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
5557
<memory>
5658
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
5759
<size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -98,6 +100,7 @@
98100
<pcpu_id>2</pcpu_id>
99101
</vcpu_affinity>
100102
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
103+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
101104
<epc_section desc="epc section">
102105
<base desc="SGX EPC section base, must be page aligned">0</base>
103106
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>

misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<guest_flag>0</guest_flag>
88
</guest_flags>
99
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
10+
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
1011
<memory>
1112
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
1213
<size configurable="0" desc="The memory size in Bytes for the VM">0x20000000</size>
@@ -53,6 +54,7 @@
5354
<pcpu_id>1</pcpu_id>
5455
</vcpu_affinity>
5556
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
57+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
5658
<epc_section desc="epc section">
5759
<base desc="SGX EPC section base, must be page aligned">0</base>
5860
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -74,13 +76,14 @@
7476
<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>
7577
<uuid configurable="0" desc="vm uuid">495ae2e5-2603-4d64-af76-d4bc5a8ec0e5</uuid>
7678
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
77-
<guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
79+
<guest_flag>0</guest_flag>
7880
</guest_flags>
7981
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
8082
<pcpu_id>2</pcpu_id>
8183
<pcpu_id>3</pcpu_id>
8284
</vcpu_affinity>
8385
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
86+
<severity desc="severity of the guest VM">SEVERITY_RTVM</severity>
8487
<epc_section desc="epc section">
8588
<base desc="SGX EPC section base, must be page aligned">0</base>
8689
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>

misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
<name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
55
<uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
66
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
7-
<guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
7+
<guest_flag>0</guest_flag>
88
</guest_flags>
99
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
10+
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
1011
<memory>
1112
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
1213
<size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -54,6 +55,7 @@
5455
<pcpu_id>2</pcpu_id>
5556
</vcpu_affinity>
5657
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
58+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
5759
<epc_section desc="epc section">
5860
<base desc="SGX EPC section base, must be page aligned">0</base>
5961
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -75,6 +77,7 @@
7577
<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>
7678
<uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
7779
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
80+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
7881
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
7982
<pcpu_id>3</pcpu_id>
8083
</vcpu_affinity>

misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
<name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
55
<uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
66
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
7-
<guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
7+
<guest_flag>0</guest_flag>
88
</guest_flags>
99
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
10+
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
1011
<memory>
1112
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
1213
<size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -53,6 +54,7 @@
5354
<pcpu_id>1</pcpu_id>
5455
</vcpu_affinity>
5556
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
57+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
5658
<epc_section desc="epc section">
5759
<base desc="SGX EPC section base, must be page aligned">0</base>
5860
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -80,6 +82,7 @@
8082
<pcpu_id>2</pcpu_id>
8183
</vcpu_affinity>
8284
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
85+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
8386
<epc_section desc="epc section">
8487
<base desc="SGX EPC section base, must be page aligned">0</base>
8588
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -107,6 +110,7 @@
107110
<pcpu_id>3</pcpu_id>
108111
</vcpu_affinity>
109112
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
113+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
110114
<epc_section desc="epc section">
111115
<base desc="SGX EPC section base, must be page aligned">0</base>
112116
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>

misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
<name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
55
<uuid configurable="0" desc="vm uuid">fc836901-8685-4bc0-8b71-6e31dc36fa47</uuid>
66
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
7-
<guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
7+
<guest_flag>0</guest_flag>
88
</guest_flags>
99
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
1010
<pcpu_id>3</pcpu_id>
1111
</vcpu_affinity>
1212
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
13+
<severity desc="severity of the guest VM">SEVERITY_SAFETY_VM</severity>
1314
<epc_section desc="epc section">
1415
<base desc="SGX EPC section base, must be page aligned">0</base>
1516
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -52,6 +53,7 @@
5253
<guest_flag>0</guest_flag>
5354
</guest_flags>
5455
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
56+
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
5557
<memory>
5658
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
5759
<size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -98,6 +100,7 @@
98100
<pcpu_id>2</pcpu_id>
99101
</vcpu_affinity>
100102
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
103+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
101104
<epc_section desc="epc section">
102105
<base desc="SGX EPC section base, must be page aligned">0</base>
103106
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>

misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<guest_flag>0</guest_flag>
88
</guest_flags>
99
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
10+
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
1011
<memory>
1112
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
1213
<size configurable="0" desc="The memory size in Bytes for the VM">0x20000000</size>
@@ -53,6 +54,7 @@
5354
<pcpu_id>1</pcpu_id>
5455
</vcpu_affinity>
5556
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
57+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
5658
<epc_section desc="epc section">
5759
<base desc="SGX EPC section base, must be page aligned">0</base>
5860
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -74,13 +76,14 @@
7476
<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>
7577
<uuid configurable="0" desc="vm uuid">495ae2e5-2603-4d64-af76-d4bc5a8ec0e5</uuid>
7678
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
77-
<guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
79+
<guest_flag>0</guest_flag>
7880
</guest_flags>
7981
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
8082
<pcpu_id>2</pcpu_id>
8183
<pcpu_id>3</pcpu_id>
8284
</vcpu_affinity>
8385
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
86+
<severity desc="severity of the guest VM">SEVERITY_RTVM</severity>
8487
<epc_section desc="epc section">
8588
<base desc="SGX EPC section base, must be page aligned">0</base>
8689
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>

misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
<name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
55
<uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
66
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
7-
<guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
7+
<guest_flag>0</guest_flag>
88
</guest_flags>
99
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
10+
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
1011
<memory>
1112
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
1213
<size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -54,6 +55,7 @@
5455
<pcpu_id>2</pcpu_id>
5556
</vcpu_affinity>
5657
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
58+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
5759
<epc_section desc="epc section">
5860
<base desc="SGX EPC section base, must be page aligned">0</base>
5961
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -75,6 +77,7 @@
7577
<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>
7678
<uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
7779
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
80+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
7881
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
7982
<pcpu_id>3</pcpu_id>
8083
</vcpu_affinity>

misc/acrn-config/xmls/config-xmls/apl-up2/sdc2.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
<name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN SOS VM</name>
55
<uuid configurable="0" desc="vm uuid">dbbbd434-7a57-4216-a12c-2201f1ab0240</uuid>
66
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
7-
<guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
7+
<guest_flag>0</guest_flag>
88
</guest_flags>
99
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
10+
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
1011
<memory>
1112
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
1213
<size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -53,6 +54,7 @@
5354
<pcpu_id>1</pcpu_id>
5455
</vcpu_affinity>
5556
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
57+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
5658
<epc_section desc="epc section">
5759
<base desc="SGX EPC section base, must be page aligned">0</base>
5860
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -80,6 +82,7 @@
8082
<pcpu_id>2</pcpu_id>
8183
</vcpu_affinity>
8284
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
85+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
8386
<epc_section desc="epc section">
8487
<base desc="SGX EPC section base, must be page aligned">0</base>
8588
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -107,6 +110,7 @@
107110
<pcpu_id>3</pcpu_id>
108111
</vcpu_affinity>
109112
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
113+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
110114
<epc_section desc="epc section">
111115
<base desc="SGX EPC section base, must be page aligned">0</base>
112116
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>

misc/acrn-config/xmls/config-xmls/generic/hybrid.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
<name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
55
<uuid configurable="0" desc="vm uuid">fc836901-8685-4bc0-8b71-6e31dc36fa47</uuid>
66
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
7-
<guest_flag>GUEST_FLAG_HIGHEST_SEVERITY</guest_flag>
7+
<guest_flag>0</guest_flag>
88
</guest_flags>
99
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
1010
<pcpu_id>3</pcpu_id>
1111
</vcpu_affinity>
1212
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
13+
<severity desc="severity of the guest VM">SEVERITY_SAFETY_VM</severity>
1314
<epc_section desc="epc section">
1415
<base desc="SGX EPC section base, must be page aligned">0</base>
1516
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -52,6 +53,7 @@
5253
<guest_flag>0</guest_flag>
5354
</guest_flags>
5455
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
56+
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
5557
<memory>
5658
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
5759
<size configurable="0" desc="The memory size in Bytes for the VM">CONFIG_SOS_RAM_SIZE</size>
@@ -96,6 +98,7 @@
9698
<pcpu_id>2</pcpu_id>
9799
</vcpu_affinity>
98100
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
101+
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
99102
<epc_section desc="epc section">
100103
<base desc="SGX EPC section base, must be page aligned">0</base>
101104
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>

0 commit comments

Comments
 (0)