[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/5] migration: rename cancel to cleanup in SaveVMHan
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 3/5] migration: rename cancel to cleanup in SaveVMHandles |
Date: |
Wed, 4 Nov 2015 13:48:55 +0100 |
From: Liang Li <address@hidden>
'cleanup' seems more appropriate than 'cancel'.
Signed-off-by: Liang Li <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>al3
Reviewed-by: Amit Shah <address@hidden>al3
Signed-off-by: Juan Quintela <address@hidden>al3
---
include/migration/vmstate.h | 2 +-
migration/block.c | 2 +-
migration/ram.c | 2 +-
migration/savevm.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 9a65522..d173b56 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 8401597..ecfe005 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 25e9eeb..0a51473 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 ae8fdda..e05158d 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);
}
}
}
--
2.4.3
- [Qemu-devel] [PULL 0/5] Migration pull request, Juan Quintela, 2015/11/04
- [Qemu-devel] [PULL 1/5] migration: defer migration_end & blk_mig_cleanup, Juan Quintela, 2015/11/04
- [Qemu-devel] [PULL 3/5] migration: rename cancel to cleanup in SaveVMHandles,
Juan Quintela <=
- [Qemu-devel] [PULL 2/5] migration: rename qemu_savevm_state_cancel, Juan Quintela, 2015/11/04
- [Qemu-devel] [PULL 4/5] migration: code clean up, Juan Quintela, 2015/11/04
- [Qemu-devel] [PULL 5/5] migration: fix analyze-migration.py script, Juan Quintela, 2015/11/04
- Re: [Qemu-devel] [PULL 0/5] Migration pull request, Peter Maydell, 2015/11/05