提交 6522773f 编写于 作者: J Juan Quintela

migration: remove argument to qemu_savevm_state_cancel

Signed-off-by: NJuan Quintela <quintela@redhat.com>
Reviewed-by: NReviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: NPaolo Bonzini <pbonzini@redhat.com>
上级 b22ff1fb
...@@ -77,7 +77,7 @@ int qemu_savevm_state_begin(QEMUFile *f, ...@@ -77,7 +77,7 @@ int qemu_savevm_state_begin(QEMUFile *f,
const MigrationParams *params); const MigrationParams *params);
int qemu_savevm_state_iterate(QEMUFile *f); int qemu_savevm_state_iterate(QEMUFile *f);
int qemu_savevm_state_complete(QEMUFile *f); int qemu_savevm_state_complete(QEMUFile *f);
void qemu_savevm_state_cancel(QEMUFile *f); void qemu_savevm_state_cancel(void);
uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size); uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size);
int qemu_loadvm_state(QEMUFile *f); int qemu_loadvm_state(QEMUFile *f);
......
...@@ -330,7 +330,7 @@ static void migrate_fd_cancel(MigrationState *s) ...@@ -330,7 +330,7 @@ static void migrate_fd_cancel(MigrationState *s)
s->state = MIG_STATE_CANCELLED; s->state = MIG_STATE_CANCELLED;
notifier_list_notify(&migration_state_notifiers, s); notifier_list_notify(&migration_state_notifiers, s);
qemu_savevm_state_cancel(s->file); qemu_savevm_state_cancel();
migrate_fd_cleanup(s); migrate_fd_cleanup(s);
} }
......
...@@ -1590,13 +1590,13 @@ int qemu_savevm_state_begin(QEMUFile *f, ...@@ -1590,13 +1590,13 @@ int qemu_savevm_state_begin(QEMUFile *f,
ret = se->ops->save_live_setup(f, se->opaque); ret = se->ops->save_live_setup(f, se->opaque);
if (ret < 0) { if (ret < 0) {
qemu_savevm_state_cancel(f); qemu_savevm_state_cancel();
return ret; return ret;
} }
} }
ret = qemu_file_get_error(f); ret = qemu_file_get_error(f);
if (ret != 0) { if (ret != 0) {
qemu_savevm_state_cancel(f); qemu_savevm_state_cancel();
} }
return ret; return ret;
...@@ -1647,7 +1647,7 @@ int qemu_savevm_state_iterate(QEMUFile *f) ...@@ -1647,7 +1647,7 @@ int qemu_savevm_state_iterate(QEMUFile *f)
} }
ret = qemu_file_get_error(f); ret = qemu_file_get_error(f);
if (ret != 0) { if (ret != 0) {
qemu_savevm_state_cancel(f); qemu_savevm_state_cancel();
} }
return ret; return ret;
} }
...@@ -1727,7 +1727,7 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) ...@@ -1727,7 +1727,7 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size)
return ret; return ret;
} }
void qemu_savevm_state_cancel(QEMUFile *f) void qemu_savevm_state_cancel(void)
{ {
SaveStateEntry *se; SaveStateEntry *se;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册