qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: dgilbert@redhat.com, lvivier@redhat.com, peterx@redhat.com,
	Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Subject: [Qemu-devel] [PULL 14/14] migration: finalize current_migration object
Date: Wed,  3 Jan 2018 10:38:34 +0100	[thread overview]
Message-ID: <20180103093834.20879-15-quintela@redhat.com> (raw)
In-Reply-To: <20180103093834.20879-1-quintela@redhat.com>

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

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>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 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

  parent reply	other threads:[~2018-01-03  9:39 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-03  9:38 [Qemu-devel] [PULL 00/14] Migration pull request Juan Quintela
2018-01-03  9:38 ` [Qemu-devel] [PULL 01/14] migration: Use proper types in json Juan Quintela
2018-01-03  9:38 ` [Qemu-devel] [PULL 02/14] migration: print features as on off Juan Quintela
2018-01-03  9:38 ` [Qemu-devel] [PULL 03/14] migration: free addr in the same function that we created it Juan Quintela
2018-01-03  9:38 ` [Qemu-devel] [PULL 04/14] docs: Convert migration.txt to rst Juan Quintela
2018-01-03  9:38 ` [Qemu-devel] [PULL 05/14] migration: free result string Juan Quintela
2018-01-03  9:38 ` [Qemu-devel] [PULL 06/14] migration: fix analyze-migration.py script with radix table Juan Quintela
2018-01-03  9:38 ` [Qemu-devel] [PULL 07/14] migration: introduce postcopy-blocktime capability Juan Quintela
2018-01-03  9:38 ` [Qemu-devel] [PULL 08/14] migration: add postcopy blocktime ctx into MigrationIncomingState Juan Quintela
2018-01-03  9:38 ` [Qemu-devel] [PULL 09/14] migration: calculate vCPU blocktime on dst side Juan Quintela
2018-01-03  9:38 ` [Qemu-devel] [PULL 10/14] migration: postcopy_blocktime documentation Juan Quintela
2018-01-03  9:38 ` [Qemu-devel] [PULL 11/14] migration: add blocktime calculation into migration-test Juan Quintela
2018-01-03  9:38 ` [Qemu-devel] [PULL 12/14] migration: add postcopy total blocktime into query-migrate Juan Quintela
2018-01-03  9:38 ` [Qemu-devel] [PULL 13/14] migration: Guard ram_bytes_remaining against early call Juan Quintela
2018-01-03  9:38 ` Juan Quintela [this message]
2018-01-05  0:30 ` [Qemu-devel] [PULL 00/14] Migration pull request Eric Blake
2018-01-05  9:29   ` Dr. David Alan Gilbert
2018-01-05  9:59   ` Juan Quintela
2018-01-09 18:24     ` Peter Maydell
2018-01-09 18:28       ` Juan Quintela
2018-01-10  4:58     ` Alexey Perevalov
2018-01-11 11:51 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180103093834.20879-15-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=vsementsov@virtuozzo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).