Skip to content

Commit c3473b5

Browse files
junjiemao1wenlingz
authored andcommitted
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 <[email protected]>
1 parent e678dc8 commit c3473b5

File tree

2 files changed

+1
-23
lines changed

2 files changed

+1
-23
lines changed

misc/config_tools/schema/config.xsd

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -400,11 +400,6 @@ Refer SDM 17.19.2 for details, and use with caution.</xs:documentation>
400400
<xs:documentation>Specify memory information for Service and User VMs.</xs:documentation>
401401
</xs:annotation>
402402
</xs:element>
403-
<xs:element name="priority" type="PriorityType" default="PRIO_LOW">
404-
<xs:annotation>
405-
<xs:documentation>Specify the VM vCPU priority for scheduling.</xs:documentation>
406-
</xs:annotation>
407-
</xs:element>
408403
<xs:element name="os_config" type="OSConfigurations" minOccurs="0">
409404
<xs:annotation>
410405
<xs:documentation>General information for host kernel, boot

misc/config_tools/schema/types.xsd

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ higher value (lower severity) are discarded.</xs:documentation>
101101

102102
<xs:simpleType name="SchedulerType">
103103
<xs:annotation>
104-
<xs:documentation>Four scheduler options are supported:
104+
<xs:documentation>Three scheduler options are supported:
105105

106106
- ``SCHED_NOOP``: The NOOP (No-Operation) scheduler means there is a
107107
strict 1 to 1 mapping between vCPUs and pCPUs.
@@ -113,30 +113,13 @@ higher value (lower severity) are discarded.</xs:documentation>
113113
earliest effective virtual time. *TODO: BVT scheduler will be built on
114114
top of a prioritized scheduling mechanism, i.e. higher priority threads
115115
get scheduled first, and same priority tasks are scheduled per BVT.*
116-
- ``SCHED_PRIO``: The priority based scheduler. vCPU scheduling will be based on
117-
their pre-configured priorities.
118116

119117
Read more about the available scheduling options in :ref:`cpu_sharing`.</xs:documentation>
120118
</xs:annotation>
121119
<xs:restriction base="xs:string">
122120
<xs:enumeration value="SCHED_NOOP" />
123121
<xs:enumeration value="SCHED_IORR" />
124122
<xs:enumeration value="SCHED_BVT" />
125-
<xs:enumeration value="SCHED_PRIO" />
126-
</xs:restriction>
127-
</xs:simpleType>
128-
129-
<xs:simpleType name="PriorityType">
130-
<xs:annotation>
131-
<xs:documentation>Two priorities are supported for priority based scheduler:
132-
133-
- ``PRIO_LOW``: low priority for vCPU scheduling.
134-
- ``PRIO_HIGH``: high priority for vCPU scheduling.
135-
</xs:documentation>
136-
</xs:annotation>
137-
<xs:restriction base="xs:string">
138-
<xs:enumeration value="PRIO_LOW" />
139-
<xs:enumeration value="PRIO_HIGH" />
140123
</xs:restriction>
141124
</xs:simpleType>
142125

0 commit comments

Comments
 (0)