From: Fabiano Rosas Date: Thu, 9 Jan 2025 18:52:49 +0000 (-0300) Subject: s390x: Fix CSS migration X-Git-Tag: v9.2.1~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7a9d9342865e5f7dcd836afa77990e1980b1986;p=thirdparty%2Fqemu.git s390x: Fix CSS migration 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 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 Message-Id: <20250109185249.23952-8-farosas@suse.de> Signed-off-by: Fabiano Rosas (cherry picked from commit c76ee1f6255c3988a9447d363bb17072f1ec84e1) Signed-off-by: Michael Tokarev --- diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 53c62fb77c..54f09cf096 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1200,6 +1200,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) @@ -1212,7 +1213,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);