migration: finalize current_migration object
PATCH 1/1 migration: finalize current_migration object
current_migration has .instance_finalize callback, but it is not called, because nobody unrefs current_migration. Fix that.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
---
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(+)
include/migration/misc.h +1 -0
@@ -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);
migration/migration.c +5 -0
@@ -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 ) {
vl.c +1 -0
@@ -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 ;
Signature · 1 line
2.11.1
Quoted 4 lines · Vladimir Sementsov-Ogievskiy
current_migrationhas .instance_finalize callback, but it is not called, because nobody unrefscurrent_migration. Fix that.Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
Reviewed-by Peter Xu <[email protected]>
Signature · 1 line
Peter Xu
Quoted 4 lines · Vladimir Sementsov-Ogievskiy
current_migrationhas .instance_finalize callback, but it is not called, because nobody unrefscurrent_migration. Fix that.Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
Reviewed-by Juan Quintela <[email protected]>