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

migration/postcopy: use mis->bh instead of allocating a QEMUBH 



For migration incoming side, it either quit in precopy or postcopy. It
is safe to use the mis->bh for both instead of allocating a dedicated
QEMUBH for postcopy.

Signed-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>

Message-Id: <20190805053146.32326-1-richardw.yang@linux.intel.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 7a3e9571

migration/savevm.c

+4 −13
Original line number Diff line number Diff line
@@ -1866,16 +1866,10 @@ static int loadvm_postcopy_handle_listen(MigrationIncomingState *mis) 
    return 0;

}





typedef struct {

    QEMUBH *bh;

} HandleRunBhData;



static void loadvm_postcopy_handle_run_bh(void *opaque)

{

    Error *local_err = NULL;

    HandleRunBhData *data = opaque;

    MigrationIncomingState *mis = migration_incoming_get_current();

    MigrationIncomingState *mis = opaque;



    /* TODO we should move all of this lot into postcopy_ram.c or a shared code

     * in migration.c
@@ -1907,15 +1901,13 @@ static void loadvm_postcopy_handle_run_bh(void *opaque) 
        runstate_set(RUN_STATE_PAUSED);

    }



    qemu_bh_delete(data->bh);

    g_free(data);

    qemu_bh_delete(mis->bh);

}



/* After all discards we can start running and asking for pages */

static int loadvm_postcopy_handle_run(MigrationIncomingState *mis)

{

    PostcopyState ps = postcopy_state_set(POSTCOPY_INCOMING_RUNNING);

    HandleRunBhData *data;



    trace_loadvm_postcopy_handle_run();

    if (ps != POSTCOPY_INCOMING_LISTENING) {
@@ -1923,9 +1915,8 @@ static int loadvm_postcopy_handle_run(MigrationIncomingState *mis) 
        return -1;

    }



    data = g_new(HandleRunBhData, 1);

    data->bh = qemu_bh_new(loadvm_postcopy_handle_run_bh, data);

    qemu_bh_schedule(data->bh);

    mis->bh = qemu_bh_new(loadvm_postcopy_handle_run_bh, mis);

    qemu_bh_schedule(mis->bh);



    /* We need to finish reading the stream from the package

     * and also stop reading anything more from the stream that loaded the