summaryrefslogtreecommitdiffstats
path: root/migration
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2015-11-05 18:10:41 +0000
committerJuan Quintela <quintela@redhat.com>2015-11-10 14:51:49 +0100
commita3e06c3d13b77a2534894dcebbc6ac08568dbe73 (patch)
tree8eec03c22adcefdc1438fe9d8a4e4bcc63d9d2ef /migration
parentaefeb18bde45fa629e3055a7bb6637a7dcad8c36 (diff)
downloadhqemu-a3e06c3d13b77a2534894dcebbc6ac08568dbe73.zip
hqemu-a3e06c3d13b77a2534894dcebbc6ac08568dbe73.tar.gz
Rename save_live_complete to save_live_complete_precopy
In postcopy we're going to need to perform the complete phase for postcopiable devices at a different point, start out by renaming all of the 'complete's to make the difference obvious. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Amit Shah <amit.shah@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/block.c2
-rw-r--r--migration/migration.c2
-rw-r--r--migration/ram.c2
-rw-r--r--migration/savevm.c10
4 files changed, 8 insertions, 8 deletions
diff --git a/migration/block.c b/migration/block.c
index cf9d9f8..4fb9b7c 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -876,7 +876,7 @@ static SaveVMHandlers savevm_block_handlers = {
.set_params = block_set_params,
.save_live_setup = block_save_setup,
.save_live_iterate = block_save_iterate,
- .save_live_complete = block_save_complete,
+ .save_live_complete_precopy = block_save_complete,
.save_live_pending = block_save_pending,
.load_state = block_load,
.cleanup = block_migration_cleanup,
diff --git a/migration/migration.c b/migration/migration.c
index 82efbeb..bb7dcb9 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -994,7 +994,7 @@ static void migration_completion(MigrationState *s, bool *old_vm_running,
ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
if (ret >= 0) {
qemu_file_set_rate_limit(s->file, INT64_MAX);
- qemu_savevm_state_complete(s->file);
+ qemu_savevm_state_complete_precopy(s->file);
}
}
qemu_mutex_unlock_iothread();
diff --git a/migration/ram.c b/migration/ram.c
index 298332c..4fa44a7 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1700,7 +1700,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
static SaveVMHandlers savevm_ram_handlers = {
.save_live_setup = ram_save_setup,
.save_live_iterate = ram_save_iterate,
- .save_live_complete = ram_save_complete,
+ .save_live_complete_precopy = ram_save_complete,
.save_live_pending = ram_save_pending,
.load_state = ram_load,
.cleanup = ram_migration_cleanup,
diff --git a/migration/savevm.c b/migration/savevm.c
index 9dc57d3..fed41e6 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -807,19 +807,19 @@ static bool should_send_vmdesc(void)
return !machine->suppress_vmdesc;
}
-void qemu_savevm_state_complete(QEMUFile *f)
+void qemu_savevm_state_complete_precopy(QEMUFile *f)
{
QJSON *vmdesc;
int vmdesc_len;
SaveStateEntry *se;
int ret;
- trace_savevm_state_complete();
+ trace_savevm_state_complete_precopy();
cpu_synchronize_all_states();
QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
- if (!se->ops || !se->ops->save_live_complete) {
+ if (!se->ops || !se->ops->save_live_complete_precopy) {
continue;
}
if (se->ops && se->ops->is_active) {
@@ -831,7 +831,7 @@ void qemu_savevm_state_complete(QEMUFile *f)
save_section_header(f, se, QEMU_VM_SECTION_END);
- ret = se->ops->save_live_complete(f, se->opaque);
+ ret = se->ops->save_live_complete_precopy(f, se->opaque);
trace_savevm_section_end(se->idstr, se->section_id, ret);
save_section_footer(f, se);
if (ret < 0) {
@@ -942,7 +942,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
ret = qemu_file_get_error(f);
if (ret == 0) {
- qemu_savevm_state_complete(f);
+ qemu_savevm_state_complete_precopy(f);
ret = qemu_file_get_error(f);
}
if (ret != 0) {
OpenPOWER on IntegriCloud