diff options
| author | Liang Li <liang.z.li@intel.com> | 2015-11-02 15:37:02 +0800 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2015-11-04 13:40:13 +0100 |
| commit | d1a8548c10bf6d24160ec2aafa4881a3f50a8373 (patch) | |
| tree | 746a9171078f8e16e5449c43d128a7c3bad95042 | |
| parent | ea7415fac677c5c1599214ee226ab4a3a438fdd6 (diff) | |
| download | qemu-d1a8548c10bf6d24160ec2aafa4881a3f50a8373.tar.gz qemu-d1a8548c10bf6d24160ec2aafa4881a3f50a8373.tar.bz2 qemu-d1a8548c10bf6d24160ec2aafa4881a3f50a8373.zip | |
migration: rename cancel to cleanup in SaveVMHandles
'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
| -rw-r--r-- | include/migration/vmstate.h | 2 | ||||
| -rw-r--r-- | migration/block.c | 2 | ||||
| -rw-r--r-- | migration/ram.c | 2 | ||||
| -rw-r--r-- | migration/savevm.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 9a65522da1..d173b565f5 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -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. */ diff --git a/migration/block.c b/migration/block.c index 8401597bcc..ecfe005691 100644 --- a/migration/block.c +++ b/migration/block.c @@ -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, }; diff --git a/migration/ram.c b/migration/ram.c index 25e9eebea6..0a51473cd6 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -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) diff --git a/migration/savevm.c b/migration/savevm.c index ae8fdda875..e05158d7ba 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -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); } } } |