i386/cpu: Remove unnecessary cache_info fields from builtin CPU model
In x86_cpu_get_versioned_cache_info(), higher version CPU models will inherit cache_info from lower versions if the cache_info field is not specified, so there is no need to repeatedly set the same cache_info. Therefore, remove the repeated cache models from SapphireRapids-v6 (SapphireRapids-v4 has set the cache model), GraniteRapids-v5 (GraniteRapids-v3 has set) and SierraForest-v5 (SierraForest-v3 has set). Signed-off-by: Zhao Liu <zhao1.liu@intel.com> Link: https://lore.kernel.org/r/20260310140819.1563084-4-zhao1.liu@intel.com Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Zhao Liu committed
Mar 10, 2026 at 22:08 UTC
d8c0ef548c8cac5623fdb800bd7f9735a0cf0e66
1 file changed
-3
target/i386/cpu.c
-3
@@ -5264,7 +5264,6 @@ static const X86CPUDefinition builtin_x86_defs[] = {
5264
{
5265
.version = 6,
5266
.note = "with cet-ss, cet-ibt, its-no",
5267
- .cache_info = &xeon_spr_cache_info,
5267
.props = (PropValue[]) {
5268
{ "its-no", "on" },
5269
{ /* end of list */ },
@@ -5446,7 +5445,6 @@ static const X86CPUDefinition builtin_x86_defs[] = {
5445
{
5446
.version = 5,
5447
.note = "with cet-ss, cet-ibt, its-no",
5449
- .cache_info = &xeon_gnr_cache_info,
5448
.props = (PropValue[]) {
5449
{ "its-no", "on" },
5450
{ /* end of list */ },
@@ -5812,7 +5810,6 @@ static const X86CPUDefinition builtin_x86_defs[] = {
5810
{
5811
.version = 5,
5812
.note = "with ITS_NO",
5815
- .cache_info = &xeon_srf_cache_info,
5813
.props = (PropValue[]) {
5814
{ "its-no", "on" },
5815
{ /* end of list */ },