Commit 62c1e0ca authored by Juan Quintela's avatar Juan Quintela
Browse files

migration: Be sure all recv channels are created 



We need them before we start migration.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
parent 66770707

migration/migration.c

+5 −1
Original line number Diff line number Diff line
@@ -462,7 +462,11 @@ void migration_ioc_process_incoming(QIOChannel *ioc) 
 */

bool migration_has_all_channels(void)

{

    return true;

    bool all_channels;



    all_channels = multifd_recv_all_channels_created();



    return all_channels;

}



/*

migration/ram.c

+11 −0
Original line number Diff line number Diff line
@@ -671,6 +671,17 @@ int multifd_load_setup(void) 
    return 0;

}



bool multifd_recv_all_channels_created(void)

{

    int thread_count = migrate_multifd_channels();



    if (!migrate_use_multifd()) {

        return true;

    }



    return thread_count == atomic_read(&multifd_recv_state->count);

}



void multifd_recv_new_channel(QIOChannel *ioc)

{

    /* nothing to do yet */

migration/ram.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ int multifd_save_setup(void); 
int multifd_save_cleanup(Error **errp);

int multifd_load_setup(void);

int multifd_load_cleanup(Error **errp);

bool multifd_recv_all_channels_created(void);

void multifd_recv_new_channel(QIOChannel *ioc);



uint64_t ram_pagesize_summary(void);