github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-01-05 07:35:31 +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

2
hypervisor/include/arch/x86/asm/vm_config.h
View File

@@ -37,7 +37,7 @@
#define MAX_MMIO_DEV_NUM 2U
#define CONFIG_SOS_VM .load_order = SOS_VM, \
#define CONFIG_SERVICE_VM .load_order = SERVICE_VM, \
.uuid = SERVICE_VM_UUID, \
.severity = SEVERITY_SERVICE_VM

5
hypervisor/include/public/acrn_common.h
View File

@@ -211,8 +211,7 @@ struct acrn_pci_request {
* | | | |
* | | | - Fill in type, |
* | | | addr, etc. |
* | | | - Pause User VM |
* | | | vCPU y |
* | | | - Pause User VM vCPU |
* | | | - Set state to |
* | | | PENDING (a) |
* | | | - Fire upcall to |
@@ -587,7 +586,7 @@ struct acrn_intr_monitor {
*/
enum acrn_vm_load_order {
PRE_LAUNCHED_VM = 0,
SOS_VM,
SERVICE_VM,
POST_LAUNCHED_VM, /* Launched by Devicemodel in Service VM */
MAX_LOAD_ORDER
};