From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlIqh-0003dg-G3 for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlIqb-0004Au-C8 for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlIqb-0004Ap-4Z for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:05 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBJCY4sV030071 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Dec 2012 07:34:04 -0500 From: Juan Quintela Date: Wed, 19 Dec 2012 13:33:26 +0100 Message-Id: <1355920437-29882-4-git-send-email-quintela@redhat.com> In-Reply-To: <1355920437-29882-1-git-send-email-quintela@redhat.com> References: <1355920437-29882-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 03/34] migration: remove double call to migrate_fd_close List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini From: Paolo Bonzini The call in buffered_close is enough, because buffered_close is called already by migrate_fd_cleanup. Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela --- migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration.c b/migration.c index 73ce170..bde4956 100644 --- a/migration.c +++ b/migration.c @@ -272,7 +272,7 @@ static int migrate_fd_cleanup(MigrationState *s) s->file = NULL; } - migrate_fd_close(s); + assert(s->fd == -1); return ret; } -- 1.7.11.7