Skip to content

Commit f6e6ec4

Browse files
Wei Liuwenlingz
authored andcommitted
acrn-config: modify SDC config xml to support kata vm config in webUI
Support to config kata vm in webUI, this need to modify 'configurable' attribute to '1' in vm item. Tracked-On: 4145 Signed-off-by: Wei Liu <weix.w.liu@intel.com> Acked-by: Victor Sun <victor.sun@intel.com>
1 parent bb2218e commit f6e6ec4

File tree

7 files changed

+15
-17
lines changed

7 files changed

+15
-17
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
7272
</vuart>
7373
</vm>
74-
<vm id="2" configurable="0" desc="specific for Kata">
75-
<load_order desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
74+
<vm id="2" configurable="1" desc="specific for Kata">
75+
<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>
7676
<uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
7777
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
7878
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
7272
</vuart>
7373
</vm>
74-
<vm id="2" configurable="0" desc="specific for Kata">
75-
<load_order configurable="0" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
74+
<vm id="2" configurable="1" desc="specific for Kata">
75+
<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>
7676
<uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
7777
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
7878
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
</guest_flags>
4949
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
5050
<pcpu_id>1</pcpu_id>
51-
<pcpu_id>2</pcpu_id>
52-
<pcpu_id>3</pcpu_id>
5351
</vcpu_affinity>
5452
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
5553
<epc_section desc="epc section">
@@ -69,12 +67,12 @@
6967
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
7068
</vuart>
7169
</vm>
72-
<vm id="2" configurable="0" desc="specific for Kata">
73-
<load_order configurable="0" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
70+
<vm id="2" configurable="1" desc="specific for Kata">
71+
<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>
7472
<uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
7573
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
7674
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
77-
<pcpu_id>3</pcpu_id>
75+
<pcpu_id>1</pcpu_id>
7876
</vcpu_affinity>
7977
<epc_section desc="epc section">
8078
<base desc="SGX EPC section base, must be page aligned">0</base>

misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
7171
</vuart>
7272
</vm>
73-
<vm id="2" configurable="0" desc="specific for Kata">
74-
<load_order configurable="0" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
73+
<vm id="2" configurable="1" desc="specific for Kata">
74+
<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>
7575
<uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
7676
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
7777
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">

misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
7171
</vuart>
7272
</vm>
73-
<vm id="2" configurable="0" desc="specific for Kata">
74-
<load_order configurable="0" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
73+
<vm id="2" configurable="1" desc="specific for Kata">
74+
<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>
7575
<uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
7676
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
7777
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">

misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
7171
</vuart>
7272
</vm>
73-
<vm id="2" configurable="0" desc="specific for Kata">
74-
<load_order configurable="0" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
73+
<vm id="2" configurable="1" desc="specific for Kata">
74+
<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>
7575
<uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
7676
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
7777
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">

misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
7171
</vuart>
7272
</vm>
73-
<vm id="2" configurable="0" desc="specific for Kata">
74-
<load_order configurable="0" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
73+
<vm id="2" configurable="1" desc="specific for Kata">
74+
<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>
7575
<uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
7676
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
7777
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">

0 commit comments

Comments
 (0)