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

config-tools: fix assertions against scenario XML 

This patch fixes the following issues in the existing scenario schema
assertions:

  1. The assertion that ensures the existence of pCPU affinity in all
     pre- and post-launched VMs does not count the pCPU settings under a
     VM properly.

  2. The assertion that ensures the presence of CAT settings of a defined
     VM is no longer needed as it was originally designed to capture
     configurator issues.

Tracked-On: #6690
Signed-off-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Junjie Mao 2022-06-22 11:51:59 +08:00 committed by acrnsi-robot
parent d43a141f85
commit 40225337d2
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/config_tools/schema/checks/cpu_assignment.xsd
View File

@ -26,8 +26,8 @@
</xs:assert> </xs:assert>
<xs:assert test="every $vm in /acrn-config/vm[load_order != 'SERVICE_VM'] satisfies <xs:assert test="every $vm in /acrn-config/vm[load_order != 'SERVICE_VM'] satisfies
count(/acrn-config/vm/cpu_affinity/pcpu/pcpu_id) > 0"> count($vm/cpu_affinity/pcpu[pcpu_id != '']) > 0">
<xs:annotation acrn:severity="error" acrn:report-on="//vm//cpu_affinity/pcpu"> <xs:annotation acrn:severity="error" acrn:report-on="$vm/cpu_affinity">
<xs:documentation>Assign at least one physical CPU affinity (pCPU ID) for VM "{$vm/name}".</xs:documentation> <xs:documentation>Assign at least one physical CPU affinity (pCPU ID) for VM "{$vm/name}".</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:assert> </xs:assert>

9
misc/config_tools/schema/checks/rdt_support.xsd
View File

@ -53,13 +53,4 @@ This error cannot be fixed by adjusting the configuration. Report a `GitHub issu
</xs:annotation> </xs:annotation>
</xs:assert> </xs:assert>
<xs:assert test="every $vm_name in //vm/name satisfies
if (//RDT_ENABLED = 'y')
then count(//POLICY/VM[text() = $vm_name]) > 0
else true()">
<xs:annotation acrn:severity="error" acrn:report-on="/acrn-config/hv/CACHE_REGION">
<xs:documentation>Need config the CLOS MASK for VM '{$vm_name}''.</xs:documentation>
</xs:annotation>
</xs:assert>
</xs:schema> </xs:schema>