Commit 2a7eb148 authored by Wei Yang's avatar Wei Yang Committed by Dr. David Alan Gilbert
Browse files

migration/postcopy: rename postcopy_ram_enable_notify to postcopy_ram_incoming_setup 



Function postcopy_ram_incoming_setup and postcopy_ram_incoming_cleanup
is a pair. Rename to make it clear for audience.

Signed-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20191010011316.31363-2-richardw.yang@linux.intel.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 2d49bacd

migration/postcopy-ram.c

+2 −2
Original line number Diff line number Diff line
@@ -1094,7 +1094,7 @@ retry: 
    return NULL;

}



int postcopy_ram_enable_notify(MigrationIncomingState *mis)

int postcopy_ram_incoming_setup(MigrationIncomingState *mis)

{

    /* Open the fd for the kernel to give us userfaults */

    mis->userfault_fd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK);
@@ -1307,7 +1307,7 @@ int postcopy_request_shared_page(struct PostCopyFD *pcfd, RAMBlock *rb, 
    return -1;

}



int postcopy_ram_enable_notify(MigrationIncomingState *mis)

int postcopy_ram_incoming_setup(MigrationIncomingState *mis)

{

    assert(0);

    return -1;

migration/postcopy-ram.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis); 
 * Make all of RAM sensitive to accesses to areas that haven't yet been written

 * and wire up anything necessary to deal with it.

 */

int postcopy_ram_enable_notify(MigrationIncomingState *mis);

int postcopy_ram_incoming_setup(MigrationIncomingState *mis);



/*

 * Initialise postcopy-ram, setting the RAM to a state where we can go into

migration/savevm.c

+1 −1
Original line number Diff line number Diff line
@@ -1869,7 +1869,7 @@ static int loadvm_postcopy_handle_listen(MigrationIncomingState *mis) 
     * shouldn't be doing anything yet so don't actually expect requests

     */

    if (migrate_postcopy_ram()) {

        if (postcopy_ram_enable_notify(mis)) {

        if (postcopy_ram_incoming_setup(mis)) {

            postcopy_ram_incoming_cleanup(mis);

            return -1;

        }