From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWbnL-0002v6-Jv for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:40:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWbnK-0000r7-O4 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:40:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59830) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eWbnK-0000qX-Ht for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:40:54 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 93BA8368E6 for ; Wed, 3 Jan 2018 05:40:53 +0000 (UTC) From: Peter Xu Date: Wed, 3 Jan 2018 13:40:34 +0800 Message-Id: <20180103054043.25719-3-peterx@redhat.com> In-Reply-To: <20180103054043.25719-1-peterx@redhat.com> References: <20180103054043.25719-1-peterx@redhat.com> Subject: [Qemu-devel] [PATCH 02/11] migration: qemu_savevm_state_cleanup() in cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier , Juan Quintela , "Dr . David Alan Gilbert" , peterx@redhat.com Moving existing callers all into migrate_fd_cleanup(). It simplifies migration_thread() a bit. Signed-off-by: Peter Xu --- migration/migration.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 0ee4b4c27c..edbda43246 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1077,6 +1077,8 @@ static void migrate_fd_cleanup(void *opaque) qemu_bh_delete(s->cleanup_bh); s->cleanup_bh = NULL; + qemu_savevm_state_cleanup(); + if (s->to_dst_file) { Error *local_err = NULL; @@ -2290,13 +2292,6 @@ static void *migration_thread(void *opaque) end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); qemu_mutex_lock_iothread(); - /* - * The resource has been allocated by migration will be reused in COLO - * process, so don't release them. - */ - if (!enable_colo) { - qemu_savevm_state_cleanup(); - } if (s->state == MIGRATION_STATUS_COMPLETED) { uint64_t transferred_bytes = qemu_ftell(s->to_dst_file); s->total_time = end_time - s->total_time; @@ -2312,7 +2307,6 @@ static void *migration_thread(void *opaque) if (s->state == MIGRATION_STATUS_ACTIVE) { assert(enable_colo); migrate_start_colo_process(s); - qemu_savevm_state_cleanup(); /* * Fixme: we will run VM in COLO no matter its old running state. * After exited COLO, we will keep running. -- 2.14.3