summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. David Alan Gilbert2015-11-05 19:10:34 +0100
committerJuan Quintela2015-11-10 14:51:48 +0100
commit42e2aa56372291d35345fcec85d5da2004c8b57c (patch)
tree0d828e0b594fa8599b83dc7ea76bdd51117d9175
parentqemu_ram_block_by_name (diff)
downloadqemu-42e2aa56372291d35345fcec85d5da2004c8b57c.tar.gz
qemu-42e2aa56372291d35345fcec85d5da2004c8b57c.tar.xz
qemu-42e2aa56372291d35345fcec85d5da2004c8b57c.zip
Rename mis->file to from_src_file
'file' becomes confusing when you have flows in each direction; rename to make it clear. This leaves just the main forward direction ms->file, which is used in a lot of places and is probably not worth renaming given the churn. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
-rw-r--r--include/migration/migration.h2
-rw-r--r--migration/migration.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 83346210b1..83fba23511 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -48,7 +48,7 @@ typedef QLIST_HEAD(, LoadStateEntry) LoadStateEntry_Head;
/* State for the incoming migration */
struct MigrationIncomingState {
- QEMUFile *file;
+ QEMUFile *from_src_file;
/* See savevm.c */
LoadStateEntry_Head loadvm_handlers;
diff --git a/migration/migration.c b/migration/migration.c
index f99d3eabf7..6fef5445c9 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -95,7 +95,7 @@ MigrationIncomingState *migration_incoming_get_current(void)
MigrationIncomingState *migration_incoming_state_new(QEMUFile* f)
{
mis_current = g_new0(MigrationIncomingState, 1);
- mis_current->file = f;
+ mis_current->from_src_file = f;
QLIST_INIT(&mis_current->loadvm_handlers);
return mis_current;