From 0d3444e4ba998bbebce282fe1367ef16b635e3ae Mon Sep 17 00:00:00 2001 From: Ani Sinha Date: Fri, 14 Jun 2024 13:34:47 +0530 Subject: [PATCH 04/14] target/cpu-models/x86: Remove the existing deprecated CPU models on c10s RH-Author: Ani Sinha RH-MergeRequest: 243: target/cpu-models/x86: Remove the existing deprecated CPU models on c10s RH-Jira: RHEL-28972 RH-Acked-by: Thomas Huth RH-Acked-by: Igor Mammedov RH-Acked-by: MST RH-Commit: [4/4] ca6905d2f6cae5f120d3acef973cadb1164e0864 (anisinha/centos-qemu-kvm) The cpu models that were deprecated in c9s can be removed in c10s. This change compiled out these cpu models. For x86, 'qemu64' cpu model is still kept as is as its the default cpu model. Signed-off-by: Ani Sinha --- target/i386/cpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index be7b0663cd..c83d585c9b 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2215,6 +2215,7 @@ static const X86CPUDefinition builtin_x86_defs[] = { .xlevel = 0x8000000A, .model_id = "QEMU Virtual CPU version " QEMU_HW_VERSION, }, +#if 0 // Deprecated CPU models are removed in RHEL-10 { .name = "phenom", .deprecation_note = RHEL_CPU_DEPRECATION, @@ -2593,6 +2594,7 @@ static const X86CPUDefinition builtin_x86_defs[] = { .xlevel = 0x80000008, .model_id = "Intel Core 2 Duo P9xxx (Penryn Class Core 2)", }, +#endif // Removal of deprecated CPU models in RHEL-10 { .name = "Nehalem", .level = 11, @@ -4410,6 +4412,7 @@ static const X86CPUDefinition builtin_x86_defs[] = { .xlevel = 0x80000008, .model_id = "Intel Xeon Phi Processor (Knights Mill)", }, +#if 0 // Deprecated CPU models are removed in RHEL-10 { .name = "Opteron_G1", .deprecation_note = RHEL_CPU_DEPRECATION, @@ -4480,6 +4483,7 @@ static const X86CPUDefinition builtin_x86_defs[] = { .xlevel = 0x80000008, .model_id = "AMD Opteron 23xx (Gen 3 Class Opteron)", }, +#endif { .name = "Opteron_G4", .level = 0xd, -- 2.39.3