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

migration/postcopy: postpone setting PostcopyState to END 



There are two places to call function postcopy_ram_incoming_cleanup()

    postcopy_ram_listen_thread on migration success
    loadvm_postcopy_handle_listen one setup failure

On success, the vm will never accept another migration. On failure,
PostcopyState is transited from LISTENING to END and would be checked in
qemu_loadvm_state_main(). If PostcopyState is RUNNING, migration would
be paused and retried.

Currently PostcopyState is set to END in function
postcopy_ram_incoming_cleanup(). With above analysis, we can take this
step out and postpone this till the end of listen thread to indicate the
listen thread is done.

This is a preparation patch for later cleanup.

Signed-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Message-Id: <20191006000249.29926-3-richardw.yang@linux.intel.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
  Fixed up in merge to the 1 parameter postcopy_state_set
parent 2a461c24

migration/postcopy-ram.c

+0 −2
Original line number Diff line number Diff line
@@ -577,8 +577,6 @@ int postcopy_ram_incoming_cleanup(MigrationIncomingState *mis) 
        }

    }



    postcopy_state_set(POSTCOPY_INCOMING_END);



    if (mis->postcopy_tmp_page) {

        munmap(mis->postcopy_tmp_page, mis->largest_page_size);

        mis->postcopy_tmp_page = NULL;

migration/savevm.c

+2 −0
Original line number Diff line number Diff line
@@ -1837,6 +1837,8 @@ static void *postcopy_ram_listen_thread(void *opaque) 


    rcu_unregister_thread();

    mis->have_listen_thread = false;

    postcopy_state_set(POSTCOPY_INCOMING_END);



    return NULL;

}