mirror of
https://github.com/projectacrn/acrn-hypervisor.git
synced 2025-09-18 15:28:43 +00:00
c442f3f4d1
The pcpu sharing for vm already enabled in master branch, acrn-config
tool for generating scenario config souce file should keep align with master branch.
1. Add 'vcpu_affinity' tag and its vaule in config xml.
2. Parse the 'vcpu_affinity' tag of value from config xml for generating vcpu_affinity.
v1-v2:
1). apl-up2-n3350 has two PCPUs, set appropriate value for vcpu_affinity.
Tracked-On: #3798
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
99 lines
7.0 KiB
XML
99 lines
7.0 KiB
XML
<acrn-config board="apl-mrb" scenario="sdc">
|
|
<vm id="0">
|
|
<load_order desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM." readonly="true">SOS_VM</load_order>
|
|
<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_flags>
|
|
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
|
|
<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>
|
|
</memory>
|
|
<os_config>
|
|
<name desc="Specify the OS name of VM, currently it is not referenced by hypervisor code.">ACRN Service OS</name>
|
|
<kern_type desc="Specify the kernel image type so that hypervisor could load it correctly. Currently support KERNEL_BZIMAGE and KERNEL_ZEPHYR.">KERNEL_BZIMAGE</kern_type>
|
|
<kern_mod desc="The tag for kernel image which act as multiboot module, it must exactly match the module tag in GRUB multiboot cmdline.">Linux_bzImage</kern_mod>
|
|
<bootargs configurable="0" desc="Specify kernel boot arguments">SOS_VM_BOOTARGS</bootargs>
|
|
</os_config>
|
|
<vuart id="0">
|
|
<type configurable="0" desc="vCOM1 type">VUART_LEGACY_PIO</type>
|
|
<base desc="vUART0 (A.K.A COM1) enabling switch. Enable by exposing its base address, disable by returning invalid base address." readonly="true">SOS_COM1_BASE</base>
|
|
<irq configurable="0" desc="vCOM1 irq">SOS_COM1_IRQ</irq>
|
|
</vuart>
|
|
<vuart id="1">
|
|
<type configurable="0" desc="vCOM2 type">VUART_LEGACY_PIO</type>
|
|
<base desc="vUART1 (A.K.A COM2) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
|
|
<irq configurable="0" desc="vCOM2 irq">SOS_COM2_IRQ</irq>
|
|
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">1</target_vm_id>
|
|
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
|
|
</vuart>
|
|
<pci_dev_num configurable="0" desc="pci devices number">SOS_EMULATED_PCI_DEV_NUM</pci_dev_num>
|
|
<pci_devs configurable="0" desc="pci devices list">sos_pci_devs</pci_devs>
|
|
<board_private>
|
|
<rootfs desc="rootfs for Linux kernel">/dev/mmcblk1p1</rootfs>
|
|
<console desc="ttyS console for Linux kernel">/dev/ttyS2</console>
|
|
<bootargs desc="Specify kernel boot arguments">
|
|
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
|
|
i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1
|
|
hvlog=2M@0x6de00000 memmap=0x600000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
|
|
reboot_panic=p,w module_blacklist=dwc3_pci i915.enable_initial_modeset=1 i915.enable_guc=0x02 video=DP-1:d video=DP-2:d cma=64M@0- panic_print=0x1f
|
|
</bootargs>
|
|
</board_private>
|
|
</vm>
|
|
<vm id="1">
|
|
<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">d2795438-25d6-11e8-864e-cb7a18b34643</uuid>
|
|
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
|
|
<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>1</pcpu_id>
|
|
<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>
|
|
<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>
|
|
</epc_section>
|
|
<vuart id="0">
|
|
<type configurable="0" desc="vCOM1 type">VUART_LEGACY_PIO</type>
|
|
<base desc="vUART0 (A.K.A COM1) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
|
|
<irq configurable="0" desc="vCOM1 irq">COM1_IRQ</irq>
|
|
</vuart>
|
|
<vuart id="1">
|
|
<type configurable="0" desc="vCOM2 type">VUART_LEGACY_PIO</type>
|
|
<base desc="vUART1 (A.K.A COM2) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
|
|
<irq configurable="0" desc="vCOM2 irq">COM2_IRQ</irq>
|
|
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">0</target_vm_id>
|
|
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
|
|
</vuart>
|
|
</vm>
|
|
<vm id="2" configurable="0" desc="specific for Kata">
|
|
<load_order 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>
|
|
<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>
|
|
<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>
|
|
</epc_section>
|
|
<vuart id="0">
|
|
<type configurable="0" desc="vCOM1 type">VUART_LEGACY_PIO</type>
|
|
<base configurable="0" desc="vUART0 (A.K.A COM1) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
|
|
<irq configurable="0" desc="vCOM1 irq">COM1_BASE</irq>
|
|
</vuart>
|
|
<vuart id="1">
|
|
<type configurable="0" desc="vCOM2 type">VUART_LEGACY_PIO</type>
|
|
<base configurable="0" desc="vUART1 (A.K.A COM2) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
|
|
<irq configurable="0" desc="vCOM2 irq">COM2_BASE</irq>
|
|
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">0</target_vm_id>
|
|
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">0</target_uart_id>
|
|
</vuart>
|
|
</vm>
|
|
</acrn-config>
|