| Message ID | 1499842423-21101-4-git-send-email-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
* Peter Xu (peterx@redhat.com) wrote: > Do the same thing to migration capabilities, just like what we did in > previous patch for migration parameters. > > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/migration.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/migration/migration.c b/migration/migration.c > index fd00670..7e6f353 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -2001,6 +2001,9 @@ void migration_global_dump(Monitor *mon) > ms->send_configuration, ms->send_section_footer); > } > > +#define DEFINE_PROP_MIG_CAP(name, x) \ > + DEFINE_PROP_BOOL(name, MigrationState, enabled_capabilities[x], false) > + > static Property migration_properties[] = { > DEFINE_PROP_BOOL("store-global-state", MigrationState, > store_global_state, true), > @@ -2034,6 +2037,20 @@ static Property migration_properties[] = { > DEFINE_PROP_INT64("x-checkpoint-delay", MigrationState, > parameters.x_checkpoint_delay, > DEFAULT_MIGRATE_X_CHECKPOINT_DELAY), > + > + /* Migration capabilities */ > + DEFINE_PROP_MIG_CAP("xbzrle", MIGRATION_CAPABILITY_XBZRLE), > + DEFINE_PROP_MIG_CAP("rdma-pin-all", MIGRATION_CAPABILITY_RDMA_PIN_ALL), > + DEFINE_PROP_MIG_CAP("auto-converge", MIGRATION_CAPABILITY_AUTO_CONVERGE), > + DEFINE_PROP_MIG_CAP("zero-blocks", MIGRATION_CAPABILITY_ZERO_BLOCKS), > + DEFINE_PROP_MIG_CAP("compress", MIGRATION_CAPABILITY_COMPRESS), > + DEFINE_PROP_MIG_CAP("events", MIGRATION_CAPABILITY_EVENTS), > + DEFINE_PROP_MIG_CAP("postcopy-ram", MIGRATION_CAPABILITY_POSTCOPY_RAM), > + DEFINE_PROP_MIG_CAP("x-colo", MIGRATION_CAPABILITY_X_COLO), > + DEFINE_PROP_MIG_CAP("release-ram", MIGRATION_CAPABILITY_RELEASE_RAM), > + DEFINE_PROP_MIG_CAP("block", MIGRATION_CAPABILITY_BLOCK), > + DEFINE_PROP_MIG_CAP("return-path", MIGRATION_CAPABILITY_RETURN_PATH), > + > DEFINE_PROP_END_OF_LIST(), > }; > > -- > 2.7.4 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/migration.c b/migration/migration.c index fd00670..7e6f353 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2001,6 +2001,9 @@ void migration_global_dump(Monitor *mon) ms->send_configuration, ms->send_section_footer); } +#define DEFINE_PROP_MIG_CAP(name, x) \ + DEFINE_PROP_BOOL(name, MigrationState, enabled_capabilities[x], false) + static Property migration_properties[] = { DEFINE_PROP_BOOL("store-global-state", MigrationState, store_global_state, true), @@ -2034,6 +2037,20 @@ static Property migration_properties[] = { DEFINE_PROP_INT64("x-checkpoint-delay", MigrationState, parameters.x_checkpoint_delay, DEFAULT_MIGRATE_X_CHECKPOINT_DELAY), + + /* Migration capabilities */ + DEFINE_PROP_MIG_CAP("xbzrle", MIGRATION_CAPABILITY_XBZRLE), + DEFINE_PROP_MIG_CAP("rdma-pin-all", MIGRATION_CAPABILITY_RDMA_PIN_ALL), + DEFINE_PROP_MIG_CAP("auto-converge", MIGRATION_CAPABILITY_AUTO_CONVERGE), + DEFINE_PROP_MIG_CAP("zero-blocks", MIGRATION_CAPABILITY_ZERO_BLOCKS), + DEFINE_PROP_MIG_CAP("compress", MIGRATION_CAPABILITY_COMPRESS), + DEFINE_PROP_MIG_CAP("events", MIGRATION_CAPABILITY_EVENTS), + DEFINE_PROP_MIG_CAP("postcopy-ram", MIGRATION_CAPABILITY_POSTCOPY_RAM), + DEFINE_PROP_MIG_CAP("x-colo", MIGRATION_CAPABILITY_X_COLO), + DEFINE_PROP_MIG_CAP("release-ram", MIGRATION_CAPABILITY_RELEASE_RAM), + DEFINE_PROP_MIG_CAP("block", MIGRATION_CAPABILITY_BLOCK), + DEFINE_PROP_MIG_CAP("return-path", MIGRATION_CAPABILITY_RETURN_PATH), + DEFINE_PROP_END_OF_LIST(), };
Do the same thing to migration capabilities, just like what we did in previous patch for migration parameters. Signed-off-by: Peter Xu <peterx@redhat.com> --- migration/migration.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)