Commit 3df663e5 authored by Peter Xu's avatar Peter Xu Committed by Juan Quintela
Browse files

migration: move only_migratable to MigrationState 



One less global variable, and it does only matter with migration.

We keep the old "--only-migratable" option, but also now we support:

  -global migration.only-migratable=true

Currently still keep the old interface.

Hmm, now vl.c has no way to access migrate_get_current(). Export a
function for it to setup only_migratable.

Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <1498536619-14548-7-git-send-email-peterx@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 5272298c

include/migration/misc.h

+2 −0
Original line number Diff line number Diff line
@@ -55,4 +55,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);



#endif

include/sysemu/sysemu.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
/* vl.c */



extern const char *bios_name;

extern int only_migratable;

extern const char *qemu_name;

extern QemuUUID qemu_uuid;

extern bool qemu_uuid_set;

migration/migration.c

+7 −1
Original line number Diff line number Diff line
@@ -115,6 +115,11 @@ 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;
@@ -986,7 +991,7 @@ static GSList *migration_blockers; 


int migrate_add_blocker(Error *reason, Error **errp)

{

    if (only_migratable) {

    if (migrate_get_current()->only_migratable) {

        error_propagate(errp, error_copy(reason));

        error_prepend(errp, "disallowing migration blocker "

                          "(--only_migratable) for: ");
@@ -1979,6 +1984,7 @@ void migrate_fd_connect(MigrationState *s) 
static Property migration_properties[] = {

    DEFINE_PROP_BOOL("store-global-state", MigrationState,

                     store_global_state, true),

    DEFINE_PROP_BOOL("only-migratable", MigrationState, only_migratable, false),

    DEFINE_PROP_END_OF_LIST(),

};

migration/migration.h

+3 −0
Original line number Diff line number Diff line
@@ -139,6 +139,9 @@ struct MigrationState 
     * during migration.

     */

    bool store_global_state;



    /* Whether the VM is only allowing for migratable devices */

    bool only_migratable;

};



void migrate_set_state(int *state, int old_state, int new_state);

migration/savevm.c

+1 −1
Original line number Diff line number Diff line
@@ -2336,7 +2336,7 @@ void vmstate_register_ram_global(MemoryRegion *mr) 
bool vmstate_check_only_migratable(const VMStateDescription *vmsd)

{

    /* check needed if --only-migratable is specified */

    if (!only_migratable) {

    if (!migrate_get_current()->only_migratable) {

        return true;

    }