Commit b605c47b authored by Peter Xu's avatar Peter Xu Committed by Dr. David Alan Gilbert
Browse files

migration: fix handling for --only-migratable 



MigrateState object is not ready at that time, so we'll get an
assertion. Use qemu_global_option() instead.

Reported-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Suggested-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Fixes: 3df663e5 ("migration: move only_migratable to MigrationState")
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <1499242883-2184-2-git-send-email-peterx@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 6b06e3e4

include/migration/misc.h

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ bool migration_has_finished(MigrationState *); 
bool migration_has_failed(MigrationState *);

/* ...and after the device transmission */

bool migration_in_postcopy_after_devices(MigrationState *);

void migration_only_migratable_set(void);

void migration_global_dump(Monitor *mon);



#endif

migration/migration.c

+0 −5
Original line number Diff line number Diff line
@@ -128,11 +128,6 @@ MigrationState *migrate_get_current(void) 
    return current_migration;

}



void migration_only_migratable_set(void)

{

    migrate_get_current()->only_migratable = true;

}



MigrationIncomingState *migration_incoming_get_current(void)

{

    static bool once;

vl.c

+1 −1
Original line number Diff line number Diff line
@@ -3962,7 +3962,7 @@ int main(int argc, char **argv, char **envp) 
                 *

                 * "-global migration.only-migratable=true"

                 */

                migration_only_migratable_set();

                qemu_global_option("migration.only-migratable=true");

                break;

            case QEMU_OPTION_nodefaults:

                has_defaults = 0;