From 5b49af24358f8389ac605e5ce6e95d82efe96f3e Mon Sep 17 00:00:00 2001 From: Weiyi Feng Date: Wed, 22 Jun 2022 16:08:46 +0800 Subject: [PATCH] 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 --- .../packages/configurator/src/lib/acrn.ts | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/misc/config_tools/configurator/packages/configurator/src/lib/acrn.ts b/misc/config_tools/configurator/packages/configurator/src/lib/acrn.ts index 55e987b13..000522dbc 100644 --- a/misc/config_tools/configurator/packages/configurator/src/lib/acrn.ts +++ b/misc/config_tools/configurator/packages/configurator/src/lib/acrn.ts @@ -460,7 +460,7 @@ class CAT { getRTCoreData(regionData): Policy[] { let RTCoreData: Policy[] = []; this.scenario.vm.map(vmConfig => { - if (this.haveCPUAffinity(vmConfig)) { + if (vmConfig.vm_type === 'RTVM' && this.haveCPUAffinity(vmConfig)) { vmConfig.cpu_affinity.pcpu.map( (pcpu, index) => { if ( @@ -492,17 +492,17 @@ class CAT { if (this.haveCPUAffinity(vmConfig)) { vmConfig.cpu_affinity.pcpu.map( (pcpu, index) => { - if ( - regionData.processors.indexOf(pcpu.pcpu_id) !== -1 && ( - !pcpu.hasOwnProperty('real_time_vcpu') || - pcpu.real_time_vcpu === 'n' - ) - ) { - if (!this.switches.CDP_ENABLED) { - StandardData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, 'Unified', regionData.capacity_mask_length)) - } else { - StandardData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, "Code", regionData.capacity_mask_length)) - StandardData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, "Data", regionData.capacity_mask_length)) + if (regionData.processors.indexOf(pcpu.pcpu_id) !== -1) { + if (!pcpu.hasOwnProperty('real_time_vcpu') || + (pcpu.real_time_vcpu === 'n') || + (pcpu.real_time_vcpu === 'y' && vmConfig.vm_type !== 'RTVM') + ) { + if (!this.switches.CDP_ENABLED) { + StandardData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, 'Unified', regionData.capacity_mask_length)) + } else { + StandardData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, "Code", regionData.capacity_mask_length)) + StandardData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, "Data", regionData.capacity_mask_length)) + } } } })