Commit fab35005 authored by Juan Quintela's avatar Juan Quintela
Browse files

migration: Remove MigrationState parameter from migration_is_idle() 



Only user don't have a MigrationState handly.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 352b0de9

include/migration/migration.h

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ void remove_migration_state_change_notifier(Notifier *notify); 
MigrationState *migrate_init(const MigrationParams *params);

bool migration_is_blocked(Error **errp);

bool migration_in_setup(MigrationState *);

bool migration_is_idle(MigrationState *s);

bool migration_is_idle(void);

bool migration_has_finished(MigrationState *);

bool migration_has_failed(MigrationState *);

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

migration/migration.c

+3 −5
Original line number Diff line number Diff line
@@ -1075,11 +1075,9 @@ bool migration_in_postcopy_after_devices(MigrationState *s) 
    return migration_in_postcopy() && s->postcopy_after_devices;

}



bool migration_is_idle(MigrationState *s)

bool migration_is_idle(void)

{

    if (!s) {

        s = migrate_get_current();

    }

    MigrationState *s = migrate_get_current();



    switch (s->state) {

    case MIGRATION_STATUS_NONE:
@@ -1144,7 +1142,7 @@ int migrate_add_blocker(Error *reason, Error **errp) 
        return -EACCES;

    }



    if (migration_is_idle(NULL)) {

    if (migration_is_idle()) {

        migration_blockers = g_slist_prepend(migration_blockers, reason);

        return 0;

    }