[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/22] Migration/colo.c: Make COLO node running after
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 21/22] Migration/colo.c: Make COLO node running after failover |
Date: |
Wed, 6 Mar 2019 11:42:26 +0000 |
From: Zhang Chen <address@hidden>
Delay to close COLO for auto start VM after failover.
Signed-off-by: Zhang Chen <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/colo.c | 1 -
migration/migration.c | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/migration/colo.c b/migration/colo.c
index a916dc178c..5ba610dc01 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -874,7 +874,6 @@ out:
qemu_fclose(mis->to_src_file);
mis->to_src_file = NULL;
}
- migration_incoming_disable_colo();
rcu_unregister_thread();
return NULL;
diff --git a/migration/migration.c b/migration/migration.c
index 952d29243e..df6fd8e0e5 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -417,6 +417,9 @@ static void process_incoming_migration_bh(void *opaque)
} else {
runstate_set(RUN_STATE_PAUSED);
}
+ } else if (migration_incoming_colo_enabled()) {
+ migration_incoming_disable_colo();
+ vm_start();
} else {
runstate_set(global_state_get_runstate());
}
--
2.20.1
- [Qemu-devel] [PULL 15/22] migration: use bitmap_mutex in migration_bitmap_clear_dirty, (continued)
- [Qemu-devel] [PULL 15/22] migration: use bitmap_mutex in migration_bitmap_clear_dirty, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 16/22] migration: API to clear bits of guest free pages from the dirty bitmap, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 14/22] bitmap: bitmap_count_one_with_offset, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 17/22] migration/ram.c: add a notifier chain for precopy, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 18/22] migration/ram.c: add the free page optimization enable flag, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 19/22] virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 20/22] Migration/colo.c: Fix double close bug when occur COLO failover, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 21/22] Migration/colo.c: Make COLO node running after failover,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 22/22] qapi/migration.json: Remove a variable that doesn't exist in example, Dr. David Alan Gilbert (git), 2019/03/06
- Re: [Qemu-devel] [PULL 00/22] migration queue, no-reply, 2019/03/06
- Re: [Qemu-devel] [PULL 00/22] migration queue, Peter Maydell, 2019/03/06