ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390_flic: add migration-enabled property 

Instead of mucking with css_migration_enabled(), add a property specific to
the FLIC device, similar to what is done for TYPE_S390_STATTRIB.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240509170044.190795-3-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-05-09 19:00:33 +02:00
parent ef7c4a97bf
commit 9d1b0f5bf5
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/intc/s390_flic.c
View File

@ -405,6 +405,8 @@ static void qemu_s390_flic_class_init(ObjectClass *oc, void *data)
static Property s390_flic_common_properties[] = { static Property s390_flic_common_properties[] = {
DEFINE_PROP_UINT32("adapter_routes_max_batch", S390FLICState, DEFINE_PROP_UINT32("adapter_routes_max_batch", S390FLICState,
adapter_routes_max_batch, ADAPTER_ROUTES_MAX_GSI), adapter_routes_max_batch, ADAPTER_ROUTES_MAX_GSI),
DEFINE_PROP_BOOL("migration-enabled", S390FLICState,
migration_enabled, true),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
@ -457,7 +459,9 @@ type_init(qemu_s390_flic_register_types)
static bool adapter_info_so_needed(void *opaque) static bool adapter_info_so_needed(void *opaque)
{ {
return css_migration_enabled(); S390FLICState *fs = S390_FLIC_COMMON(opaque);
return fs->migration_enabled;
} }
const VMStateDescription vmstate_adapter_info_so = { const VMStateDescription vmstate_adapter_info_so = {

1
hw/s390x/s390-virtio-ccw.c
View File

@ -1182,6 +1182,7 @@ static void ccw_machine_2_9_class_options(MachineClass *mc)
S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc); S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc);
static GlobalProperty compat[] = { static GlobalProperty compat[] = {
{ TYPE_S390_STATTRIB, "migration-enabled", "off", }, { TYPE_S390_STATTRIB, "migration-enabled", "off", },
{ TYPE_S390_FLIC_COMMON, "migration-enabled", "off", },
}; };
ccw_machine_2_10_class_options(mc); ccw_machine_2_10_class_options(mc);

1
include/hw/s390x/s390_flic.h
View File

@ -47,6 +47,7 @@ struct S390FLICState {
/* to limit AdapterRoutes.num_routes for compat */ /* to limit AdapterRoutes.num_routes for compat */
uint32_t adapter_routes_max_batch; uint32_t adapter_routes_max_batch;
bool ais_supported; bool ais_supported;
bool migration_enabled;
}; };