| Message ID | 20171228091616.7999-1-vsementsov@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | migration: finalize current_migration object | expand |
On Thu, Dec 28, 2017 at 12:16:16PM +0300, Vladimir Sementsov-Ogievskiy wrote: > current_migration has .instance_finalize callback, but it is not > called, because nobody unrefs current_migration. Fix that. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Peter Xu <peterx@redhat.com>
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> wrote: > current_migration has .instance_finalize callback, but it is not > called, because nobody unrefs current_migration. Fix that. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Juan Quintela <quintela@redhat.com>
diff --git a/include/migration/misc.h b/include/migration/misc.h index c079b7771b..77fd4f587c 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -44,6 +44,7 @@ void dump_vmstate_json_to_file(FILE *out_fp); /* migration/migration.c */ void migration_object_init(void); +void migration_object_finalize(void); void qemu_start_incoming_migration(const char *uri, Error **errp); bool migration_is_idle(void); void add_migration_state_change_notifier(Notifier *notify); diff --git a/migration/migration.c b/migration/migration.c index 4de3b551fe..090678f6a8 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -132,6 +132,11 @@ void migration_object_init(void) } } +void migration_object_finalize(void) +{ + object_unref(OBJECT(current_migration)); +} + /* For outgoing */ MigrationState *migrate_get_current(void) { diff --git a/vl.c b/vl.c index d3a5c5d021..073aef4b84 100644 --- a/vl.c +++ b/vl.c @@ -4874,6 +4874,7 @@ int main(int argc, char **argv, char **envp) monitor_cleanup(); qemu_chr_cleanup(); user_creatable_cleanup(); + migration_object_finalize(); /* TODO: unref root container, check all devices are ok */ return 0;
current_migration has .instance_finalize callback, but it is not called, because nobody unrefs current_migration. Fix that. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- Note: migration_object_init() is called from main() too. _finalize looks a bit weird after all _cleanp's, but it finally calls migration_instance_finalize, so it should be more correct. include/migration/misc.h | 1 + migration/migration.c | 5 +++++ vl.c | 1 + 3 files changed, 7 insertions(+)