Commit d7651f15 authored by Alexey Perevalov's avatar Alexey Perevalov Committed by Juan Quintela
Browse files

migration: pass MigrationIncomingState* into migration check functions 



That tiny refactoring is necessary to be able to set
UFFD_FEATURE_THREAD_ID while requesting features, and then
to create downtime context in case when kernel supports it.

Signed-off-by: default avatarAlexey Perevalov <a.perevalov@samsung.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 58110f0a

migration/migration.c

+2 −1
Original line number Diff line number Diff line
@@ -659,6 +659,7 @@ static bool migrate_caps_check(bool *cap_list, 
{

    MigrationCapabilityStatusList *cap;

    bool old_postcopy_cap;

    MigrationIncomingState *mis = migration_incoming_get_current();



    old_postcopy_cap = cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM];
@@ -692,7 +693,7 @@ static bool migrate_caps_check(bool *cap_list, 
         * special support.

         */

        if (!old_postcopy_cap && runstate_check(RUN_STATE_INMIGRATE) &&

            !postcopy_ram_supported_by_host()) {

            !postcopy_ram_supported_by_host(mis)) {

            /* postcopy_ram_supported_by_host will have emitted a more

             * detailed message

             */

migration/postcopy-ram.c

+5 −5
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct PostcopyDiscardState { 
#include <sys/eventfd.h>

#include <linux/userfaultfd.h>



static bool ufd_version_check(int ufd)

static bool ufd_version_check(int ufd, MigrationIncomingState *mis)

{

    struct uffdio_api api_struct;

    uint64_t ioctl_mask;
@@ -124,7 +124,7 @@ static int test_ramblock_postcopiable(const char *block_name, void *host_addr, 
 * normally fine since if the postcopy succeeds it gets turned back on at the

 * end.

 */

bool postcopy_ram_supported_by_host(void)

bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)

{

    long pagesize = getpagesize();

    int ufd = -1;
@@ -147,7 +147,7 @@ bool postcopy_ram_supported_by_host(void) 
    }



    /* Version and features check */

    if (!ufd_version_check(ufd)) {

    if (!ufd_version_check(ufd, mis)) {

        goto out;

    }
@@ -523,7 +523,7 @@ int postcopy_ram_enable_notify(MigrationIncomingState *mis) 
     * Although the host check already tested the API, we need to

     * do the check again as an ABI handshake on the new fd.

     */

    if (!ufd_version_check(mis->userfault_fd)) {

    if (!ufd_version_check(mis->userfault_fd, mis)) {

        return -1;

    }
@@ -661,7 +661,7 @@ void *postcopy_get_tmp_page(MigrationIncomingState *mis) 


#else

/* No target OS support, stubs just fail */

bool postcopy_ram_supported_by_host(void)

bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)

{

    error_report("%s: No OS support", __func__);

    return false;

migration/postcopy-ram.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#define QEMU_POSTCOPY_RAM_H



/* Return true if the host supports everything we need to do postcopy-ram */

bool postcopy_ram_supported_by_host(void);

bool postcopy_ram_supported_by_host(MigrationIncomingState *mis);



/*

 * Make all of RAM sensitive to accesses to areas that haven't yet been written

migration/savevm.c

+1 −1
Original line number Diff line number Diff line
@@ -1380,7 +1380,7 @@ static int loadvm_postcopy_handle_advise(MigrationIncomingState *mis) 
        return 0;

    }



    if (!postcopy_ram_supported_by_host()) {

    if (!postcopy_ram_supported_by_host(mis)) {

        postcopy_state_set(POSTCOPY_INCOMING_NONE);

        return -1;

    }