Commit 38bb54f3 authored by Markus Armbruster's avatar Markus Armbruster Committed by Stefan Hajnoczi
Browse files

replication: Make --disable-replication compile again 



Broken in commit daa33c52.

Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarZhang Chen <zhangchen.fnst@cn.fujitsu.com>
Message-id: 1493298053-17140-1-git-send-email-armbru@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 64a6047d

migration/colo.c

+12 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ void qmp_xen_set_replication(bool enable, bool primary, 
                             bool has_failover, bool failover,

                             Error **errp)

{

#ifdef CONFIG_REPLICATION

    ReplicationMode mode = primary ?

                           REPLICATION_MODE_PRIMARY :

                           REPLICATION_MODE_SECONDARY;
@@ -171,10 +172,14 @@ void qmp_xen_set_replication(bool enable, bool primary, 
        }

        replication_stop_all(failover, failover ? NULL : errp);

    }

#else

    abort();

#endif

}



ReplicationStatus *qmp_query_xen_replication_status(Error **errp)

{

#ifdef CONFIG_REPLICATION

    Error *err = NULL;

    ReplicationStatus *s = g_new0(ReplicationStatus, 1);
@@ -189,11 +194,18 @@ ReplicationStatus *qmp_query_xen_replication_status(Error **errp) 


    error_free(err);

    return s;

#else

    abort();

#endif

}



void qmp_xen_colo_do_checkpoint(Error **errp)

{

#ifdef CONFIG_REPLICATION

    replication_do_checkpoint_all(errp);

#else

    abort();

#endif

}



static void colo_send_message(QEMUFile *f, COLOMessage msg,

monitor.c

+5 −0
Original line number Diff line number Diff line
@@ -974,6 +974,11 @@ static void qmp_unregister_commands_hack(void) 
#ifndef CONFIG_SPICE

    qmp_unregister_command(&qmp_commands, "query-spice");

#endif

#ifndef CONFIG_REPLICATION

    qmp_unregister_command(&qmp_commands, "xen-set-replication");

    qmp_unregister_command(&qmp_commands, "query-xen-replication-status");

    qmp_unregister_command(&qmp_commands, "xen-colo-do-checkpoint");

#endif

#ifndef TARGET_I386

    qmp_unregister_command(&qmp_commands, "rtc-reset-reinjection");

#endif