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

migration: create Migration Incoming State at init time 



Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <1485207141-1941-3-git-send-email-quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 7d2c6c95

include/migration/migration.h

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ struct MigrationIncomingState { 
};



MigrationIncomingState *migration_incoming_get_current(void);

MigrationIncomingState *migration_incoming_state_new(QEMUFile *f);

void migration_incoming_state_destroy(void);



/*

migration/migration.c

+17 −21
Original line number Diff line number Diff line
@@ -111,32 +111,28 @@ MigrationState *migrate_get_current(void) 
    return &current_migration;

}



/* For incoming */

static MigrationIncomingState *mis_current;



MigrationIncomingState *migration_incoming_get_current(void)

{

    return mis_current;

}



MigrationIncomingState *migration_incoming_state_new(QEMUFile* f)

{

    mis_current = g_new0(MigrationIncomingState, 1);

    mis_current->from_src_file = f;

    mis_current->state = MIGRATION_STATUS_NONE;

    QLIST_INIT(&mis_current->loadvm_handlers);

    qemu_mutex_init(&mis_current->rp_mutex);

    qemu_event_init(&mis_current->main_thread_load_event, false);

    static bool once;

    static MigrationIncomingState mis_current;



    return mis_current;

    if (!once) {

        mis_current.state = MIGRATION_STATUS_NONE;

        memset(&mis_current, 0, sizeof(MigrationIncomingState));

        QLIST_INIT(&mis_current.loadvm_handlers);

        qemu_mutex_init(&mis_current.rp_mutex);

        qemu_event_init(&mis_current.main_thread_load_event, false);

        once = true;

    }

    return &mis_current;

}



void migration_incoming_state_destroy(void)

{

    qemu_event_destroy(&mis_current->main_thread_load_event);

    loadvm_free_handlers(mis_current);

    g_free(mis_current);

    mis_current = NULL;

    struct MigrationIncomingState *mis = migration_incoming_get_current();



    qemu_event_destroy(&mis->main_thread_load_event);

    loadvm_free_handlers(mis);

}
@@ -382,11 +378,11 @@ static void process_incoming_migration_bh(void *opaque) 
static void process_incoming_migration_co(void *opaque)

{

    QEMUFile *f = opaque;

    MigrationIncomingState *mis;

    MigrationIncomingState *mis = migration_incoming_get_current();

    PostcopyState ps;

    int ret;



    mis = migration_incoming_state_new(f);

    mis->from_src_file = f;

    postcopy_state_set(POSTCOPY_INCOMING_NONE);

    migrate_set_state(&mis->state, MIGRATION_STATUS_NONE,

                      MIGRATION_STATUS_ACTIVE);

migration/savevm.c

+2 −2
Original line number Diff line number Diff line
@@ -2199,7 +2199,6 @@ void qmp_xen_load_devices_state(const char *filename, Error **errp) 
    qio_channel_set_name(QIO_CHANNEL(ioc), "migration-xen-load-state");

    f = qemu_fopen_channel_input(QIO_CHANNEL(ioc));



    migration_incoming_state_new(f);

    ret = qemu_loadvm_state(f);

    qemu_fclose(f);

    if (ret < 0) {
@@ -2215,6 +2214,7 @@ int load_vmstate(const char *name) 
    QEMUFile *f;

    int ret;

    AioContext *aio_context;

    MigrationIncomingState *mis = migration_incoming_get_current();



    if (!bdrv_all_can_snapshot(&bs)) {

        error_report("Device '%s' is writable but does not support snapshots.",
@@ -2265,7 +2265,7 @@ int load_vmstate(const char *name) 
    }



    qemu_system_reset(VMRESET_SILENT);

    migration_incoming_state_new(f);

    mis->from_src_file = f;



    aio_context_acquire(aio_context);

    ret = qemu_loadvm_state(f);