github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-10 21:29:20 +00:00
Code Issues Projects Releases Wiki Activity

ACRN: misc: Unify terminology for service vm/user vm

Browse Source 
Rename SOS_VM type to SERVICE_VM
rename UOS to User VM in XML description
rename uos_thread_pid to user_vm_thread_pid
rename devname_uos to devname_user_vm
rename uosid to user_vmid
rename UOS_ACK to USER_VM_ACK
rename SOS_VM_CONFIG_CPU_AFFINITY to SERVICE_VM_CONFIG_CPU_AFFINITY
rename SOS_COM to SERVICE_VM_COM
rename SOS_UART1_VALID_NUM" to SERVICE_VM_UART1_VALID_NUM
rename SOS_BOOTARGS_DIFF to SERVICE_VM_BOOTARGS_DIFF
rename uos to user_vm in launch script and xml

Tracked-On: #6744
Signed-off-by: Liu Long <long.liu@linux.intel.com>
Reviewed-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
This commit is contained in:
Liu Long
2021-10-29 20:27:43 +08:00
committed by wenlingz
parent c0554f9d99
commit 3f4ea38158
66 changed files with 594 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
misc/config_tools/data/nuc11tnbi5/hybrid.xml
View File

@@ -119,8 +119,8 @@
</mmio_resources>
</vm>
<vm id="1">
<vm_type>SOS_VM</vm_type>
<name>ACRN SOS VM</name>
<vm_type>SERVICE_VM</vm_type>
<name>ACRN Service VM</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
@@ -146,13 +146,13 @@
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
<base>SOS_COM1_BASE</base>
<irq>SOS_COM1_IRQ</irq>
<base>SERVICE_VM_COM1_BASE</base>
<irq>SERVICE_VM_COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>SOS_COM2_BASE</base>
<irq>SOS_COM2_IRQ</irq>
<base>SERVICE_VM_COM2_BASE</base>
<irq>SERVICE_VM_COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>

28
misc/config_tools/data/nuc11tnbi5/hybrid_launch_2uos.xml
View File

@@ -1,14 +1,14 @@
<acrn-config board="nuc11tnbi5" scenario="hybrid" uos_launcher="2">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>
<mem_size desc="UOS memory size in MByte">4096</mem_size>
<user_vm id="1">
<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>
<mem_size desc="User VM memory size in MByte">4096</mem_size>
<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
<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 uos"></poweroff_channel>
<poweroff_channel desc="the method of power off User VM"></poweroff_channel>
<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 uos">n</enable_ptm>
<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"></usb_xhci>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
<pcpu_id></pcpu_id>
@@ -41,17 +41,17 @@
<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./win10-ltsc.img</block>
<console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]"></console>
</virtio_devices>
</uos>
<uos id="2">
<uos_type desc="UOS type">YOCTO</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>
<mem_size desc="UOS memory size in MByte">512</mem_size>
</user_vm>
<user_vm id="2">
<user_vm_type desc="User VM type">YOCTO</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>
<mem_size desc="User VM memory size in MByte">512</mem_size>
<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
<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 uos" />
<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 uos">n</enable_ptm>
<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.">
<pcpu_id />
@@ -83,5 +83,5 @@
<input desc="virtio input device" />
<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
</virtio_devices>
</uos>
</user_vm>
</acrn-config>

12
misc/config_tools/data/nuc11tnbi5/shared.xml
View File

@@ -61,8 +61,8 @@
</MISC_CFG>
</hv>
<vm id="0">
<vm_type>SOS_VM</vm_type>
<name>ACRN SOS VM</name>
<vm_type>SERVICE_VM</vm_type>
<name>ACRN Service VM</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
@@ -82,13 +82,13 @@
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
<base>SOS_COM1_BASE</base>
<irq>SOS_COM1_IRQ</irq>
<base>SERVICE_VM_COM1_BASE</base>
<irq>SERVICE_VM_COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>SOS_COM2_BASE</base>
<irq>SOS_COM2_IRQ</irq>
<base>SERVICE_VM_COM2_BASE</base>
<irq>SERVICE_VM_COM2_IRQ</irq>
<target_vm_id>2</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>

84
misc/config_tools/data/nuc11tnbi5/shared_launch_6uos.xml
View File

@@ -1,14 +1,14 @@
<acrn-config board="nuc11tnbi5" scenario="shared" uos_launcher="6">
<uos id="1">
<uos_type desc="UOS type">WINDOWS</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>
<mem_size desc="UOS memory size in MByte">4096</mem_size>
<user_vm id="1">
<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>
<mem_size desc="User VM memory size in MByte">4096</mem_size>
<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
<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 uos"></poweroff_channel>
<poweroff_channel desc="the method of power off User VM"></poweroff_channel>
<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 uos">n</enable_ptm>
<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"></usb_xhci>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
<pcpu_id></pcpu_id>
@@ -41,17 +41,17 @@
<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./win10-ltsc.img</block>
<console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]"></console>
</virtio_devices>
</uos>
</user_vm>
<uos id="2">
<uos_type desc="UOS type">PREEMPT-RT LINUX</uos_type>
<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>
<mem_size desc="UOS memory size in MByte">1024</mem_size>
<user_vm id="2">
<user_vm_type desc="User VM type">PREEMPT-RT LINUX</user_vm_type>
<rtos_type desc="User VM Realtime capability">Hard RT</rtos_type>
<mem_size desc="User VM memory size in MByte">1024</mem_size>
<gvt_args configurable="0" desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
<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 uos"></poweroff_channel>
<enable_ptm desc="enable ptm of uos">n</enable_ptm>
<poweroff_channel desc="the method of power off User VM"></poweroff_channel>
<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"></usb_xhci>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@@ -85,17 +85,17 @@
<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./core-image-weston-intel-corei7-64.wic</block>
<console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]">@stdio:stdio_port</console>
</virtio_devices>
</uos>
<uos id="3">
<uos_type desc="UOS type">YOCTO</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>
<mem_size desc="UOS memory size in MByte">512</mem_size>
</user_vm>
<user_vm id="3">
<user_vm_type desc="User VM type">YOCTO</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>
<mem_size desc="User VM memory size in MByte">512</mem_size>
<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
<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 uos" />
<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 uos">n</enable_ptm>
<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.">
<pcpu_id />
@@ -127,17 +127,17 @@
<input desc="virtio input device" />
<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
</virtio_devices>
</uos>
<uos id="4">
<uos_type desc="UOS type">YOCTO</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>
<mem_size desc="UOS memory size in MByte">512</mem_size>
</user_vm>
<user_vm id="4">
<user_vm_type desc="User VM type">YOCTO</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>
<mem_size desc="User VM memory size in MByte">512</mem_size>
<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
<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 uos" />
<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 uos">n</enable_ptm>
<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.">
<pcpu_id />
@@ -169,17 +169,17 @@
<input desc="virtio input device" />
<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
</virtio_devices>
</uos>
<uos id="5">
<uos_type desc="UOS type">YOCTO</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>
<mem_size desc="UOS memory size in MByte">512</mem_size>
</user_vm>
<user_vm id="5">
<user_vm_type desc="User VM type">YOCTO</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>
<mem_size desc="User VM memory size in MByte">512</mem_size>
<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
<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 uos" />
<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 uos">n</enable_ptm>
<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.">
<pcpu_id />
@@ -211,17 +211,17 @@
<input desc="virtio input device" />
<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
</virtio_devices>
</uos>
<uos id="6">
<uos_type desc="UOS type">YOCTO</uos_type>
<rtos_type desc="UOS Realtime capability">no</rtos_type>
<mem_size desc="UOS memory size in MByte">512</mem_size>
</user_vm>
<user_vm id="6">
<user_vm_type desc="User VM type">YOCTO</user_vm_type>
<rtos_type desc="User VM Realtime capability">no</rtos_type>
<mem_size desc="User VM memory size in MByte">512</mem_size>
<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
<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 uos" />
<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 uos">n</enable_ptm>
<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.">
<pcpu_id />
@@ -253,5 +253,5 @@
<input desc="virtio input device" />
<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
</virtio_devices>
</uos>
</user_vm>
</acrn-config>