mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
migration: Use device_class_set_props_n
Export the migration_properties array size from options.c; use that to feed device_class_set_props_n. We must remove DEFINE_PROP_END_OF_LIST so the count is correct. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Tested-by: Lei Yang <leiyang@redhat.com> Link: https://lore.kernel.org/r/20241218134251.4724-15-richard.henderson@linaro.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
cb9f4b28ee
commit
0017f5713a
3 changed files with 4 additions and 2 deletions
|
@ -3822,7 +3822,8 @@ static void migration_class_init(ObjectClass *klass, void *data)
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
|
||||||
dc->user_creatable = false;
|
dc->user_creatable = false;
|
||||||
(device_class_set_props)(dc, migration_properties);
|
device_class_set_props_n(dc, migration_properties,
|
||||||
|
migration_properties_count);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void migration_instance_finalize(Object *obj)
|
static void migration_instance_finalize(Object *obj)
|
||||||
|
|
|
@ -196,8 +196,8 @@ const Property migration_properties[] = {
|
||||||
MIGRATION_CAPABILITY_SWITCHOVER_ACK),
|
MIGRATION_CAPABILITY_SWITCHOVER_ACK),
|
||||||
DEFINE_PROP_MIG_CAP("x-dirty-limit", MIGRATION_CAPABILITY_DIRTY_LIMIT),
|
DEFINE_PROP_MIG_CAP("x-dirty-limit", MIGRATION_CAPABILITY_DIRTY_LIMIT),
|
||||||
DEFINE_PROP_MIG_CAP("mapped-ram", MIGRATION_CAPABILITY_MAPPED_RAM),
|
DEFINE_PROP_MIG_CAP("mapped-ram", MIGRATION_CAPABILITY_MAPPED_RAM),
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
|
||||||
};
|
};
|
||||||
|
const size_t migration_properties_count = ARRAY_SIZE(migration_properties);
|
||||||
|
|
||||||
bool migrate_auto_converge(void)
|
bool migrate_auto_converge(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
/* migration properties */
|
/* migration properties */
|
||||||
|
|
||||||
extern const Property migration_properties[];
|
extern const Property migration_properties[];
|
||||||
|
extern const size_t migration_properties_count;
|
||||||
|
|
||||||
/* capabilities */
|
/* capabilities */
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue