From d71b552071ea0572f172ba459ce6dff446eb1a7b Mon Sep 17 00:00:00 2001
From: "David B. Kinder" <david.b.kinder@intel.com>
Date: Fri, 10 Jun 2022 12:16:53 -0700
Subject: [PATCH] configurator: Remove duplicate vCPU assignment error message

Remove duplicate assertion and improve message text.

Tracked-On: #7745

Signed-off-by: David B. Kinder <david.b.kinder@intel.com>
---
 misc/config_tools/schema/checks/cpu_assignment.xsd | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/misc/config_tools/schema/checks/cpu_assignment.xsd b/misc/config_tools/schema/checks/cpu_assignment.xsd
index 0af953674..9a8f28b24 100644
--- a/misc/config_tools/schema/checks/cpu_assignment.xsd
+++ b/misc/config_tools/schema/checks/cpu_assignment.xsd
@@ -5,12 +5,6 @@
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            xmlns:acrn="https://projectacrn.org">
 
-  <xs:assert test="every $vm in /acrn-config/vm[load_order != 'SERVICE_VM'] satisfies count($vm//cpu_affinity//pcpu_id) &gt;= 1">
-    <xs:annotation acrn:severity="error" acrn:report-on="$vm//cpu_affinity">
-      <xs:documentation>VM "{$vm/name}" needs at least one vCPU assigned.</xs:documentation>
-    </xs:annotation>
-  </xs:assert>
-
   <xs:assert test="every $cpu in vm//cpu_affinity//pcpu_id satisfies count(processors//thread[cpu_id = $cpu]) = 1">
     <xs:annotation acrn:severity="warning" acrn:report-on="$cpu">
       <xs:documentation>The physical CPU {$cpu} allocated to VM "{$cpu/ancestor::vm/name}" does not exist on the target board. Remove this CPU from the CPU affinity setting.</xs:documentation>
@@ -34,7 +28,7 @@
   <xs:assert test="every $vm in /acrn-config/vm[load_order != 'SERVICE_VM'] satisfies
 	  count(/acrn-config/vm/cpu_affinity/pcpu/pcpu_id) > 0">
   <xs:annotation acrn:severity="error" acrn:report-on="//vm//cpu_affinity/pcpu">
-      <xs:documentation>At least one physical CPU must be allocated to 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:assert>