Commit ebfd6216 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20181121a' into staging 



Migration fixes 2018-11-21

Notably the fix for building with --disable-replication

# gpg: Signature made Wed 21 Nov 2018 13:03:20 GMT
# gpg:                using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20181121a:
  migration/migration.c: Add COLO dependency checks
  migration/colo.c: Fix compilation issue when disable replication

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 47c1cc30 7e934f5b

migration/colo.c

+27 −1
Original line number Diff line number Diff line
@@ -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);

migration/migration.c

+9 −0
Original line number Diff line number Diff line
@@ -918,6 +918,15 @@ static bool migrate_caps_check(bool *cap_list, 
    }

#endif



#ifndef CONFIG_REPLICATION

    if (cap_list[MIGRATION_CAPABILITY_X_COLO]) {

        error_setg(errp, "QEMU compiled without replication module"

                   " can't enable COLO");

        error_append_hint(errp, "Please enable replication before COLO.\n");

        return false;

    }

#endif



    if (cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM]) {

        if (cap_list[MIGRATION_CAPABILITY_COMPRESS]) {

            /* The decompression threads asynchronously write into RAM