From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvqFp-0002t9-9m for qemu-devel@nongnu.org; Mon, 09 Nov 2015 12:29:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZvqFn-0004de-HQ for qemu-devel@nongnu.org; Mon, 09 Nov 2015 12:29:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40551) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvqFn-0004da-CN for qemu-devel@nongnu.org; Mon, 09 Nov 2015 12:29:15 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 26E11C0BEAA3 for ; Mon, 9 Nov 2015 17:29:15 +0000 (UTC) From: Juan Quintela Date: Mon, 9 Nov 2015 18:28:11 +0100 Message-Id: <1447090141-29074-8-git-send-email-quintela@redhat.com> In-Reply-To: <1447090141-29074-1-git-send-email-quintela@redhat.com> References: <1447090141-29074-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PULL 07/57] Rename mis->file to from_src_file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, dgilbert@redhat.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 Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- 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 f99d3ea..6fef544 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; -- 2.5.0