github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-08 04:09:11 +00:00
Code Issues Projects Releases Wiki Activity

misc: remove clos element for vCAT refine

Browse Source 
Updated the scenario xml file in misc/config-tools/data folder,
and deleted the clos node in xml file.

Tracked-On: #6690
Signed-off-by: Ziheng Li <ziheng.li@intel.com>
This commit is contained in:
Ziheng Li
2022-05-25 19:03:45 +08:00
committed by acrnsi-robot
parent 5bc55d352f
commit 7c8231f8b1
23 changed files with 23 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
View File

@@ -65,9 +65,6 @@
<pcpu_id>3</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
@@ -95,11 +92,6 @@
<vm id="1">
<load_order>SERVICE_VM</load_order>
<name>ACRN_Service_VM</name>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
@@ -118,9 +110,6 @@
<pcpu_id>2</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>4096</size>
</memory>
@@ -151,9 +140,6 @@
<pcpu_id>2</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>512</size>
</memory>
@@ -175,4 +161,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

17
misc/config_tools/data/generic_board/hybrid_rt.xml
View File

@@ -84,10 +84,6 @@
<real_time_vcpu>y</real_time_vcpu>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
@@ -116,10 +112,6 @@
<vm id="1">
<load_order>SERVICE_VM</load_order>
<name>ACRN_Service_VM</name>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
@@ -141,10 +133,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>4096</size>
</memory>
@@ -175,9 +163,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>512</size>
</memory>
@@ -199,4 +184,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

10
misc/config_tools/data/generic_board/partitioned.xml
View File

@@ -68,10 +68,6 @@
<pcpu_id>2</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
@@ -110,10 +106,6 @@
<pcpu_id>3</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
@@ -140,4 +132,4 @@
<pci_dev>00:14.0 USB controller: Intel Corporation Tiger Lake-LP USB 3.2 Gen 2x1 xHCI Host Controller (rev 20)</pci_dev>
</pci_devs>
</vm>
</acrn-config>
</acrn-config>

29
misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
View File

@@ -59,9 +59,6 @@
<vm id="0">
<load_order>SERVICE_VM</load_order>
<name>ACRN_Service_VM</name>
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
@@ -83,10 +80,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>4096</size>
</memory>
@@ -123,10 +116,6 @@
<real_time_vcpu>y</real_time_vcpu>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>1024</size>
</memory>
@@ -160,10 +149,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>512</size>
</memory>
@@ -197,10 +182,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>512</size>
</memory>
@@ -234,10 +215,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>512</size>
</memory>
@@ -271,10 +248,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>512</size>
</memory>
@@ -296,4 +269,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>