Commit 4cb890b8 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Minor migration fixes 2018-10-31

# gpg: Signature made Wed 31 Oct 2018 16:55:40 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-20181031a:
  migration: avoid segmentfault when take a snapshot of a VM which being migrated
  qapi: Fix COLOStatus and query-colo-status since version
  COLO: Fix Colo doc secondeary should be secondary

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ef302748 3d63da16

docs/COLO-FT.txt

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ Secondary: 
{ 'execute': 'nbd-server-start',

  'arguments': {'addr': {'type': 'inet', 'data': {'host': 'xx.xx.xx.xx', 'port': '8889'} } }

}

{'execute': 'nbd-server-add', 'arguments': {'device': 'secondeary-disk0', 'writable': true } }

{'execute': 'nbd-server-add', 'arguments': {'device': 'secondary-disk0', 'writable': true } }



Note:

  a. The qmp command nbd-server-start and nbd-server-add must be run

migration/migration.c

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp) 
 * Return true if we're already in the middle of a migration

 * (i.e. any of the active or setup states)

 */

static bool migration_is_setup_or_active(int state)

bool migration_is_setup_or_active(int state)

{

    switch (state) {

    case MIGRATION_STATUS_ACTIVE:

migration/migration.h

+2 −0
Original line number Diff line number Diff line
@@ -241,6 +241,8 @@ void migrate_fd_error(MigrationState *s, const Error *error); 


void migrate_fd_connect(MigrationState *s, Error *error_in);



bool migration_is_setup_or_active(int state);



void migrate_init(MigrationState *s);

bool migration_is_blocked(Error **errp);

/* True if outgoing migration has entered postcopy phase */

migration/savevm.c

+11 −8
Original line number Diff line number Diff line
@@ -1327,21 +1327,25 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) 
    MigrationState *ms = migrate_get_current();

    MigrationStatus status;



    migrate_init(ms);



    ms->to_dst_file = f;

    if (migration_is_setup_or_active(ms->state) ||

        ms->state == MIGRATION_STATUS_CANCELLING ||

        ms->state == MIGRATION_STATUS_COLO) {

        error_setg(errp, QERR_MIGRATION_ACTIVE);

        return -EINVAL;

    }



    if (migration_is_blocked(errp)) {

        ret = -EINVAL;

        goto done;

        return -EINVAL;

    }



    if (migrate_use_block()) {

        error_setg(errp, "Block migration and snapshots are incompatible");

        ret = -EINVAL;

        goto done;

        return -EINVAL;

    }



    migrate_init(ms);

    ms->to_dst_file = f;



    qemu_mutex_unlock_iothread();

    qemu_savevm_state_header(f);

    qemu_savevm_state_setup(f);
@@ -1363,7 +1367,6 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) 
        error_setg_errno(errp, -ret, "Error while writing VM state");

    }



done:

    if (ret != 0) {

        status = MIGRATION_STATUS_FAILED;

    } else {

qapi/migration.json

+2 −2
Original line number Diff line number Diff line
@@ -1317,7 +1317,7 @@ 
#

# @reason: describes the reason for the COLO exit.

#

# Since: 3.0

# Since: 3.1

##

{ 'struct': 'COLOStatus',

  'data': { 'mode': 'COLOMode', 'reason': 'COLOExitReason' } }
@@ -1334,7 +1334,7 @@ 
# -> { "execute": "query-colo-status" }

# <- { "return": { "mode": "primary", "active": true, "reason": "request" } }

#

# Since: 3.0

# Since: 3.1

##

{ 'command': 'query-colo-status',

  'returns': 'COLOStatus' }