| Message ID | 20241213160120.23880-3-farosas@suse.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | migration: Fix regressions | expand |
On 13/12/2024 17.01, Fabiano Rosas wrote: > Commit a55ae46683 ("s390: move css_migration_enabled from machine to > css.c") disabled CSS migration globally instead of doing it > per-instance. > > CC: Paolo Bonzini <pbonzini@redhat.com> > CC: qemu-stable@nongnu.org #9.1 > Fixes: a55ae46683 ("s390: move css_migration_enabled from machine to css.c") > Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2704 > Signed-off-by: Fabiano Rosas <farosas@suse.de> > --- > Consider enabling migration-compat-s390x in CI, it would have caught > this. It's too late for this development cycle because the backward > migration is broken, but in 10.1 both sides will agree on the > css_migration_enabled value. > --- > hw/s390x/s390-virtio-ccw.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index fe03f716f3..701b2d4e2e 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -1189,6 +1189,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) > @@ -1201,7 +1202,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); > D'oh! Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index fe03f716f3..701b2d4e2e 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1189,6 +1189,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) @@ -1201,7 +1202,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);
Commit a55ae46683 ("s390: move css_migration_enabled from machine to css.c") disabled CSS migration globally instead of doing it per-instance. CC: Paolo Bonzini <pbonzini@redhat.com> CC: qemu-stable@nongnu.org #9.1 Fixes: a55ae46683 ("s390: move css_migration_enabled from machine to css.c") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2704 Signed-off-by: Fabiano Rosas <farosas@suse.de> --- Consider enabling migration-compat-s390x in CI, it would have caught this. It's too late for this development cycle because the backward migration is broken, but in 10.1 both sides will agree on the css_migration_enabled value. --- hw/s390x/s390-virtio-ccw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)