OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

acrn-config: refinemen config xmls for hybrid rt 

1.Refine cpu affinity in hybrid rt xmls for whl-ipc-i5/7
2.Refine guest flag for hybrid rt xmls for whl-ipc-i5/7

Tracked-On: #5081
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Wei Liu 2020-07-25 17:17:40 +08:00 committed by wenlingz
parent 9305a8637c
commit 9f3251417f
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
misc/acrn-config/library/common.py
View File

@ -216,10 +216,9 @@ def find_tmp_flag(flag):
if flag == None or flag == '0': if flag == None or flag == '0':
return '0UL' return '0UL'
flag_str = ''
for i in range(len(GUEST_FLAG)): for i in range(len(GUEST_FLAG)):
if flag == GUEST_FLAG[i]: if flag == GUEST_FLAG[i]:
return flag_str return flag
def get_config_root(config_file): def get_config_root(config_file):

3
misc/acrn-config/xmls/config-xmls/template/PRE_RT_VM.xml
View File

@ -3,7 +3,8 @@
<vm_type desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM." readonly="true">PRE_RT_VM</vm_type> <vm_type desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM." readonly="true">PRE_RT_VM</vm_type>
<name desc="Specify the VM name which will be shown in hypervisor console command: vm_list."></name> <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list."></name>
<guest_flags desc="Select all applicable flags for the VM" multiselect="true"> <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
<guest_flag></guest_flag> <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
<guest_flag>GUEST_FLAG_RT</guest_flag>
</guest_flags> </guest_flags>
<cpu_affinity desc="List of pCPU: the guest VM is allowed to create vCPU from all or a subset of this list."> <cpu_affinity desc="List of pCPU: the guest VM is allowed to create vCPU from all or a subset of this list.">
<pcpu_id></pcpu_id> <pcpu_id></pcpu_id>

6
misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml
View File

@ -56,9 +56,11 @@
<vm_type desc="Specify the VM type" readonly="true">PRE_RT_VM</vm_type> <vm_type desc="Specify the VM type" readonly="true">PRE_RT_VM</vm_type>
<name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name> <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
<guest_flags desc="Select all applicable flags for the VM" multiselect="true"> <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
<guest_flag>0</guest_flag> <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
<guest_flag>GUEST_FLAG_RT</guest_flag>
</guest_flags> </guest_flags>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to."> <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
<pcpu_id>2</pcpu_id>
<pcpu_id>3</pcpu_id> <pcpu_id>3</pcpu_id>
</cpu_affinity> </cpu_affinity>
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution."> <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
@ -147,7 +149,7 @@
<guest_flag>0</guest_flag> <guest_flag>0</guest_flag>
</guest_flags> </guest_flags>
<cpu_affinity desc="List of pCPU: the guest VM is allowed to create vCPU from all or a subset of this list."> <cpu_affinity desc="List of pCPU: the guest VM is allowed to create vCPU from all or a subset of this list.">
<pcpu_id>2</pcpu_id> <pcpu_id>1</pcpu_id>
</cpu_affinity> </cpu_affinity>
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution."> <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
<vcpu_clos>0</vcpu_clos> <vcpu_clos>0</vcpu_clos>

6
misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml
View File

@ -56,9 +56,11 @@
<vm_type desc="Specify the VM type" readonly="true">PRE_RT_VM</vm_type> <vm_type desc="Specify the VM type" readonly="true">PRE_RT_VM</vm_type>
<name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name> <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
<guest_flags desc="Select all applicable flags for the VM" multiselect="true"> <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
<guest_flag>0</guest_flag> <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
<guest_flag>GUEST_FLAG_RT</guest_flag>
</guest_flags> </guest_flags>
<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to."> <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
<pcpu_id>2</pcpu_id>
<pcpu_id>3</pcpu_id> <pcpu_id>3</pcpu_id>
</cpu_affinity> </cpu_affinity>
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution."> <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
@ -147,7 +149,7 @@
<guest_flag>0</guest_flag> <guest_flag>0</guest_flag>
</guest_flags> </guest_flags>
<cpu_affinity desc="List of pCPU: the guest VM is allowed to create vCPU from all or a subset of this list."> <cpu_affinity desc="List of pCPU: the guest VM is allowed to create vCPU from all or a subset of this list.">
<pcpu_id>2</pcpu_id> <pcpu_id>1</pcpu_id>
</cpu_affinity> </cpu_affinity>
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution."> <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
<vcpu_clos>0</vcpu_clos> <vcpu_clos>0</vcpu_clos>