config_tools: set CAT's standard vm RTCore to standard group

set CAT's standard vm RTCore to standard group

Tracked-On: #6691
Signed-off-by: Weiyi Feng <weiyix.feng@intel.com>
This commit is contained in:
Weiyi Feng 2022-06-22 16:08:46 +08:00 committed by acrnsi-robot
parent 342e8c05f6
commit 92f5c67af6

View File

@ -460,7 +460,7 @@ class CAT {
getRTCoreData(regionData): Policy[] { getRTCoreData(regionData): Policy[] {
let RTCoreData: Policy[] = []; let RTCoreData: Policy[] = [];
this.scenario.vm.map(vmConfig => { this.scenario.vm.map(vmConfig => {
if (this.haveCPUAffinity(vmConfig)) { if (vmConfig.vm_type === 'RTVM' && this.haveCPUAffinity(vmConfig)) {
vmConfig.cpu_affinity.pcpu.map( vmConfig.cpu_affinity.pcpu.map(
(pcpu, index) => { (pcpu, index) => {
if ( if (
@ -492,11 +492,10 @@ class CAT {
if (this.haveCPUAffinity(vmConfig)) { if (this.haveCPUAffinity(vmConfig)) {
vmConfig.cpu_affinity.pcpu.map( vmConfig.cpu_affinity.pcpu.map(
(pcpu, index) => { (pcpu, index) => {
if ( if (regionData.processors.indexOf(pcpu.pcpu_id) !== -1) {
regionData.processors.indexOf(pcpu.pcpu_id) !== -1 && ( if (!pcpu.hasOwnProperty('real_time_vcpu') ||
!pcpu.hasOwnProperty('real_time_vcpu') || (pcpu.real_time_vcpu === 'n') ||
pcpu.real_time_vcpu === 'n' (pcpu.real_time_vcpu === 'y' && vmConfig.vm_type !== 'RTVM')
)
) { ) {
if (!this.switches.CDP_ENABLED) { if (!this.switches.CDP_ENABLED) {
StandardData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, 'Unified', regionData.capacity_mask_length)) StandardData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, 'Unified', regionData.capacity_mask_length))
@ -505,6 +504,7 @@ class CAT {
StandardData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, "Data", regionData.capacity_mask_length)) StandardData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, "Data", regionData.capacity_mask_length))
} }
} }
}
}) })
} }
}) })