[v3] migration: Fix s390 regressions + migration script

[PATCH v3 7/7] s390x: Fix CSS migration

Posted by Fabiano Rosas 2 months, 3 weeks ago

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
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Message-Id: <20241213160120.23880-3-farosas@suse.de>
---
 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 8a242cc1ec..38aeba14ee 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1244,6 +1244,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)
@@ -1256,7 +1257,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.35.3

Re: [PATCH v3 7/7] s390x: Fix CSS migration

Posted by Michael Tokarev 2 months, 3 weeks ago

09.01.2025 21:52, 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
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> Message-Id: <20241213160120.23880-3-farosas@suse.de>

And this one causes s390x-migration-test failure on 9.2 on s390x.
While this test succeeds on x86_64.

https://gitlab.com/qemu-project/qemu/-/jobs/8829799108

Help? :)

Thanks,

/mjt

Re: [PATCH v3 7/7] s390x: Fix CSS migration

Posted by Thomas Huth 2 months, 3 weeks ago

On 12/01/2025 15.34, Michael Tokarev wrote:
> 09.01.2025 21:52, 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
>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>> Signed-off-by: Fabiano Rosas <farosas@suse.de>
>> Message-Id: <20241213160120.23880-3-farosas@suse.de>
> 
> And this one causes s390x-migration-test failure on 9.2 on s390x.
> While this test succeeds on x86_64.
> 
> https://gitlab.com/qemu-project/qemu/-/jobs/8829799108
> 
> Help? :)

That looks like the script error that should be fixed by patch 3/7, I think? 
You likely need that patch, too...

  Thomas

Re: [PATCH v3 7/7] s390x: Fix CSS migration

Posted by Michael Tokarev 2 months, 3 weeks ago

09.01.2025 21:52, 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

Or should it be applied to 9.1 ONLY, but not to 9.2?

/mjt