Re: [PATCH 03/13] s390: move css_migration_enabled from machine to css.c

[Paolo Bonzini]

On Fri, May 10, 2024 at 7:38 AM Thomas Huth <th...@redhat.com> wrote:
> I think this is wrong: By adding this to ccw_machine_2_9_class_options the
> variable now always gets set to false, even for newer machines, since the
> *class_options functions are part of the "class_init" which is always
done.
> You have to add it to ccw_machine_2_9_instance_options() instead to make
it
> work as expected.

Indeed, this has to be squashed in:

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index aa90703d518..b7ddd36b8ba 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1159,6 +1159,7 @@ static void
ccw_machine_2_9_instance_options(MachineState *machine)
     s390_cpudef_featoff_greater(12, 1, S390_FEAT_ZPCI);
     s390_cpudef_featoff_greater(12, 1, S390_FEAT_ADAPTER_INT_SUPPRESSION);
     s390_cpudef_featoff_greater(12, 1,
S390_FEAT_ADAPTER_EVENT_NOTIFICATION);
+    css_migration_enabled = false;
 }

 static void ccw_machine_2_9_class_options(MachineClass *mc)
@@ -1171,7 +1172,6 @@ static void
ccw_machine_2_9_class_options(MachineClass *mc)
     ccw_machine_2_10_class_options(mc);
     compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len);
     compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
-    css_migration_enabled = false;
 }
 DEFINE_CCW_MACHINE(2_9, "2.9", false);