From 1973257ed781a93943f27f1518933e8c09c50f88 Mon Sep 17 00:00:00 2001

From: Miroslav Rezanina <mrezanin@redhat.com>

Date: Fri, 19 Oct 2018 13:47:32 +0200

Subject: Add s390x machine types

Adding changes to add RHEL machine types for s390x architecture.

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

--

Rebase changes (7.1.0 rc0):

- Moved adding rhel_old_machine_deprecation variable to general machine types commit

Merged patches (6.1.0):

- 64a9a5c971 hw/s390x: Remove the RHEL7-only machine type

- 395516d62b redhat: s390x: add rhel-8.5.0 compat machine

Merged patches (6.2.0):

- 3bf66f4520 redhat: Add s390x machine type compatibility update for 6.1 rebase

Merged patches (7.0.0):

- e6ff4de4f7 redhat: Add s390x machine type compatibility handling for the rebase to v6.2

- 4b0efa7e21 redhat: Add rhel8.6.0 and rhel9.0.0 machine types for s390x

- dcc64971bf RHEL: mark old machine types as deprecated (partialy)

Merged patches (7.1.0 rc0):

- 1d6439527a WRB: Introduce RHEL 9.0.0 hw compat structure (only hw/s390x/s390-virtio-ccw.c chunk)

- c8ad21ca31 redhat: Update s390x machine type compatibility for rebase to QEMU 7.0.0

- 5bcf8d874c target/s390x: deprecate CPUs older than z14

Merged patches (7.2.0 rc0):

- 0be2889fa2 Introduce upstream 7.0 compat changes (only applicable parts)

---

 hw/s390x/s390-virtio-ccw.c       | 108 +++++++++++++++++++++++++++++++

 target/s390x/cpu_models.c        |  11 ++++

 target/s390x/cpu_models.h        |   2 +

 target/s390x/cpu_models_sysemu.c |   2 +

 4 files changed, 123 insertions(+)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c

index 2e64ffab45..8d5221fbb1 100644

--- a/hw/s390x/s390-virtio-ccw.c

+++ b/hw/s390x/s390-virtio-ccw.c

@@ -823,6 +823,7 @@ bool css_migration_enabled(void)

     }                                                                         \

     type_init(ccw_machine_register_##suffix)

+#if 0 /* Disabled for Red Hat Enterprise Linux */

 static void ccw_machine_7_2_instance_options(MachineState *machine)

 {

 }

@@ -1186,6 +1187,113 @@ static void ccw_machine_2_4_class_options(MachineClass *mc)

     compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));

 }

 DEFINE_CCW_MACHINE(2_4, "2.4", false);

+#endif

+

+

+static void ccw_machine_rhel900_instance_options(MachineState *machine)

+{

+    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V6_2 };

+

+    s390_set_qemu_cpu_model(0x3906, 14, 2, qemu_cpu_feat);

+}

+

+static void ccw_machine_rhel900_class_options(MachineClass *mc)

+{

+    compat_props_add(mc->compat_props, hw_compat_rhel_9_1, hw_compat_rhel_9_1_len);

+    compat_props_add(mc->compat_props, hw_compat_rhel_9_0, hw_compat_rhel_9_0_len);

+}

+DEFINE_CCW_MACHINE(rhel900, "rhel9.0.0", true);

+

+static void ccw_machine_rhel860_instance_options(MachineState *machine)

+{

+    /* Note: The -rhel8.6.0 and -rhel9.0.0 machines are technically identical */

+    ccw_machine_rhel900_instance_options(machine);

+}

+

+static void ccw_machine_rhel860_class_options(MachineClass *mc)

+{

+    ccw_machine_rhel900_class_options(mc);

+

+    /* All RHEL machines for prior major releases are deprecated */

+    mc->deprecation_reason = rhel_old_machine_deprecation;

+}

+DEFINE_CCW_MACHINE(rhel860, "rhel8.6.0", false);

+

+static void ccw_machine_rhel850_instance_options(MachineState *machine)

+{

+    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V6_0 };

+

+    ccw_machine_rhel860_instance_options(machine);

+

+    s390_set_qemu_cpu_model(0x2964, 13, 2, qemu_cpu_feat);

+

+    s390_cpudef_featoff_greater(16, 1, S390_FEAT_NNPA);

+    s390_cpudef_featoff_greater(16, 1, S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2);

+    s390_cpudef_featoff_greater(16, 1, S390_FEAT_BEAR_ENH);

+    s390_cpudef_featoff_greater(16, 1, S390_FEAT_RDP);

+    s390_cpudef_featoff_greater(16, 1, S390_FEAT_PAI);

+}

+

+static void ccw_machine_rhel850_class_options(MachineClass *mc)

+{

+    ccw_machine_rhel860_class_options(mc);

+    compat_props_add(mc->compat_props, hw_compat_rhel_8_5, hw_compat_rhel_8_5_len);

+    mc->smp_props.prefer_sockets = true;

+}

+DEFINE_CCW_MACHINE(rhel850, "rhel8.5.0", false);

+

+static void ccw_machine_rhel840_instance_options(MachineState *machine)

+{

+    ccw_machine_rhel850_instance_options(machine);

+}

+

+static void ccw_machine_rhel840_class_options(MachineClass *mc)

+{

+    ccw_machine_rhel850_class_options(mc);

+    compat_props_add(mc->compat_props, hw_compat_rhel_8_4, hw_compat_rhel_8_4_len);

+}

+DEFINE_CCW_MACHINE(rhel840, "rhel8.4.0", false);

+

+static void ccw_machine_rhel820_instance_options(MachineState *machine)

+{

+    ccw_machine_rhel840_instance_options(machine);

+}

+

+static void ccw_machine_rhel820_class_options(MachineClass *mc)

+{

+    ccw_machine_rhel840_class_options(mc);

+    mc->fixup_ram_size = s390_fixup_ram_size;

+    /* we did not publish a rhel8.3.0 machine */

+    compat_props_add(mc->compat_props, hw_compat_rhel_8_3, hw_compat_rhel_8_3_len);

+    compat_props_add(mc->compat_props, hw_compat_rhel_8_2, hw_compat_rhel_8_2_len);

+}

+DEFINE_CCW_MACHINE(rhel820, "rhel8.2.0", false);

+

+static void ccw_machine_rhel760_instance_options(MachineState *machine)

+{

+    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V3_1 };

+

+    ccw_machine_rhel820_instance_options(machine);

+

+    s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat);

+

+    /* The multiple-epoch facility was not available with rhel7.6.0 on z14GA1 */

+    s390_cpudef_featoff(14, 1, S390_FEAT_MULTIPLE_EPOCH);

+    s390_cpudef_featoff(14, 1, S390_FEAT_PTFF_QSIE);

+    s390_cpudef_featoff(14, 1, S390_FEAT_PTFF_QTOUE);

+    s390_cpudef_featoff(14, 1, S390_FEAT_PTFF_STOE);

+    s390_cpudef_featoff(14, 1, S390_FEAT_PTFF_STOUE);

+}

+

+static void ccw_machine_rhel760_class_options(MachineClass *mc)

+{

+    ccw_machine_rhel820_class_options(mc);

+    /* We never published the s390x version of RHEL-AV 8.0 and 8.1, so add this here */

+    compat_props_add(mc->compat_props, hw_compat_rhel_8_1, hw_compat_rhel_8_1_len);

+    compat_props_add(mc->compat_props, hw_compat_rhel_8_0, hw_compat_rhel_8_0_len);

+    compat_props_add(mc->compat_props, hw_compat_rhel_7_6, hw_compat_rhel_7_6_len);

+}

+DEFINE_CCW_MACHINE(rhel760, "rhel7.6.0", false);

 static void ccw_machine_register_types(void)

 {

diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c

index c3a4f80633..739770dc15 100644

--- a/target/s390x/cpu_models.c

+++ b/target/s390x/cpu_models.c

@@ -45,6 +45,9 @@

  * of a following release have been a superset of the previous release. With

  * generation 15 one base feature and one optional feature have been deprecated.

  */

+

+#define RHEL_CPU_DEPRECATION "use at least 'z14', or 'host' / 'qemu' / 'max'"

+

 static S390CPUDef s390_cpu_defs[] = {

     CPUDEF_INIT(0x2064, 7, 1, 38, 0x00000000U, "z900", "IBM zSeries 900 GA1"),

     CPUDEF_INIT(0x2064, 7, 2, 38, 0x00000000U, "z900.2", "IBM zSeries 900 GA2"),

@@ -854,22 +857,30 @@ static void s390_host_cpu_model_class_init(ObjectClass *oc, void *data)

 static void s390_base_cpu_model_class_init(ObjectClass *oc, void *data)

 {

     S390CPUClass *xcc = S390_CPU_CLASS(oc);

+    CPUClass *cc = CPU_CLASS(oc);

     /* all base models are migration safe */

     xcc->cpu_def = (const S390CPUDef *) data;

     xcc->is_migration_safe = true;

     xcc->is_static = true;

     xcc->desc = xcc->cpu_def->desc;

+    if (xcc->cpu_def->gen < 14) {

+        cc->deprecation_note = RHEL_CPU_DEPRECATION;

+    }

 }

 static void s390_cpu_model_class_init(ObjectClass *oc, void *data)

 {

     S390CPUClass *xcc = S390_CPU_CLASS(oc);

+    CPUClass *cc = CPU_CLASS(oc);

     /* model that can change between QEMU versions */

     xcc->cpu_def = (const S390CPUDef *) data;

     xcc->is_migration_safe = true;

     xcc->desc = xcc->cpu_def->desc;

+    if (xcc->cpu_def->gen < 14) {

+        cc->deprecation_note = RHEL_CPU_DEPRECATION;

+    }

 }

 static void s390_qemu_cpu_model_class_init(ObjectClass *oc, void *data)

diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h

index fb1adc8b21..d76745afa9 100644

--- a/target/s390x/cpu_models.h

+++ b/target/s390x/cpu_models.h

@@ -38,6 +38,8 @@ struct S390CPUDef {

     S390FeatBitmap full_feat;

     /* used to init full_feat from generated data */

     S390FeatInit full_init;

+    /* if deprecated, provides a suggestion */

+    const char *deprecation_note;

 };

 /* CPU model based on a CPU definition */

diff --git a/target/s390x/cpu_models_sysemu.c b/target/s390x/cpu_models_sysemu.c

index d086b1c39c..1b9cc66405 100644

--- a/target/s390x/cpu_models_sysemu.c

+++ b/target/s390x/cpu_models_sysemu.c

@@ -60,6 +60,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque)

     CpuDefinitionInfo *info;

     char *name = g_strdup(object_class_get_name(klass));

     S390CPUClass *scc = S390_CPU_CLASS(klass);

+    CPUClass *cc = CPU_CLASS(klass);

     /* strip off the -s390x-cpu */

     g_strrstr(name, "-" TYPE_S390_CPU)[0] = 0;

@@ -69,6 +70,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque)

     info->migration_safe = scc->is_migration_safe;

     info->q_static = scc->is_static;

     info->q_typename = g_strdup(object_class_get_name(klass));

+    info->deprecated = !!cc->deprecation_note;

     /* check for unavailable features */

     if (cpu_list_data->model) {

         Object *obj;

-- 

2.31.1