github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-24 06:29:19 +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 8d4d18d238
commit 6182b192c6
23 changed files with 23 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
misc/config_tools/data/cfl-k700-i7/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>
@ -94,11 +91,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>

23
misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
View File

@ -87,10 +87,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>
@ -122,14 +118,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>
<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>
@ -153,11 +141,6 @@
<pcpu_id>3</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>4096</size>
</memory>
@ -191,10 +174,6 @@
<pcpu_id>5</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>512</size>
</memory>
@ -216,4 +195,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

10
misc/config_tools/data/cfl-k700-i7/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 Cannon Lake PCH USB 3.1 xHCI Host Controller (rev 10)</pci_dev>
</pci_devs>
</vm>
</acrn-config>
</acrn-config>

29
misc/config_tools/data/cfl-k700-i7/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>

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>

16
misc/config_tools/data/nuc11tnbi5/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>

10
misc/config_tools/data/nuc11tnbi5/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/nuc11tnbi5/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>

8
misc/config_tools/data/qemu/shared.xml
View File

@ -60,9 +60,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>
@ -81,9 +78,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>None</console_vuart>
</vm>
</acrn-config>
</acrn-config>

16
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.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>
@ -119,9 +111,6 @@
<pcpu_id>2</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>4096</size>
</memory>
@ -155,9 +144,6 @@
<pcpu_id>2</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>512</size>
</memory>
@ -179,4 +165,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

10
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/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>
@ -139,4 +131,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>

13
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
View File

@ -71,9 +71,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>
@ -96,10 +93,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>
@ -140,10 +133,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>
@ -166,4 +155,4 @@
<block>./core-image-weston-intel-corei7-64.wic</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

16
misc/config_tools/data/whl-ipc-i5/hybrid.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>
@ -93,11 +90,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>
@ -116,9 +108,6 @@
<pcpu_id>2</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>4096</size>
</memory>
@ -149,9 +138,6 @@
<pcpu_id>2</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>512</size>
</memory>
@ -173,4 +159,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

17
misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
View File

@ -87,10 +87,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>
@ -122,10 +118,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>
@ -147,10 +139,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>
@ -182,9 +170,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<memory>
<size>512</size>
</memory>
@ -206,4 +191,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>

10
misc/config_tools/data/whl-ipc-i5/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>
@ -112,10 +108,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>
@ -144,4 +136,4 @@
<pci_dev>03:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)</pci_dev>
</pci_devs>
</vm>
</acrn-config>
</acrn-config>

29
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.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>
<console_vuart>COM Port 1</console_vuart>
</vm>
<vm id="2">
@ -104,10 +97,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>
@ -141,10 +130,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -160,10 +145,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -179,10 +160,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -198,11 +175,7 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>
</acrn-config>

29
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.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>
@ -86,10 +83,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>2048</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>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -142,10 +131,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -161,10 +146,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -180,10 +161,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -199,11 +176,7 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>
</acrn-config>

29
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.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>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -142,10 +131,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -161,10 +146,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -180,10 +161,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -199,11 +176,7 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>
</acrn-config>

29
misc/config_tools/data/whl-ipc-i5/shared_launch_2user_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>
@ -124,10 +117,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>
@ -161,10 +150,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -180,10 +165,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -199,10 +180,6 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@ -218,11 +195,7 @@
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<clos>
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>
</acrn-config>

29
misc/config_tools/data/whl-ipc-i5/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>
@ -124,10 +117,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>
@ -161,10 +150,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>
@ -198,10 +183,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>
@ -235,10 +216,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>
@ -272,10 +249,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>
@ -297,4 +270,4 @@
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>
</acrn-config>