config_tools: fix CAT data can not be load back issue

fix CAT data can not be load back issue

Tracked-On: #6691
Signed-off-by: Weiyi Feng <fwy1998@gmail.com>
Signed-off-by: Weiyi Feng <weiyix.feng@intel.com>
This commit is contained in:
Weiyi Feng 2022-07-25 22:18:17 +08:00 committed by acrnsi-robot
parent 49d6a909cd
commit 715a597e37
1 changed files with 7 additions and 6 deletions

View File

@ -392,7 +392,7 @@ class CAT {
return preLaunchedVMCPUs; return preLaunchedVMCPUs;
} }
newPolicy(CACHE_ID, CACHE_LEVEL, vmConfig, VCPU, TYPE: PolicyType, maxLength): Policy { newPolicy(CACHE_LEVEL, CACHE_ID, vmConfig, VCPU, TYPE: PolicyType, maxLength): Policy {
let originPolicy = { let originPolicy = {
VM: vmConfig.name, VM: vmConfig.name,
VCPU, TYPE, VCPU, TYPE,
@ -587,19 +587,20 @@ class CAT {
// noinspection JSUnresolvedVariable // noinspection JSUnresolvedVariable
if ( if (
hv !== null && hv !== null &&
hv.hasOwnProperty('CACHE_ALLOCATION') && hv.hasOwnProperty('CACHE_REGION') &&
_.isArray(hv.CACHE_ALLOCATION) hv.CACHE_REGION.hasOwnProperty('CACHE_ALLOCATION') &&
_.isArray(hv.CACHE_REGION.CACHE_ALLOCATION)
) { ) {
// noinspection JSUnresolvedVariable // noinspection JSUnresolvedVariable
hv.CACHE_ALLOCATION.map((cache_region) => { hv.CACHE_REGION.CACHE_ALLOCATION.map((cache_region) => {
if ( if (
cache_region.hasOwnProperty('POLICY') && cache_region.hasOwnProperty('POLICY') &&
cache_region.POLICY.length > 0 cache_region.POLICY.length > 0
) { ) {
cache_region.POLICY.map(policy => { cache_region.POLICY.map(policy => {
scenarioCATData.push({ scenarioCATData.push({
CACHE_ID: cache_region.id, CACHE_ID: cache_region.CACHE_ID,
CACHE_LEVEL: cache_region.level, CACHE_LEVEL: cache_region.CACHE_LEVEL,
CLOS_MASK: policy.CLOS_MASK, CLOS_MASK: policy.CLOS_MASK,
META: {vmid: this.vmIDs[policy.VM]}, META: {vmid: this.vmIDs[policy.VM]},
TYPE: policy.TYPE, TYPE: policy.TYPE,