[PATCH 00/12] hw/s390x: Remove s390-ccw-virtio-4.2 -> s390-ccw-virtio-7.2 machines

[PATCH 00/12] hw/s390x: Remove s390-ccw-virtio-4.2 -> s390-ccw-virtio-7.2 machines

[Philippe Mathieu-Daudé]

Remove the deprecated s390-ccw-virtio-4.2 up to 7.2 machines,
which are older than 6 years. Remove resulting dead code.

Philippe Mathieu-Daudé (12):
  hw/s390x/ccw: Remove deprecated s390-ccw-virtio-4.2 machine
  hw/s390x/ccw: Remove SCLPDevice::increment_size field
  hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.0 machine
  hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.1 machine
  hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.2 machine
  hw/s390x/ccw: Remove deprecated s390-ccw-virtio-6.0 machine
  hw/s390x/ccw: Remove deprecated s390-ccw-virtio-6.1 machine
  hw/s390x/ccw: Remove deprecated s390-ccw-virtio-6.2 machine
  hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.0 machine
  hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.1 machine
  hw/s390x/ccw: Remove S390CcwMachineClass::max_threads field
  hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.2 machine

 include/hw/s390x/s390-virtio-ccw.h |   3 -
 include/hw/s390x/sclp.h            |   5 +-
 hw/s390x/s390-virtio-ccw.c         | 175 +----------------------------
 hw/s390x/sclp.c                    |  34 +-----
 4 files changed, 6 insertions(+), 211 deletions(-)

-- 
2.51.0

[PATCH 01/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-4.2 machine

[Philippe Mathieu-Daudé]

This machine has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-virtio-ccw.c | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index ad2c48188a8..64b81345f1e 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -715,26 +715,6 @@ static void s390_nmi(NMIState *n, int cpu_index, Error **errp)
     s390_cpu_restart(S390_CPU(cs));
 }
 
-static ram_addr_t s390_fixup_ram_size(ram_addr_t sz)
-{
-    /* same logic as in sclp.c */
-    int increment_size = 20;
-    ram_addr_t newsz;
-
-    while ((sz >> increment_size) > MAX_STORAGE_INCREMENTS) {
-        increment_size++;
-    }
-    newsz = sz >> increment_size << increment_size;
-
-    if (sz != newsz) {
-        qemu_printf("Ram size %" PRIu64 "MB was fixed up to %" PRIu64
-                    "MB to match machine restrictions. Consider updating "
-                    "the guest definition.\n", (uint64_t) (sz / MiB),
-                    (uint64_t) (newsz / MiB));
-    }
-    return newsz;
-}
-
 static inline bool machine_get_aes_key_wrap(Object *obj, Error **errp)
 {
     S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
@@ -1165,19 +1145,6 @@ static void ccw_machine_5_0_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(5, 0);
 
-static void ccw_machine_4_2_instance_options(MachineState *machine)
-{
-    ccw_machine_5_0_instance_options(machine);
-}
-
-static void ccw_machine_4_2_class_options(MachineClass *mc)
-{
-    ccw_machine_5_0_class_options(mc);
-    mc->fixup_ram_size = s390_fixup_ram_size;
-    compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len);
-}
-DEFINE_CCW_MACHINE(4, 2);
-
 static void ccw_machine_register_types(void)
 {
     type_register_static(&ccw_machine_info);
-- 
2.51.0

[PATCH 02/12] hw/s390x/ccw: Remove SCLPDevice::increment_size field

[Philippe Mathieu-Daudé]

The SCLPDevice::increment_size field was only used by the
s390-ccw-virtio-4.2 machine, which got removed. Remove it
as now unused, along with the sclp_memory_init() method.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/s390x/sclp.h |  5 +----
 hw/s390x/sclp.c         | 34 +++-------------------------------
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h
index d32f6180e0d..33f01f85bb1 100644
--- a/include/hw/s390x/sclp.h
+++ b/include/hw/s390x/sclp.h
@@ -197,12 +197,9 @@ OBJECT_DECLARE_TYPE(SCLPDevice, SCLPDeviceClass,
 struct SCLPEventFacility;
 
 struct SCLPDevice {
-    /* private */
     DeviceState parent_obj;
-    struct SCLPEventFacility *event_facility;
-    int increment_size;
 
-    /* public */
+    struct SCLPEventFacility *event_facility;
 };
 
 struct SCLPDeviceClass {
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index 8602a566a49..c9a9c4bb375 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -110,7 +110,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)
     ReadInfo *read_info = (ReadInfo *) sccb;
     MachineState *machine = MACHINE(qdev_get_machine());
     int cpu_count;
-    int rnsize, rnmax;
+    int rnmax;
     int required_len = SCCB_REQ_LEN(ReadInfo, machine->possible_cpus->len);
     int offset_cpu = s390_has_feat(S390_FEAT_EXTENDED_LENGTH_SCCB) ?
                      offsetof(ReadInfo, entries) :
@@ -153,21 +153,14 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)
 
     read_info->mha_pow = s390_get_mha_pow();
     read_info->hmfai = cpu_to_be32(s390_get_hmfai());
-
-    rnsize = 1 << (sclp->increment_size - 20);
-    if (rnsize <= 128) {
-        read_info->rnsize = rnsize;
-    } else {
-        read_info->rnsize = 0;
-        read_info->rnsize2 = cpu_to_be32(rnsize);
-    }
+    read_info->rnsize = 1;
 
     /*
      * We don't support standby memory. maxram_size is used for sizing the
      * memory device region, which is not exposed through SCLP but through
      * diag500.
      */
-    rnmax = machine->ram_size >> sclp->increment_size;
+    rnmax = machine->ram_size >> 20;
     if (rnmax < 0x10000) {
         read_info->rnmax = cpu_to_be16(rnmax);
     } else {
@@ -406,25 +399,6 @@ static void sclp_realize(DeviceState *dev, Error **errp)
     }
 }
 
-static void sclp_memory_init(SCLPDevice *sclp)
-{
-    MachineState *machine = MACHINE(qdev_get_machine());
-    MachineClass *machine_class = MACHINE_GET_CLASS(qdev_get_machine());
-    ram_addr_t initial_mem = machine->ram_size;
-    int increment_size = 20;
-
-    /* The storage increment size is a multiple of 1M and is a power of 2.
-     * For some machine types, the number of storage increments must be
-     * MAX_STORAGE_INCREMENTS or fewer.
-     * The variable 'increment_size' is an exponent of 2 that can be
-     * used to calculate the size (in bytes) of an increment. */
-    while (machine_class->fixup_ram_size != NULL &&
-           (initial_mem >> increment_size) > MAX_STORAGE_INCREMENTS) {
-        increment_size++;
-    }
-    sclp->increment_size = increment_size;
-}
-
 static void sclp_init(Object *obj)
 {
     SCLPDevice *sclp = SCLP(obj);
@@ -434,8 +408,6 @@ static void sclp_init(Object *obj)
     object_property_add_child(obj, TYPE_SCLP_EVENT_FACILITY, new);
     object_unref(new);
     sclp->event_facility = EVENT_FACILITY(new);
-
-    sclp_memory_init(sclp);
 }
 
 static void sclp_class_init(ObjectClass *oc, const void *data)
-- 
2.51.0

[PATCH 03/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.0 machine

[Philippe Mathieu-Daudé]

This machine has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-virtio-ccw.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 64b81345f1e..e1868eb7cc8 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1133,18 +1133,6 @@ static void ccw_machine_5_1_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(5, 1);
 
-static void ccw_machine_5_0_instance_options(MachineState *machine)
-{
-    ccw_machine_5_1_instance_options(machine);
-}
-
-static void ccw_machine_5_0_class_options(MachineClass *mc)
-{
-    ccw_machine_5_1_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_5_0, hw_compat_5_0_len);
-}
-DEFINE_CCW_MACHINE(5, 0);
-
 static void ccw_machine_register_types(void)
 {
     type_register_static(&ccw_machine_info);
-- 
2.51.0

[PATCH 04/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.1 machine

[Philippe Mathieu-Daudé]

This machine has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-virtio-ccw.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index e1868eb7cc8..7be998168e8 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1121,18 +1121,6 @@ static void ccw_machine_5_2_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(5, 2);
 
-static void ccw_machine_5_1_instance_options(MachineState *machine)
-{
-    ccw_machine_5_2_instance_options(machine);
-}
-
-static void ccw_machine_5_1_class_options(MachineClass *mc)
-{
-    ccw_machine_5_2_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len);
-}
-DEFINE_CCW_MACHINE(5, 1);
-
 static void ccw_machine_register_types(void)
 {
     type_register_static(&ccw_machine_info);
-- 
2.51.0

[PATCH 05/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.2 machine

[Philippe Mathieu-Daudé]

This machine has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-virtio-ccw.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 7be998168e8..103b0c4d73f 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1109,18 +1109,6 @@ static void ccw_machine_6_0_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(6, 0);
 
-static void ccw_machine_5_2_instance_options(MachineState *machine)
-{
-    ccw_machine_6_0_instance_options(machine);
-}
-
-static void ccw_machine_5_2_class_options(MachineClass *mc)
-{
-    ccw_machine_6_0_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len);
-}
-DEFINE_CCW_MACHINE(5, 2);
-
 static void ccw_machine_register_types(void)
 {
     type_register_static(&ccw_machine_info);
-- 
2.51.0

[PATCH 06/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-6.0 machine

[Philippe Mathieu-Daudé]

This machine has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-virtio-ccw.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 103b0c4d73f..46dcabe6ad1 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1094,21 +1094,6 @@ static void ccw_machine_6_1_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(6, 1);
 
-static void ccw_machine_6_0_instance_options(MachineState *machine)
-{
-    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V6_0 };
-
-    ccw_machine_6_1_instance_options(machine);
-    s390_set_qemu_cpu_model(0x2964, 13, 2, qemu_cpu_feat);
-}
-
-static void ccw_machine_6_0_class_options(MachineClass *mc)
-{
-    ccw_machine_6_1_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_6_0, hw_compat_6_0_len);
-}
-DEFINE_CCW_MACHINE(6, 0);
-
 static void ccw_machine_register_types(void)
 {
     type_register_static(&ccw_machine_info);
-- 
2.51.0

[PATCH 07/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-6.1 machine

[Philippe Mathieu-Daudé]

This machine has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-virtio-ccw.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 46dcabe6ad1..a22d1fbef36 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1076,24 +1076,6 @@ static void ccw_machine_6_2_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(6, 2);
 
-static void ccw_machine_6_1_instance_options(MachineState *machine)
-{
-    ccw_machine_6_2_instance_options(machine);
-    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_6_1_class_options(MachineClass *mc)
-{
-    ccw_machine_6_2_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len);
-    mc->smp_props.prefer_sockets = true;
-}
-DEFINE_CCW_MACHINE(6, 1);
-
 static void ccw_machine_register_types(void)
 {
     type_register_static(&ccw_machine_info);
-- 
2.51.0

[PATCH 08/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-6.2 machine

[Philippe Mathieu-Daudé]

This machine has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-virtio-ccw.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index a22d1fbef36..319b597d12b 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1061,21 +1061,6 @@ static void ccw_machine_7_0_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(7, 0);
 
-static void ccw_machine_6_2_instance_options(MachineState *machine)
-{
-    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V6_2 };
-
-    ccw_machine_7_0_instance_options(machine);
-    s390_set_qemu_cpu_model(0x3906, 14, 2, qemu_cpu_feat);
-}
-
-static void ccw_machine_6_2_class_options(MachineClass *mc)
-{
-    ccw_machine_7_0_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_6_2, hw_compat_6_2_len);
-}
-DEFINE_CCW_MACHINE(6, 2);
-
 static void ccw_machine_register_types(void)
 {
     type_register_static(&ccw_machine_info);
-- 
2.51.0

[PATCH 09/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.0 machine

[Philippe Mathieu-Daudé]

This machine has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-virtio-ccw.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 319b597d12b..942b1e5a932 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1046,21 +1046,6 @@ static void ccw_machine_7_1_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(7, 1);
 
-static void ccw_machine_7_0_instance_options(MachineState *machine)
-{
-    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V7_0 };
-
-    ccw_machine_7_1_instance_options(machine);
-    s390_set_qemu_cpu_model(0x8561, 15, 1, qemu_cpu_feat);
-}
-
-static void ccw_machine_7_0_class_options(MachineClass *mc)
-{
-    ccw_machine_7_1_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len);
-}
-DEFINE_CCW_MACHINE(7, 0);
-
 static void ccw_machine_register_types(void)
 {
     type_register_static(&ccw_machine_info);
-- 
2.51.0

[PATCH 10/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.1 machine

[Philippe Mathieu-Daudé]

This machine has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-virtio-ccw.c | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 942b1e5a932..cf09b5c46e6 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1022,30 +1022,6 @@ static void ccw_machine_7_2_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(7, 2);
 
-static void ccw_machine_7_1_instance_options(MachineState *machine)
-{
-    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V7_1 };
-
-    ccw_machine_7_2_instance_options(machine);
-    s390_cpudef_featoff_greater(16, 1, S390_FEAT_PAIE);
-    s390_set_qemu_cpu_model(0x8561, 15, 1, qemu_cpu_feat);
-}
-
-static void ccw_machine_7_1_class_options(MachineClass *mc)
-{
-    S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc);
-    static GlobalProperty compat[] = {
-        { TYPE_S390_PCI_DEVICE, "interpret", "off", },
-        { TYPE_S390_PCI_DEVICE, "forwarding-assist", "off", },
-    };
-
-    ccw_machine_7_2_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
-    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
-    s390mc->max_threads = S390_MAX_CPUS;
-}
-DEFINE_CCW_MACHINE(7, 1);
-
 static void ccw_machine_register_types(void)
 {
     type_register_static(&ccw_machine_info);
-- 
2.51.0

[PATCH 11/12] hw/s390x/ccw: Remove S390CcwMachineClass::max_threads field

[Philippe Mathieu-Daudé]

The S390CcwMachineClass::max_threads field was only used by the
s390-ccw-virtio-7.1 machine, which got removed. Remove it
as now unused, simplifying the s390_init_cpus() method.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/s390x/s390-virtio-ccw.h | 3 ---
 hw/s390x/s390-virtio-ccw.c         | 7 ++-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h
index 526078a4e2b..db804db33c3 100644
--- a/include/hw/s390x/s390-virtio-ccw.h
+++ b/include/hw/s390x/s390-virtio-ccw.h
@@ -49,11 +49,8 @@ static inline uint64_t s390_get_memory_limit(S390CcwMachineState *s390ms)
 void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra);
 
 struct S390CcwMachineClass {
-    /*< private >*/
     MachineClass parent_class;
 
-    /*< public >*/
-    int max_threads;
     bool use_cpi;
 };
 
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index cf09b5c46e6..390d427dc41 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -75,12 +75,10 @@ out:
 static void s390_init_cpus(MachineState *machine)
 {
     MachineClass *mc = MACHINE_GET_CLASS(machine);
-    S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc);
     int i;
 
-    if (machine->smp.threads > s390mc->max_threads) {
-        error_report("S390 does not support more than %d threads.",
-                     s390mc->max_threads);
+    if (machine->smp.threads > 1) {
+        error_report("S390 does not support more than 1 thread.");
         exit(1);
     }
 
@@ -779,7 +777,6 @@ static void ccw_machine_class_init(ObjectClass *oc, const void *data)
     S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc);
     DumpSKeysInterface *dsi = DUMP_SKEYS_INTERFACE_CLASS(oc);
 
-    s390mc->max_threads = 1;
     s390mc->use_cpi = true;
     mc->reset = s390_machine_reset;
     mc->block_default_type = IF_VIRTIO;
-- 
2.51.0

[PATCH 12/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.2 machine

[Philippe Mathieu-Daudé]

This machine has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-virtio-ccw.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 390d427dc41..bc8e9f4c34b 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1007,18 +1007,6 @@ static void ccw_machine_8_0_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(8, 0);
 
-static void ccw_machine_7_2_instance_options(MachineState *machine)
-{
-    ccw_machine_8_0_instance_options(machine);
-}
-
-static void ccw_machine_7_2_class_options(MachineClass *mc)
-{
-    ccw_machine_8_0_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
-}
-DEFINE_CCW_MACHINE(7, 2);
-
 static void ccw_machine_register_types(void)
 {
     type_register_static(&ccw_machine_info);
-- 
2.51.0

Re: [PATCH 00/12] hw/s390x: Remove s390-ccw-virtio-4.2 -> s390-ccw-virtio-7.2 machines

[Thomas Huth]

On 17/10/2025 15.29, Philippe Mathieu-Daudé wrote:
> Remove the deprecated s390-ccw-virtio-4.2 up to 7.2 machines,
> which are older than 6 years. Remove resulting dead code.
> 
> Philippe Mathieu-Daudé (12):
>    hw/s390x/ccw: Remove deprecated s390-ccw-virtio-4.2 machine
>    hw/s390x/ccw: Remove SCLPDevice::increment_size field
>    hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.0 machine
>    hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.1 machine
>    hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.2 machine
>    hw/s390x/ccw: Remove deprecated s390-ccw-virtio-6.0 machine
>    hw/s390x/ccw: Remove deprecated s390-ccw-virtio-6.1 machine
>    hw/s390x/ccw: Remove deprecated s390-ccw-virtio-6.2 machine
>    hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.0 machine
>    hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.1 machine
>    hw/s390x/ccw: Remove S390CcwMachineClass::max_threads field
>    hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.2 machine

NACK.

Being deprecated does not mean that the deprecation period already expired.
Please re-read the paragraph about machine deprecation in 
docs/about/deprecated.rst carefully again.

  Thomas

Re: [PATCH 00/12] hw/s390x: Remove s390-ccw-virtio-4.2 -> s390-ccw-virtio-7.2 machines

[Philippe Mathieu-Daudé]

On 17/10/25 15:38, Thomas Huth wrote:
> On 17/10/2025 15.29, Philippe Mathieu-Daudé wrote:
>> Remove the deprecated s390-ccw-virtio-4.2 up to 7.2 machines,
>> which are older than 6 years. Remove resulting dead code.
>>
>> Philippe Mathieu-Daudé (12):
>>    hw/s390x/ccw: Remove deprecated s390-ccw-virtio-4.2 machine
>>    hw/s390x/ccw: Remove SCLPDevice::increment_size field

> NACK.
> 
> Being deprecated does not mean that the deprecation period already expired.
> Please re-read the paragraph about machine deprecation in docs/about/ 
> deprecated.rst carefully again.

Yes, my bad, I misunderstood the '-M help' output.

Still, please consider the first 2 patches (4.2 is over 6yo).

Regards,

Phil.

Re: [PATCH 00/12] hw/s390x: Remove s390-ccw-virtio-4.2 -> s390-ccw-virtio-7.2 machines

[Thomas Huth]

On 17/10/2025 15.40, Philippe Mathieu-Daudé wrote:
> On 17/10/25 15:38, Thomas Huth wrote:
>> On 17/10/2025 15.29, Philippe Mathieu-Daudé wrote:
>>> Remove the deprecated s390-ccw-virtio-4.2 up to 7.2 machines,
>>> which are older than 6 years. Remove resulting dead code.
>>>
>>> Philippe Mathieu-Daudé (12):
>>>    hw/s390x/ccw: Remove deprecated s390-ccw-virtio-4.2 machine
>>>    hw/s390x/ccw: Remove SCLPDevice::increment_size field
> 
>> NACK.
>>
>> Being deprecated does not mean that the deprecation period already expired.
>> Please re-read the paragraph about machine deprecation in docs/about/ 
>> deprecated.rst carefully again.
> 
> Yes, my bad, I misunderstood the '-M help' output.
> 
> Still, please consider the first 2 patches (4.2 is over 6yo).

Agreed, 4.2 can be removed. But in that case, please add a 3rd patch that 
also removes the fixup_ram_size stuff from hw/core/machine.c since s390x was 
the last user.

  Thanks,
   Thomas