129 lines
3.5 KiB
Diff
129 lines
3.5 KiB
Diff
From 5be2fefbc0999ada944c36a865b154d398e16e27 Mon Sep 17 00:00:00 2001
|
|
From: Zhang Chen <zhangckid@gmail.com>
|
|
Date: Thu, 1 Nov 2018 10:12:26 +0800
|
|
Subject: migration/colo.c: Fix compilation issue when disable replication
|
|
|
|
This compilation issue will occur when user use --disable-replication
|
|
to config Qemu.
|
|
|
|
Reported-by: Thomas Huth <thuth@redhat.com>
|
|
Signed-off-by: Zhang Chen <zhangckid@gmail.com>
|
|
---
|
|
migration/colo.c | 28 +++++++++++++++++++++++++++-
|
|
1 file changed, 27 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/migration/colo.c b/migration/colo.c
|
|
index 956ac23..fcff04c 100644
|
|
--- a/migration/colo.c
|
|
+++ b/migration/colo.c
|
|
@@ -59,6 +59,8 @@ static bool colo_runstate_is_stopped(void)
|
|
|
|
static void secondary_vm_do_failover(void)
|
|
{
|
|
+/* COLO needs enable block-replication */
|
|
+#ifdef CONFIG_REPLICATION
|
|
int old_state;
|
|
MigrationIncomingState *mis = migration_incoming_get_current();
|
|
Error *local_err = NULL;
|
|
@@ -121,10 +123,14 @@ static void secondary_vm_do_failover(void)
|
|
if (mis->migration_incoming_co) {
|
|
qemu_coroutine_enter(mis->migration_incoming_co);
|
|
}
|
|
+#else
|
|
+ abort();
|
|
+#endif
|
|
}
|
|
|
|
static void primary_vm_do_failover(void)
|
|
{
|
|
+#ifdef CONFIG_REPLICATION
|
|
MigrationState *s = migrate_get_current();
|
|
int old_state;
|
|
Error *local_err = NULL;
|
|
@@ -165,6 +171,9 @@ static void primary_vm_do_failover(void)
|
|
|
|
/* Notify COLO thread that failover work is finished */
|
|
qemu_sem_post(&s->colo_exit_sem);
|
|
+#else
|
|
+ abort();
|
|
+#endif
|
|
}
|
|
|
|
COLOMode get_colo_mode(void)
|
|
@@ -415,11 +424,16 @@ static int colo_do_checkpoint_transaction(MigrationState *s,
|
|
/* Disable block migration */
|
|
migrate_set_block_enabled(false, &local_err);
|
|
qemu_mutex_lock_iothread();
|
|
+
|
|
+#ifdef CONFIG_REPLICATION
|
|
replication_do_checkpoint_all(&local_err);
|
|
if (local_err) {
|
|
qemu_mutex_unlock_iothread();
|
|
goto out;
|
|
}
|
|
+#else
|
|
+ abort();
|
|
+#endif
|
|
|
|
colo_send_message(s->to_dst_file, COLO_MESSAGE_VMSTATE_SEND, &local_err);
|
|
if (local_err) {
|
|
@@ -523,11 +537,15 @@ static void colo_process_checkpoint(MigrationState *s)
|
|
object_unref(OBJECT(bioc));
|
|
|
|
qemu_mutex_lock_iothread();
|
|
+#ifdef CONFIG_REPLICATION
|
|
replication_start_all(REPLICATION_MODE_PRIMARY, &local_err);
|
|
if (local_err) {
|
|
qemu_mutex_unlock_iothread();
|
|
goto out;
|
|
}
|
|
+#else
|
|
+ abort();
|
|
+#endif
|
|
|
|
vm_start();
|
|
qemu_mutex_unlock_iothread();
|
|
@@ -690,11 +708,15 @@ void *colo_process_incoming_thread(void *opaque)
|
|
object_unref(OBJECT(bioc));
|
|
|
|
qemu_mutex_lock_iothread();
|
|
+#ifdef CONFIG_REPLICATION
|
|
replication_start_all(REPLICATION_MODE_SECONDARY, &local_err);
|
|
if (local_err) {
|
|
qemu_mutex_unlock_iothread();
|
|
goto out;
|
|
}
|
|
+#else
|
|
+ abort();
|
|
+#endif
|
|
vm_start();
|
|
trace_colo_vm_state_change("stop", "run");
|
|
qemu_mutex_unlock_iothread();
|
|
@@ -785,18 +807,22 @@ void *colo_process_incoming_thread(void *opaque)
|
|
goto out;
|
|
}
|
|
|
|
+#ifdef CONFIG_REPLICATION
|
|
replication_get_error_all(&local_err);
|
|
if (local_err) {
|
|
qemu_mutex_unlock_iothread();
|
|
goto out;
|
|
}
|
|
+
|
|
/* discard colo disk buffer */
|
|
replication_do_checkpoint_all(&local_err);
|
|
if (local_err) {
|
|
qemu_mutex_unlock_iothread();
|
|
goto out;
|
|
}
|
|
-
|
|
+#else
|
|
+ abort();
|
|
+#endif
|
|
/* Notify all filters of all NIC to do checkpoint */
|
|
colo_notify_filters_event(COLO_EVENT_CHECKPOINT, &local_err);
|
|
|
|
--
|
|
1.8.3.1
|
|
|