config tool: remove guest flag for scenario xml

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

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>
@@ -169,9 +162,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>
@@ -208,9 +198,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>

View File

@@ -19,7 +19,6 @@
<CDP_ENABLED>n</CDP_ENABLED>
<VCAT_ENABLED>n</VCAT_ENABLED>
</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>
@@ -63,10 +62,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>6</pcpu_id>
<pcpu_id>7</pcpu_id>
@@ -127,9 +123,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>
<vcpu_clos>0</vcpu_clos>
@@ -184,9 +177,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>1</pcpu_id>
<pcpu_id>2</pcpu_id>
@@ -227,9 +217,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>4</pcpu_id>
<pcpu_id>5</pcpu_id>

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>

View File

@@ -19,7 +19,6 @@
<CDP_ENABLED>n</CDP_ENABLED>
<VCAT_ENABLED>n</VCAT_ENABLED>
</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>
@@ -50,9 +49,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>
@@ -96,9 +92,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>
@@ -136,9 +129,6 @@
<vm_type>RTVM</vm_type>
<load_order>POST_LAUNCHED_VM</load_order>
<name>POST_RT_VM1</name>
<guest_flags>
<guest_flag>0</guest_flag>
</guest_flags>
<cpu_affinity>
<pcpu_id>2</pcpu_id>
<pcpu_id>3</pcpu_id>
@@ -177,9 +167,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>
@@ -218,9 +205,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>
@@ -259,9 +243,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>
@@ -300,9 +281,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>