From patchwork Tue Jan 15 11:18:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 212136 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D5C212C00A0 for ; Tue, 15 Jan 2013 23:15:20 +1100 (EST) Received: from localhost ([::1]:36972 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv4Xu-00052G-EE for incoming@patchwork.ozlabs.org; Tue, 15 Jan 2013 06:19:10 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv4XL-0003hm-PL for qemu-devel@nongnu.org; Tue, 15 Jan 2013 06:18:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv4XI-000183-DD for qemu-devel@nongnu.org; Tue, 15 Jan 2013 06:18:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52665) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv4XI-00017u-6d for qemu-devel@nongnu.org; Tue, 15 Jan 2013 06:18:32 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0FBIVqL014464 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 15 Jan 2013 06:18:31 -0500 Received: from trasno.mitica (ovpn-113-25.phx2.redhat.com [10.3.113.25]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0FBIMr4005333; Tue, 15 Jan 2013 06:18:30 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 15 Jan 2013 12:18:13 +0100 Message-Id: <1358248702-14278-6-git-send-email-quintela@redhat.com> In-Reply-To: <1358248702-14278-1-git-send-email-quintela@redhat.com> References: <1358248702-14278-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini Subject: [Qemu-devel] [PATCH 05/14] migration: remove double call to migrate_fd_close X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 | 1 - 1 file changed, 1 deletion(-) diff --git a/migration.c b/migration.c index 1f4c6ee..5513dde 100644 --- a/migration.c +++ b/migration.c @@ -605,7 +605,6 @@ static int buffered_close(void *opaque) if (ret >= 0) { ret = ret2; } - ret = migrate_fd_close(s); s->complete = true; return ret; }