From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53962) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgqQm-000622-E2 for qemu-devel@nongnu.org; Tue, 29 Sep 2015 04:38:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZgqQl-0001uX-2X for qemu-devel@nongnu.org; Tue, 29 Sep 2015 04:38:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35861) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgqQk-0001uT-UG for qemu-devel@nongnu.org; Tue, 29 Sep 2015 04:38:35 -0400 From: "Dr. David Alan Gilbert (git)" Date: Tue, 29 Sep 2015 09:37:30 +0100 Message-Id: <1443515898-3594-7-git-send-email-dgilbert@redhat.com> In-Reply-To: <1443515898-3594-1-git-send-email-dgilbert@redhat.com> References: <1443515898-3594-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v8 06/54] Rename mis->file to from_src_file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, quintela@redhat.com, amit.shah@redhat.com Cc: aarcange@redhat.com, pbonzini@redhat.com, liang.z.li@intel.com, luis@cs.umu.se, bharata@linux.vnet.ibm.com From: "Dr. David Alan Gilbert" '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 --- include/migration/migration.h | 2 +- migration/migration.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 8334621..83fba23 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 662e77e..192e975 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -87,7 +87,7 @@ MigrationIncomingState *migration_incoming_get_current(void) MigrationIncomingState *migration_incoming_state_new(QEMUFile* f) { mis_current = g_malloc0(sizeof(MigrationIncomingState)); - mis_current->file = f; + mis_current->from_src_file = f; QLIST_INIT(&mis_current->loadvm_handlers); return mis_current; -- 2.5.0