david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migration/colo.c: Fix compilation issue when disable replication

Browse Source 
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>
Message-Id: <20181101021226.6353-1-zhangckid@gmail.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Zhang Chen 2018-11-01 10:12:26 +08:00 committed by Dr. David Alan Gilbert
parent 47c1cc30e4
commit 3ebb9c4f52
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
migration/colo.c
View File

@ -59,6 +59,8 @@ static bool colo_runstate_is_stopped(void)
static void secondary_vm_do_failover(void) static void secondary_vm_do_failover(void)
{ {
/* COLO needs enable block-replication */
#ifdef CONFIG_REPLICATION
int old_state; int old_state;
MigrationIncomingState *mis = migration_incoming_get_current(); MigrationIncomingState *mis = migration_incoming_get_current();
Error *local_err = NULL; Error *local_err = NULL;
@ -121,10 +123,14 @@ static void secondary_vm_do_failover(void)
if (mis->migration_incoming_co) { if (mis->migration_incoming_co) {
qemu_coroutine_enter(mis->migration_incoming_co); qemu_coroutine_enter(mis->migration_incoming_co);
} }
#else
abort();
#endif
} }
static void primary_vm_do_failover(void) static void primary_vm_do_failover(void)
{ {
#ifdef CONFIG_REPLICATION
MigrationState *s = migrate_get_current(); MigrationState *s = migrate_get_current();
int old_state; int old_state;
Error *local_err = NULL; Error *local_err = NULL;
@ -165,6 +171,9 @@ static void primary_vm_do_failover(void)
/* Notify COLO thread that failover work is finished */ /* Notify COLO thread that failover work is finished */
qemu_sem_post(&s->colo_exit_sem); qemu_sem_post(&s->colo_exit_sem);
#else
abort();
#endif
} }
COLOMode get_colo_mode(void) COLOMode get_colo_mode(void)
@ -415,11 +424,16 @@ static int colo_do_checkpoint_transaction(MigrationState *s,
/* Disable block migration */ /* Disable block migration */
migrate_set_block_enabled(false, &local_err); migrate_set_block_enabled(false, &local_err);
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
#ifdef CONFIG_REPLICATION
replication_do_checkpoint_all(&local_err); replication_do_checkpoint_all(&local_err);
if (local_err) { if (local_err) {
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();
goto out; goto out;
} }
#else
abort();
#endif
colo_send_message(s->to_dst_file, COLO_MESSAGE_VMSTATE_SEND, &local_err); colo_send_message(s->to_dst_file, COLO_MESSAGE_VMSTATE_SEND, &local_err);
if (local_err) { if (local_err) {
@ -523,11 +537,15 @@ static void colo_process_checkpoint(MigrationState *s)
object_unref(OBJECT(bioc)); object_unref(OBJECT(bioc));
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
#ifdef CONFIG_REPLICATION
replication_start_all(REPLICATION_MODE_PRIMARY, &local_err); replication_start_all(REPLICATION_MODE_PRIMARY, &local_err);
if (local_err) { if (local_err) {
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();
goto out; goto out;
} }
#else
abort();
#endif
vm_start(); vm_start();
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();
@ -690,11 +708,15 @@ void *colo_process_incoming_thread(void *opaque)
object_unref(OBJECT(bioc)); object_unref(OBJECT(bioc));
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
#ifdef CONFIG_REPLICATION
replication_start_all(REPLICATION_MODE_SECONDARY, &local_err); replication_start_all(REPLICATION_MODE_SECONDARY, &local_err);
if (local_err) { if (local_err) {
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();
goto out; goto out;
} }
#else
abort();
#endif
vm_start(); vm_start();
trace_colo_vm_state_change("stop", "run"); trace_colo_vm_state_change("stop", "run");
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();
@ -785,18 +807,22 @@ void *colo_process_incoming_thread(void *opaque)
goto out; goto out;
} }
#ifdef CONFIG_REPLICATION
replication_get_error_all(&local_err); replication_get_error_all(&local_err);
if (local_err) { if (local_err) {
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();
goto out; goto out;
} }
/* discard colo disk buffer */ /* discard colo disk buffer */
replication_do_checkpoint_all(&local_err); replication_do_checkpoint_all(&local_err);
if (local_err) { if (local_err) {
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();
goto out; goto out;
} }
#else
abort();
#endif
/* Notify all filters of all NIC to do checkpoint */ /* Notify all filters of all NIC to do checkpoint */
colo_notify_filters_event(COLO_EVENT_CHECKPOINT, &local_err); colo_notify_filters_event(COLO_EVENT_CHECKPOINT, &local_err);