From 74f51961cad550ba82c0d41eac650b4bb136ac43 Mon Sep 17 00:00:00 2001 From: zhanghongyuan Date: Mon, 20 Apr 2026 16:38:16 +0800 Subject: [PATCH] fix(cpu): hide CPU cache information display MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Comment out L1d, L1i, L2, L3, L4 cache information to avoid displaying incorrect or unavailable cache data. 注释掉 CPU 缓存信息显示，避免显示不正确或不可用的缓存数据。 Log: 隐藏 CPU 缓存信息显示 PMS: BUG-357397 Influence: CPU 信息页面不再显示 L1-L4 缓存信息，避免显示不准确的数据。 --- .../src/DeviceManager/DeviceCpu.cpp | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp b/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp index 9e2b0b48..603a611f 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -235,11 +235,11 @@ void DeviceCpu::setInfoFromLscpu(const QMap &mapInfo) setAttribute(mapInfo, "CPU MHz", m_CurFrequency); setAttribute(mapInfo, "model", m_Model); setAttribute(mapInfo, "stepping", m_Step); - setAttribute(mapInfo, "L1d cache", m_CacheL1Data); - setAttribute(mapInfo, "L1i cache", m_CacheL1Order); - setAttribute(mapInfo, "L2 cache", m_CacheL2); - setAttribute(mapInfo, "L3 cache", m_CacheL3); - setAttribute(mapInfo, "L4 cache", m_CacheL4); + // setAttribute(mapInfo, "L1d cache", m_CacheL1Data); + // setAttribute(mapInfo, "L1i cache", m_CacheL1Order); + // setAttribute(mapInfo, "L2 cache", m_CacheL2); + // setAttribute(mapInfo, "L3 cache", m_CacheL3); + // setAttribute(mapInfo, "L4 cache", m_CacheL4); setAttribute(mapInfo, "flags", m_Flags); setAttribute(mapInfo, "Virtualization", m_HardwareVirtual); @@ -351,11 +351,11 @@ TomlFixMethod DeviceCpu::setInfoFromTomlOneByOne(const QMap &m setTomlAttribute(mapInfo, "Virtualization", m_HardwareVirtual); setTomlAttribute(mapInfo, "Flags", m_Flags); setTomlAttribute(mapInfo, "Extensions", m_Extensions); - setTomlAttribute(mapInfo, "L4 Cache", m_CacheL4); - setTomlAttribute(mapInfo, "L3 Cache", m_CacheL3); - setTomlAttribute(mapInfo, "L2 Cache", m_CacheL2); - setTomlAttribute(mapInfo, "L1i Cache", m_CacheL1Order); - setTomlAttribute(mapInfo, "L1d Cache", m_CacheL1Data); + // setTomlAttribute(mapInfo, "L4 Cache", m_CacheL4); + // setTomlAttribute(mapInfo, "L3 Cache", m_CacheL3); + // setTomlAttribute(mapInfo, "L2 Cache", m_CacheL2); + // setTomlAttribute(mapInfo, "L1i Cache", m_CacheL1Order); + // setTomlAttribute(mapInfo, "L1d Cache", m_CacheL1Data); ret = setTomlAttribute(mapInfo, "Stepping", m_Step); //3. 获取设备的其它信息 getOtherMapInfo(mapInfo); @@ -402,11 +402,11 @@ void DeviceCpu::loadOtherDeviceInfo() addOtherDeviceInfo("Virtualization", m_HardwareVirtual); addOtherDeviceInfo("Flags", m_Flags); addOtherDeviceInfo("Extensions", m_Extensions); - addOtherDeviceInfo("L4 Cache", m_CacheL4); - addOtherDeviceInfo("L3 Cache", m_CacheL3); - addOtherDeviceInfo("L2 Cache", m_CacheL2); - addOtherDeviceInfo("L1i Cache", m_CacheL1Order); - addOtherDeviceInfo("L1d Cache", m_CacheL1Data); + // addOtherDeviceInfo("L4 Cache", m_CacheL4); + // addOtherDeviceInfo("L3 Cache", m_CacheL3); + // addOtherDeviceInfo("L2 Cache", m_CacheL2); + // addOtherDeviceInfo("L1i Cache", m_CacheL1Order); + // addOtherDeviceInfo("L1d Cache", m_CacheL1Data); addOtherDeviceInfo("Stepping", m_Step); // 将QMap内容转存为QList>