Commit d5a2bcf7 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'luiz/queue/qmp' into staging 



# By Pawit Pornkitprasan
# Via Luiz Capitulino
* luiz/queue/qmp:
  migration: don't use uninitialized variables
  migration: send total time in QMP at "completed" stage

Message-id: 1375367564-4797-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents f44c5c67 8c0426ae

migration.c

+3 −2
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) 


        info->has_status = true;

        info->status = g_strdup("completed");

        info->has_total_time = true;

        info->total_time = s->total_time;

        info->has_downtime = true;

        info->downtime = s->downtime;
@@ -399,8 +400,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, 
    MigrationParams params;

    const char *p;



    params.blk = blk;

    params.shared = inc;

    params.blk = has_blk && blk;

    params.shared = has_inc && inc;



    if (s->state == MIG_STATE_ACTIVE || s->state == MIG_STATE_SETUP) {

        error_set(errp, QERR_MIGRATION_ACTIVE);