github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-30 05:50:59 +00:00
Code Issues Projects Releases Wiki Activity

config_tools: remove the parameters "pm_notify_channel" and "pm_by_vuart" of acrn-dm

Browse Source 
Since PR #7002 has removed "pm_notify_channel" and "pm_by_vuart"
from acrn-dm usage, this patch also removes the two parameters
in the launch script generation logic.

Tracked-On: #6690
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
This commit is contained in:
Kunhui-Li 2021-12-30 15:25:39 +08:00 committed by acrnsi-robot
parent 702f5d2586
commit 02268941d8
16 changed files with 12 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,8 +6,6 @@
<mem_size desc="User VM memory size in MByte">4096</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -53,8 +51,6 @@
<mem_size desc="User VM memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -93,4 +89,4 @@
<network/>
</sriov>
</user_vm>
</acrn-config>
</acrn-config>

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

@ -6,8 +6,6 @@
<mem_size desc="UOS memory size in MByte">4096</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -53,9 +51,7 @@
<mem_size desc="UOS memory size in MByte">1024</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
<pcpu_id/>
@ -100,8 +96,6 @@
<mem_size desc="UOS memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -147,8 +141,6 @@
<mem_size desc="UOS memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -194,8 +186,6 @@
<mem_size desc="UOS memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -241,8 +231,6 @@
<mem_size desc="UOS memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -281,4 +269,4 @@
<network/>
</sriov>
</user_vm>
</acrn-config>
</acrn-config>

6
misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
View File

@ -6,8 +6,6 @@
<mem_size desc="User VM memory size in MByte">4096</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -53,8 +51,6 @@
<mem_size desc="User VM memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -93,4 +89,4 @@
<network/>
</sriov>
</user_vm>
</acrn-config>
</acrn-config>

14
misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
View File

@ -6,8 +6,6 @@
<mem_size desc="User VM memory size in MByte">4096</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -53,9 +51,7 @@
<mem_size desc="User VM memory size in MByte">1024</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
<pcpu_id/>
@ -100,8 +96,6 @@
<mem_size desc="User VM memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -147,8 +141,6 @@
<mem_size desc="User VM memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -194,8 +186,6 @@
<mem_size desc="User VM memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -241,8 +231,6 @@
<mem_size desc="User VM memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -281,4 +269,4 @@
<network/>
</sriov>
</user_vm>
</acrn-config>
</acrn-config>

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

@ -6,8 +6,6 @@
<mem_size desc="User VM memory size in MByte">4096</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -46,4 +44,4 @@
<network/>
</sriov>
</user_vm>
</acrn-config>
</acrn-config>

4
misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml
View File

@ -6,8 +6,6 @@
<mem_size desc="User VM memory size in MByte">2048</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -46,4 +44,4 @@
<network/>
</sriov>
</user_vm>
</acrn-config>
</acrn-config>

4
misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_zephyr.xml
View File

@ -6,8 +6,6 @@
<mem_size desc="User VM memory size in MByte">128</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -46,4 +44,4 @@
<network/>
</sriov>
</user_vm>
</acrn-config>
</acrn-config>

4
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
View File

@ -6,8 +6,6 @@
<mem_size desc="User VM memory size in MByte">1024</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -46,4 +44,4 @@
<network/>
</sriov>
</user_vm>
</acrn-config>
</acrn-config>

4
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
View File

@ -6,8 +6,6 @@
<mem_size desc="User VM memory size in MByte">2048</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -46,4 +44,4 @@
<network/>
</sriov>
</user_vm>
</acrn-config>
</acrn-config>

4
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
View File

@ -6,8 +6,6 @@
<mem_size desc="User VM memory size in MByte">4096</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -46,4 +44,4 @@
<network/>
</sriov>
</user_vm>
</acrn-config>
</acrn-config>

6
misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
View File

@ -6,8 +6,6 @@
<mem_size desc="User VM memory size in MByte">4096</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -53,8 +51,6 @@
<mem_size desc="User VM memory size in MByte">1024</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -93,4 +89,4 @@
<network/>
</sriov>
</user_vm>
</acrn-config>
</acrn-config>

14
misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
View File

@ -6,8 +6,6 @@
<mem_size desc="User VM memory size in MByte">4096</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -53,8 +51,6 @@
<mem_size desc="User VM memory size in MByte">1024</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -100,8 +96,6 @@
<mem_size desc="User VM memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -147,8 +141,6 @@
<mem_size desc="User VM memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -194,8 +186,6 @@
<mem_size desc="User VM memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -241,8 +231,6 @@
<mem_size desc="User VM memory size in MByte">512</mem_size>
<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
<poweroff_channel desc="the method of power off User VM"/>
<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
<enable_ptm desc="enable ptm of User VM">n</enable_ptm>
<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"/>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@ -281,4 +269,4 @@
<network/>
</sriov>
</user_vm>
</acrn-config>
</acrn-config>

21
misc/config_tools/launch_config/com.py
View File

@ -563,27 +563,6 @@ def dm_arg_set(names, sel, virt_io, dm, sriov, vmid, config):
if user_vm_type == "WINDOWS":
print(" --windows \\", file=config)
# pm_channel set
if dm['pm_channel'][vmid] and dm['pm_channel'][vmid] != None:
pm_key = dm['pm_channel'][vmid]
pm_vuart = "--pm_notify_channel uart"
if vmid in dm["allow_trigger_s5"] and dm["allow_trigger_s5"][vmid] == 'y':
pm_vuart = pm_vuart + ",allow_trigger_s5 "
else:
pm_vuart = pm_vuart + " "
if pm_key == "vuart1(tty)":
vuart_base = launch_cfg_lib.get_vuart1_from_scenario(sos_vmid + vmid)
if vuart_base == "INVALID_COM_BASE":
err_key = "user_vm:id={}:poweroff_channel".format(vmid)
launch_cfg_lib.ERR_LIST[err_key] = "vuart1 of VM{} in scenario file should select 'SERVICE_VM_COM2_BASE'".format(sos_vmid + vmid)
return
scenario_cfg_lib.get_sos_vuart_settings()
print(" {} \\".format(pm_vuart + launch_cfg_lib.PM_CHANNEL_DIC[pm_key] + scenario_cfg_lib.SERVICE_VM_UART1_VALID_NUM), file=config)
elif pm_key == "vuart1(pty)":
print(" {} \\".format(pm_vuart + launch_cfg_lib.PM_CHANNEL_DIC[pm_key]), file=config)
else:
print(" {} \\".format(launch_cfg_lib.PM_CHANNEL_DIC[pm_key]), file=config)
# set logger_setting for all VMs
print(" $logger_setting \\", file=config)

2
misc/config_tools/launch_config/launch_cfg_gen.py
View File

@ -52,10 +52,8 @@ def get_launch_item_values(board_info, scenario_info=None):
launch_item_values["user_vm,vbootloader"] = launch_cfg_lib.BOOT_TYPE
launch_item_values['user_vm,vuart0'] = launch_cfg_lib.DM_VUART0
launch_item_values['user_vm,poweroff_channel'] = launch_cfg_lib.PM_CHANNEL
launch_item_values["user_vm,cpu_affinity"] = board_cfg_lib.get_processor_info()
launch_item_values['user_vm,enable_ptm'] = launch_cfg_lib.y_n
launch_item_values['user_vm,allow_trigger_s5'] = launch_cfg_lib.y_n
launch_cfg_lib.set_shm_regions(launch_item_values, scenario_info)
launch_cfg_lib.set_pci_vuarts(launch_item_values, scenario_info)

3
misc/config_tools/launch_config/launch_item.py
View File

@ -25,7 +25,6 @@ class AcrnDmArgs:
self.args["vbootloader"] = common.get_leaf_tag_map(self.launch_info, "vbootloader")
self.args["vuart0"] = common.get_leaf_tag_map(self.launch_info, "vuart0")
self.args["cpu_sharing"] = common.get_hv_item_tag(self.scenario_info, "FEATURES", "SCHEDULER")
self.args["pm_channel"] = common.get_leaf_tag_map(self.launch_info, "poweroff_channel")
self.args["cpu_affinity"] = common.get_leaf_tag_map(self.launch_info, "cpu_affinity", "pcpu_id")
# get default cpu_affinity from scenario file
scenario_names = {v: k for k, v in common.get_leaf_tag_map(self.scenario_info, "name").items()}
@ -53,7 +52,6 @@ class AcrnDmArgs:
self.args["communication_vuarts"] = common.get_leaf_tag_map(self.launch_info, "communication_vuarts", "communication_vuart")
self.args["console_vuart"] = common.get_leaf_tag_map(self.launch_info, "console_vuart")
self.args["enable_ptm"] = common.get_leaf_tag_map(self.launch_info, "enable_ptm")
self.args["allow_trigger_s5"] = common.get_leaf_tag_map(self.launch_info, "allow_trigger_s5")
def check_item(self):
(rootfs, num) = board_cfg_lib.get_rootfs(self.board_info)
@ -63,7 +61,6 @@ class AcrnDmArgs:
launch_cfg_lib.args_aval_check(self.args["vbootloader"], "vbootloader", launch_cfg_lib.BOOT_TYPE)
launch_cfg_lib.args_aval_check(self.args["vuart0"], "vuart0", launch_cfg_lib.DM_VUART0)
launch_cfg_lib.args_aval_check(self.args["enable_ptm"], "enable_ptm", launch_cfg_lib.y_n)
launch_cfg_lib.args_aval_check(self.args["allow_trigger_s5"], "allow_trigger_s5", launch_cfg_lib.y_n)
cpu_affinity = launch_cfg_lib.user_vm_cpu_affinity(self.args["cpu_affinity"])
err_dic = scenario_cfg_lib.vm_cpu_affinity_check(self.scenario_info, self.launch_info, cpu_affinity)
launch_cfg_lib.ERR_LIST.update(err_dic)

9
misc/config_tools/library/launch_cfg_lib.py
View File

@ -50,15 +50,6 @@ PT_SLOT = {
}
PM_CHANNEL = ['', 'IOC', 'PowerButton', 'vuart1(pty)', 'vuart1(tty)']
PM_CHANNEL_DIC = {
None:'',
'IOC':'--pm_notify_channel ioc',
'PowerButton':'--pm_notify_channel power_button',
'vuart1(pty)':'--pm_by_vuart pty,/run/acrn/life_mngr_$vm_name \\\n -l com2,/run/acrn/life_mngr_$vm_name',
'vuart1(tty)':'--pm_by_vuart tty,/dev/',
}
MOUNT_FLAG_DIC = {}