Commit d1a8548c authored by Liang Li's avatar Liang Li Committed by Juan Quintela
Browse files

migration: rename cancel to cleanup in SaveVMHandles 



'cleanup' seems more appropriate than 'cancel'.

Signed-off-by: default avatarLiang Li <liang.z.li@intel.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com&gt;al3>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com&gt;al3>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com&gt;al3>
parent ea7415fa

include/migration/vmstate.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ typedef struct SaveVMHandlers { 
    void (*set_params)(const MigrationParams *params, void * opaque);

    SaveStateHandler *save_state;



    void (*cancel)(void *opaque);

    void (*cleanup)(void *opaque);

    int (*save_live_complete)(QEMUFile *f, void *opaque);



    /* This runs both outside and inside the iothread lock.  */

migration/block.c

+1 −1
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ static SaveVMHandlers savevm_block_handlers = { 
    .save_live_complete = block_save_complete,

    .save_live_pending = block_save_pending,

    .load_state = block_load,

    .cancel = block_migration_cancel,

    .cleanup = block_migration_cancel,

    .is_active = block_is_active,

};

migration/ram.c

+1 −1
Original line number Diff line number Diff line
@@ -1685,7 +1685,7 @@ static SaveVMHandlers savevm_ram_handlers = { 
    .save_live_complete = ram_save_complete,

    .save_live_pending = ram_save_pending,

    .load_state = ram_load,

    .cancel = ram_migration_cancel,

    .cleanup = ram_migration_cancel,

};



void ram_mig_init(void)

migration/savevm.c

+2 −2
Original line number Diff line number Diff line
@@ -908,8 +908,8 @@ void qemu_savevm_state_cleanup(void) 


    trace_savevm_state_cleanup();

    QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {

        if (se->ops && se->ops->cancel) {

            se->ops->cancel(se->opaque);

        if (se->ops && se->ops->cleanup) {

            se->ops->cleanup(se->opaque);

        }

    }

}