From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zr20O-00005r-8t for qemu-devel@nongnu.org; Tue, 27 Oct 2015 07:01:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zr20H-00068P-4o for qemu-devel@nongnu.org; Tue, 27 Oct 2015 07:01:28 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:30671) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zr20G-000680-TS for qemu-devel@nongnu.org; Tue, 27 Oct 2015 07:01:21 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NWV00HKALA4WHA0@mailout4.w1.samsung.com> for qemu-devel@nongnu.org; Tue, 27 Oct 2015 11:01:16 +0000 (GMT) From: Pavel Fedin Date: Tue, 27 Oct 2015 14:01:15 +0300 Message-id: <012c01d110a6$cd61cf90$68256eb0$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit Content-language: ru Subject: [Qemu-devel] [PATCH] migration: Introduce migration_in_completion() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: 'Amit Shah' , 'Luiz Capitulino' , 'Juan Quintela' This allows to signal migration notifiers that the migration has entered final phase. The condition is set after vm_stop_force_state(). This will be necessary for ITS live migration on ARM, which will have to dump its state into guest RAM at this point. Signed-off-by: Pavel Fedin --- include/migration/migration.h | 2 ++ migration/migration.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/include/migration/migration.h b/include/migration/migration.h index 8334621..51b0ea2 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -69,6 +69,7 @@ struct MigrationState int parameters[MIGRATION_PARAMETER_MAX]; int state; + bool in_completion; MigrationParams params; double mbps; int64_t total_time; @@ -117,6 +118,7 @@ int migrate_fd_close(MigrationState *s); void add_migration_state_change_notifier(Notifier *notify); void remove_migration_state_change_notifier(Notifier *notify); bool migration_in_setup(MigrationState *); +bool migration_in_completion(MigrationState *); bool migration_has_finished(MigrationState *); bool migration_has_failed(MigrationState *); MigrationState *migrate_get_current(void); diff --git a/migration/migration.c b/migration/migration.c index b092f38..f4a2421 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -674,6 +674,11 @@ bool migration_in_setup(MigrationState *s) return s->state == MIGRATION_STATUS_SETUP; } +bool migration_in_completion(MigrationState *s) +{ + return s->in_completion; +} + bool migration_has_finished(MigrationState *s) { return s->state == MIGRATION_STATUS_COMPLETED; @@ -996,6 +1001,8 @@ static void migration_completion(MigrationState *s, bool *old_vm_running, if (!ret) { ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); if (ret >= 0) { + s->in_completion = true; + notifier_list_notify(&migration_state_notifiers, s); qemu_file_set_rate_limit(s->file, INT64_MAX); qemu_savevm_state_complete(s->file); } -- 1.9.5.msysgit.0