Skip to content

Commit e7a9d93

Browse files
Fabiano RosasMichael Tokarev
Fabiano Rosas
authored and
Michael Tokarev
committed
s390x: Fix CSS migration
Commit a55ae46 ("s390: move css_migration_enabled from machine to css.c") disabled CSS migration globally instead of doing it per-instance. CC: Paolo Bonzini <[email protected]> CC: [email protected] #9.1 Fixes: a55ae46 ("s390: move css_migration_enabled from machine to css.c") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2704 Reviewed-by: Thomas Huth <[email protected]> Message-Id: <[email protected]> Signed-off-by: Fabiano Rosas <[email protected]> (cherry picked from commit c76ee1f) Signed-off-by: Michael Tokarev <[email protected]>
1 parent e3839b0 commit e7a9d93

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

hw/s390x/s390-virtio-ccw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1200,6 +1200,7 @@ static void ccw_machine_2_9_instance_options(MachineState *machine)
12001200
s390_cpudef_featoff_greater(12, 1, S390_FEAT_ZPCI);
12011201
s390_cpudef_featoff_greater(12, 1, S390_FEAT_ADAPTER_INT_SUPPRESSION);
12021202
s390_cpudef_featoff_greater(12, 1, S390_FEAT_ADAPTER_EVENT_NOTIFICATION);
1203+
css_migration_enabled = false;
12031204
}
12041205

12051206
static void ccw_machine_2_9_class_options(MachineClass *mc)
@@ -1212,7 +1213,6 @@ static void ccw_machine_2_9_class_options(MachineClass *mc)
12121213
ccw_machine_2_10_class_options(mc);
12131214
compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len);
12141215
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
1215-
css_migration_enabled = false;
12161216
}
12171217
DEFINE_CCW_MACHINE(2, 9);
12181218

0 commit comments

Comments
 (0)