From 64eecc611dfdb9252b5e9d20b96cba715ecc1d07 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 24 Jun 2024 14:26:14 +0200 Subject: [PATCH 12/14] target/s390x: Revert the old s390x CPU model disablement code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Thomas Huth RH-MergeRequest: 252: s390x: remove legacy CPU types RH-Jira: RHEL-39898 RH-Acked-by: Cédric Le Goater RH-Acked-by: Miroslav Rezanina RH-Commit: [5/5] da022e5acaeb1c86fba6245aa2c20491ac83046f (thuth/qemu-kvm-cs9) Upstream-Status: N/A We now completely disable the old CPU models up to the z12 in target/s390x/cpu_models.c, so we don't need these old checks anymore. This patch should get squashed into the downstream patch "Enable/disable devices for RHEL" during the next rebase. Signed-off-by: Thomas Huth --- target/s390x/cpu_models_sysemu.c | 3 --- target/s390x/kvm/kvm.c | 7 ------- 2 files changed, 10 deletions(-) diff --git a/target/s390x/cpu_models_sysemu.c b/target/s390x/cpu_models_sysemu.c index ca2e5d91e2..906d5d42b7 100644 --- a/target/s390x/cpu_models_sysemu.c +++ b/target/s390x/cpu_models_sysemu.c @@ -34,9 +34,6 @@ static void check_unavailable_features(const S390CPUModel *max_model, (max_model->def->gen == model->def->gen && max_model->def->ec_ga < model->def->ec_ga)) { list_add_feat("type", unavailable); - } else if (model->def->gen < 11 && kvm_enabled()) { - /* Older CPU models are not supported on Red Hat Enterprise Linux */ - list_add_feat("type", unavailable); } /* detect missing features if any to properly report them */ diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index 55fb4855b1..6dcb8dba2d 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -2566,13 +2566,6 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp) return; } - /* Older CPU models are not supported on Red Hat Enterprise Linux */ - if (model->def->gen < 11) { - error_setg(errp, "KVM: Unsupported CPU type specified: %s", - MACHINE(qdev_get_machine())->cpu_type); - return; - } - prop.cpuid = s390_cpuid_from_cpu_model(model); prop.ibc = s390_ibc_from_cpu_model(model); /* configure cpu features indicated via STFL(e) */ -- 2.39.3