david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migration: rename cancel to cleanup in SaveVMHandles

Browse Source 
'cleanup' seems more appropriate than 'cancel'.

Signed-off-by: Liang Li <liang.z.li@intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>al3
Reviewed-by: Amit Shah <amit.shah@redhat.com>al3
Signed-off-by: Juan Quintela <quintela@redhat.com>al3
This commit is contained in:
Liang Li 2015-11-02 15:37:02 +08:00 committed by Juan Quintela
parent ea7415fac6
commit d1a8548c10
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/migration/vmstate.h
View File

@ -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. */

2
migration/block.c
View File

@ -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,
};

2
migration/ram.c
View File

@ -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)

4
migration/savevm.c
View File

@ -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);
}
}
}