| Message ID | 20230424183236.74561-9-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Migration: Create options.c for capabilities/params/properties | expand |
On 24.04.23 21:32, Juan Quintela wrote: > This makes the function more regular with everything else. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> > --- > migration/migration.c | 4 ++-- > migration/options.c | 4 +++- > migration/options.h | 2 +- > 3 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index cefe6da2b8..ef8caa79b9 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1218,7 +1218,7 @@ static void migrate_fd_cleanup(MigrationState *s) > error_report_err(error_copy(s->error)); > } > notifier_list_notify(&migration_state_notifiers, s); > - block_cleanup_parameters(s); > + block_cleanup_parameters(); > yank_unregister_instance(MIGRATION_YANK_INSTANCE); > } > > @@ -1712,7 +1712,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, > "a valid migration protocol"); > migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, > MIGRATION_STATUS_FAILED); > - block_cleanup_parameters(s); > + block_cleanup_parameters(); > return; > } > > diff --git a/migration/options.c b/migration/options.c > index 26fe00799b..f65b7babef 100644 > --- a/migration/options.c > +++ b/migration/options.c > @@ -597,8 +597,10 @@ void migrate_set_block_incremental(bool value) > > /* parameters helpers */ > > -void block_cleanup_parameters(MigrationState *s) > +void block_cleanup_parameters(void) > { > + MigrationState *s = migrate_get_current(); > + > if (s->must_remove_block_options) { > /* setting to false can never fail */ > migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, false, &error_abort); > diff --git a/migration/options.h b/migration/options.h > index 1fc8d341dd..3948218dbe 100644 > --- a/migration/options.h > +++ b/migration/options.h > @@ -90,6 +90,6 @@ void migrate_set_block_incremental(bool value); > > bool migrate_params_check(MigrationParameters *params, Error **errp); > void migrate_params_init(MigrationParameters *params); > -void block_cleanup_parameters(MigrationState *s); > +void block_cleanup_parameters(void); Don't you want to rename it to migrate_* ?
Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> wrote: > On 24.04.23 21:32, Juan Quintela wrote: >> This makes the function more regular with everything else. >> Signed-off-by: Juan Quintela <quintela@redhat.com> > > Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Thanks. >> --- >> migration/migration.c | 4 ++-- >> migration/options.c | 4 +++- >> migration/options.h | 2 +- >> 3 files changed, 6 insertions(+), 4 deletions(-) >> diff --git a/migration/migration.c b/migration/migration.c >> index cefe6da2b8..ef8caa79b9 100644 >> --- a/migration/migration.c >> +++ b/migration/migration.c >> @@ -1218,7 +1218,7 @@ static void migrate_fd_cleanup(MigrationState *s) >> error_report_err(error_copy(s->error)); >> } >> notifier_list_notify(&migration_state_notifiers, s); >> - block_cleanup_parameters(s); >> + block_cleanup_parameters(); >> yank_unregister_instance(MIGRATION_YANK_INSTANCE); >> } >> @@ -1712,7 +1712,7 @@ void qmp_migrate(const char *uri, bool >> has_blk, bool blk, >> "a valid migration protocol"); >> migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, >> MIGRATION_STATUS_FAILED); >> - block_cleanup_parameters(s); >> + block_cleanup_parameters(); >> return; >> } >> diff --git a/migration/options.c b/migration/options.c >> index 26fe00799b..f65b7babef 100644 >> --- a/migration/options.c >> +++ b/migration/options.c >> @@ -597,8 +597,10 @@ void migrate_set_block_incremental(bool value) >> /* parameters helpers */ >> -void block_cleanup_parameters(MigrationState *s) >> +void block_cleanup_parameters(void) >> { >> + MigrationState *s = migrate_get_current(); >> + >> if (s->must_remove_block_options) { >> /* setting to false can never fail */ >> migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, false, &error_abort); >> diff --git a/migration/options.h b/migration/options.h >> index 1fc8d341dd..3948218dbe 100644 >> --- a/migration/options.h >> +++ b/migration/options.h >> @@ -90,6 +90,6 @@ void migrate_set_block_incremental(bool value); >> bool migrate_params_check(MigrationParameters *params, Error >> **errp); >> void migrate_params_init(MigrationParameters *params); >> -void block_cleanup_parameters(MigrationState *s); >> +void block_cleanup_parameters(void); > > Don't you want to rename it to migrate_* ? The idea is to deprecate block migration. There are much better things on the block layer to migrate disks. So I think we can let it from now there. Later, Juan.
diff --git a/migration/migration.c b/migration/migration.c index cefe6da2b8..ef8caa79b9 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1218,7 +1218,7 @@ static void migrate_fd_cleanup(MigrationState *s) error_report_err(error_copy(s->error)); } notifier_list_notify(&migration_state_notifiers, s); - block_cleanup_parameters(s); + block_cleanup_parameters(); yank_unregister_instance(MIGRATION_YANK_INSTANCE); } @@ -1712,7 +1712,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, "a valid migration protocol"); migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED); - block_cleanup_parameters(s); + block_cleanup_parameters(); return; } diff --git a/migration/options.c b/migration/options.c index 26fe00799b..f65b7babef 100644 --- a/migration/options.c +++ b/migration/options.c @@ -597,8 +597,10 @@ void migrate_set_block_incremental(bool value) /* parameters helpers */ -void block_cleanup_parameters(MigrationState *s) +void block_cleanup_parameters(void) { + MigrationState *s = migrate_get_current(); + if (s->must_remove_block_options) { /* setting to false can never fail */ migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, false, &error_abort); diff --git a/migration/options.h b/migration/options.h index 1fc8d341dd..3948218dbe 100644 --- a/migration/options.h +++ b/migration/options.h @@ -90,6 +90,6 @@ void migrate_set_block_incremental(bool value); bool migrate_params_check(MigrationParameters *params, Error **errp); void migrate_params_init(MigrationParameters *params); -void block_cleanup_parameters(MigrationState *s); +void block_cleanup_parameters(void); #endif
This makes the function more regular with everything else. Signed-off-by: Juan Quintela <quintela@redhat.com> --- migration/migration.c | 4 ++-- migration/options.c | 4 +++- migration/options.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-)