[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/14] migration: finalize current_migration object
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 14/14] migration: finalize current_migration object |
Date: |
Wed, 3 Jan 2018 10:38:34 +0100 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
current_migration has .instance_finalize callback, but it is not
called, because nobody unrefs current_migration. Fix that.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
include/migration/misc.h | 1 +
migration/migration.c | 5 +++++
vl.c | 1 +
3 files changed, 7 insertions(+)
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 17cc219da2..7a77b193c1 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;
--
2.14.3
- [Qemu-devel] [PULL 05/14] migration: free result string, (continued)
- [Qemu-devel] [PULL 05/14] migration: free result string, Juan Quintela, 2018/01/03
- [Qemu-devel] [PULL 06/14] migration: fix analyze-migration.py script with radix table, Juan Quintela, 2018/01/03
- [Qemu-devel] [PULL 04/14] docs: Convert migration.txt to rst, Juan Quintela, 2018/01/03
- [Qemu-devel] [PULL 07/14] migration: introduce postcopy-blocktime capability, Juan Quintela, 2018/01/03
- [Qemu-devel] [PULL 08/14] migration: add postcopy blocktime ctx into MigrationIncomingState, Juan Quintela, 2018/01/03
- [Qemu-devel] [PULL 09/14] migration: calculate vCPU blocktime on dst side, Juan Quintela, 2018/01/03
- [Qemu-devel] [PULL 11/14] migration: add blocktime calculation into migration-test, Juan Quintela, 2018/01/03
- [Qemu-devel] [PULL 10/14] migration: postcopy_blocktime documentation, Juan Quintela, 2018/01/03
- [Qemu-devel] [PULL 12/14] migration: add postcopy total blocktime into query-migrate, Juan Quintela, 2018/01/03
- [Qemu-devel] [PULL 13/14] migration: Guard ram_bytes_remaining against early call, Juan Quintela, 2018/01/03
- [Qemu-devel] [PULL 14/14] migration: finalize current_migration object,
Juan Quintela <=
- Re: [Qemu-devel] [PULL 00/14] Migration pull request, Eric Blake, 2018/01/04
- Re: [Qemu-devel] [PULL 00/14] Migration pull request, Peter Maydell, 2018/01/11