@@ -814,7 +814,7 @@ SaveVMHandlers savevm_block_handlers = {
.save_live_pending = block_save_pending,
.load_state = block_load,
.cancel = block_migration_cancel,
- .is_active = block_is_active,
+ .is_block_active = block_is_active,
};
void blk_mig_init(void)
@@ -40,7 +40,7 @@ typedef struct SaveVMHandlers {
int (*save_live_complete)(QEMUFile *f, void *opaque);
/* This runs both outside and inside the iothread lock. */
- bool (*is_active)(void *opaque);
+ bool (*is_block_active)(void *opaque);
/* This runs outside the iothread lock in the migration case, and
* within the lock in the savevm case. The callback had better only
@@ -1817,8 +1817,8 @@ void qemu_savevm_state_begin(QEMUFile *f,
if (!se->ops || !se->ops->save_live_setup) {
continue;
}
- if (se->ops && se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
+ if (se->ops && se->ops->is_block_active) {
+ if (!se->ops->is_block_active(se->opaque)) {
continue;
}
}
@@ -1857,8 +1857,8 @@ int qemu_savevm_state_iterate(QEMUFile *f)
if (!se->ops || !se->ops->save_live_iterate) {
continue;
}
- if (se->ops && se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
+ if (se->ops && se->ops->is_block_active) {
+ if (!se->ops->is_block_active(se->opaque)) {
continue;
}
}
@@ -1898,8 +1898,8 @@ void qemu_savevm_state_complete(QEMUFile *f)
if (!se->ops || !se->ops->save_live_complete) {
continue;
}
- if (se->ops && se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
+ if (se->ops && se->ops->is_block_active) {
+ if (!se->ops->is_block_active(se->opaque)) {
continue;
}
}
@@ -1952,8 +1952,8 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size)
if (!se->ops || !se->ops->save_live_pending) {
continue;
}
- if (se->ops && se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
+ if (se->ops && se->ops->is_block_active) {
+ if (!se->ops->is_block_active(se->opaque)) {
continue;
}
}
Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com> --- block-migration.c | 2 +- include/migration/vmstate.h | 2 +- savevm.c | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-)