From c3473b589c061605580becd7bde4f1fbe7a47060 Mon Sep 17 00:00:00 2001
From: Junjie Mao <junjie.mao@intel.com>
Date: Wed, 29 Sep 2021 11:40:00 +0800
Subject: [PATCH] config_tools: schema: revert to old schema

Commit e678dc8 ("doc: pick doc updates for v2.6 release") picked the latest
scenario XML schema from the main branch, which includes both documentation
changes and new configuration entries. These new entries cause build
failures of the release branch because those new entries do not exist in
the scenario XMLs of v2.6 and the default value populator is yet to be
added for v2.7.

This patch removes those new entries to unblock the build.

Tracked-On: #5692
Signed-off-by: Junjie Mao <junjie.mao@intel.com>
---
 misc/config_tools/schema/config.xsd |  5 -----
 misc/config_tools/schema/types.xsd  | 19 +------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd
index 91ebcaa7d..367b5c92f 100644
--- a/misc/config_tools/schema/config.xsd
+++ b/misc/config_tools/schema/config.xsd
@@ -400,11 +400,6 @@ Refer SDM 17.19.2 for details, and use with caution.</xs:documentation>
         <xs:documentation>Specify memory information for Service and User VMs.</xs:documentation>
       </xs:annotation>
     </xs:element>
-    <xs:element name="priority" type="PriorityType"  default="PRIO_LOW">
-      <xs:annotation>
-        <xs:documentation>Specify the VM vCPU priority for scheduling.</xs:documentation>
-      </xs:annotation>
-    </xs:element>
     <xs:element name="os_config" type="OSConfigurations" minOccurs="0">
       <xs:annotation>
         <xs:documentation>General information for host kernel, boot
diff --git a/misc/config_tools/schema/types.xsd b/misc/config_tools/schema/types.xsd
index f00c7eb25..3de5dc004 100644
--- a/misc/config_tools/schema/types.xsd
+++ b/misc/config_tools/schema/types.xsd
@@ -101,7 +101,7 @@ higher value (lower severity) are discarded.</xs:documentation>
 
 <xs:simpleType name="SchedulerType">
   <xs:annotation>
-    <xs:documentation>Four scheduler options are supported:
+    <xs:documentation>Three scheduler options are supported:
 
 - ``SCHED_NOOP``: The NOOP (No-Operation) scheduler means there is a
   strict 1 to 1 mapping between vCPUs and pCPUs.
@@ -113,8 +113,6 @@ higher value (lower severity) are discarded.</xs:documentation>
   earliest effective virtual time. *TODO: BVT scheduler will be built on
   top of a prioritized scheduling mechanism, i.e. higher priority threads
   get scheduled first, and same priority tasks are scheduled per BVT.*
-- ``SCHED_PRIO``: The priority based scheduler. vCPU scheduling will be based on
-  their pre-configured priorities.
 
 Read more about the available scheduling options in :ref:`cpu_sharing`.</xs:documentation>
   </xs:annotation>
@@ -122,21 +120,6 @@ Read more about the available scheduling options in :ref:`cpu_sharing`.</xs:docu
     <xs:enumeration value="SCHED_NOOP" />
     <xs:enumeration value="SCHED_IORR" />
     <xs:enumeration value="SCHED_BVT" />
-    <xs:enumeration value="SCHED_PRIO" />
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="PriorityType">
-  <xs:annotation>
-    <xs:documentation>Two priorities are supported for priority based scheduler:
-
-- ``PRIO_LOW``: low priority for vCPU scheduling.
-- ``PRIO_HIGH``: high priority for vCPU scheduling.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:string">
-    <xs:enumeration value="PRIO_LOW" />
-    <xs:enumeration value="PRIO_HIGH" />
   </xs:restriction>
 </xs:simpleType>