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

config tool: remove guest flag for scenario xml

Browse Source 
remove guest flags and add lapic_passthrough field

Tracked-On: #6690
Signed-off-by: hangliu1 <hang1.liu@linux.intel.com>
This commit is contained in:
hangliu1
2022-02-21 21:28:21 -05:00
committed by acrnsi-robot
parent 0068d4e826
commit c2695f290d
20 changed files with 6 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
misc/config_tools/data/generic_board/hybrid.xml
View File

@@ -27,7 +27,6 @@
<CLOS_MASK>0xfffff</CLOS_MASK>
<CLOS_MASK>0xfffff</CLOS_MASK>
</RDT>
<NVMX_ENABLED>n</NVMX_ENABLED>
<HYPERV_ENABLED>y</HYPERV_ENABLED>
<IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
<ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>PRE_LAUNCHED_VM</load_order>
<name>SAFETY_VM0</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>3</pcpu_id>
</cpu_affinity>
@@ -116,9 +112,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>SERVICE_VM</load_order>
<name>ACRN_Service_VM</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>0</pcpu_id>
<pcpu_id>1</pcpu_id>
@@ -168,9 +161,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>POST_LAUNCHED_VM</load_order>
<name>POST_STD_VM1</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>2</pcpu_id>
</cpu_affinity>
@@ -207,9 +197,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>POST_LAUNCHED_VM</load_order>
<name>POST_STD_VM2</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>2</pcpu_id>
</cpu_affinity>

15
misc/config_tools/data/generic_board/hybrid_rt.xml
View File

@@ -32,7 +32,6 @@
<CLOS_MASK>0xfff</CLOS_MASK>
<CLOS_MASK>0xfff</CLOS_MASK>
</RDT>
<NVMX_ENABLED>n</NVMX_ENABLED>
<HYPERV_ENABLED>y</HYPERV_ENABLED>
<IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
<ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -76,10 +75,7 @@
<vm_type>RTVM</vm_type>
<load_order>PRE_LAUNCHED_VM</load_order>
<name>PRE_RT_VM0</name>
<guest_flags>
<guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
<guest_flag>GUEST_FLAG_RT</guest_flag>
</guest_flags>
<lapic_passthrough>y</lapic_passthrough>
<cpu_affinity>
<pcpu_id>2</pcpu_id>
<pcpu_id>3</pcpu_id>
@@ -137,9 +133,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>SERVICE_VM</load_order>
<name>ACRN_Service_VM</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>0</pcpu_id>
<pcpu_id>1</pcpu_id>
@@ -187,9 +180,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>POST_LAUNCHED_VM</load_order>
<name>POST_STD_VM1</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>0</pcpu_id>
<pcpu_id>1</pcpu_id>
@@ -228,9 +218,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>POST_LAUNCHED_VM</load_order>
<name>POST_STD_VM2</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>1</pcpu_id>
</cpu_affinity>

7
misc/config_tools/data/generic_board/partitioned.xml
View File

@@ -27,7 +27,6 @@
<CLOS_MASK>0xfffff</CLOS_MASK>
<CLOS_MASK>0xfffff</CLOS_MASK>
</RDT>
<NVMX_ENABLED>n</NVMX_ENABLED>
<HYPERV_ENABLED>y</HYPERV_ENABLED>
<IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
<ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>PRE_LAUNCHED_VM</load_order>
<name>PRE_STD_VM0</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>0</pcpu_id>
<pcpu_id>2</pcpu_id>
@@ -119,9 +115,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>PRE_LAUNCHED_VM</load_order>
<name>PRE_STD_VM1</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>1</pcpu_id>
<pcpu_id>3</pcpu_id>

24
misc/config_tools/data/generic_board/shared.xml
View File

@@ -27,7 +27,6 @@
<CLOS_MASK>0xfffff</CLOS_MASK>
<CLOS_MASK>0xfffff</CLOS_MASK>
</RDT>
<NVMX_ENABLED>n</NVMX_ENABLED>
<HYPERV_ENABLED>y</HYPERV_ENABLED>
<IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
<ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>SERVICE_VM</load_order>
<name>ACRN_Service_VM</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
@@ -103,9 +99,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>POST_LAUNCHED_VM</load_order>
<name>POST_STD_VM1</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>0</pcpu_id>
<pcpu_id>1</pcpu_id>
@@ -144,10 +137,7 @@
<vm_type>RTVM</vm_type>
<load_order>POST_LAUNCHED_VM</load_order>
<name>POST_RT_VM1</name>
<guest_flags>
<guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
<guest_flag>GUEST_FLAG_RT</guest_flag>
</guest_flags>
<lapic_passthrough>y</lapic_passthrough>
<cpu_affinity>
<pcpu_id>2</pcpu_id>
<pcpu_id>3</pcpu_id>
@@ -186,9 +176,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>POST_LAUNCHED_VM</load_order>
<name>POST_STD_VM2</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>0</pcpu_id>
<pcpu_id>1</pcpu_id>
@@ -227,9 +214,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>POST_LAUNCHED_VM</load_order>
<name>POST_STD_VM3</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>0</pcpu_id>
<pcpu_id>1</pcpu_id>
@@ -268,9 +252,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>POST_LAUNCHED_VM</load_order>
<name>POST_STD_VM4</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>0</pcpu_id>
<pcpu_id>1</pcpu_id>
@@ -309,9 +290,6 @@
<vm_type>STANDARD_VM</vm_type>
<load_order>POST_LAUNCHED_VM</load_order>
<name>POST_STD_VM5</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>0</pcpu_id>
<pcpu_id>1</pcpu_id>