From patchwork Fri Nov 2 17:51:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 196740 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 3E97D2C00B4 for ; Sat, 3 Nov 2012 05:36:51 +1100 (EST) Received: from localhost ([::1]:57930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TULPY-0002sp-Nc for incoming@patchwork.ozlabs.org; Fri, 02 Nov 2012 13:52:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TULPH-0002iE-AM for qemu-devel@nongnu.org; Fri, 02 Nov 2012 13:51:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TULPG-0005XQ-BF for qemu-devel@nongnu.org; Fri, 02 Nov 2012 13:51:47 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:52142) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TULPG-0005Nu-4l for qemu-devel@nongnu.org; Fri, 02 Nov 2012 13:51:46 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so2536065pad.4 for ; Fri, 02 Nov 2012 10:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=ViUDVAKLADtgxEoLswJlWGqIipBKXQ4J6fF3p8LlyvE=; b=Spjlolc/GkRNT42kAwspUzF/BEY6020/lApfJ0BO3pODzhl12BEdVGXmu/61TmIWcd KGAOJNywdTi5ETYVXq9y1412+xCOEGy3Qq+Jh5jHeAKGH+1bT+SXm15orHJLccB5sZcT tSlSTQng4CgnPzPSzPw1O7P3zERgNvybl2JJlqT+VhgOJuGmQ9LPrrlQ/WEujESFiXda vWDFp16Qq3KX/6OHXIGry8dCqU/RhX52sMSrJBUqOABDRFxnlf+uuTiElUVCzq8XJxxJ OAwFCHoGH6AfKFSeeRzZ+8lThowPw0uRkqzQMY3vNAXUR/wd2SfpfirnUVKpHChSkPoH xocQ== Received: by 10.69.0.40 with SMTP id av8mr8321737pbd.117.1351878705734; Fri, 02 Nov 2012 10:51:45 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id a4sm6052116pax.12.2012.11.02.10.51.43 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 10:51:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2012 18:51:02 +0100 Message-Id: <1351878665-32413-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1351878665-32413-1-git-send-email-pbonzini@redhat.com> References: <1351878665-32413-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.220.45 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 09/12] migration: close socket QEMUFile from socket_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 The common suffix now is process_incoming_migration+qemu_fclose. Reviewed-by: Orit Wasserman Signed-off-by: Paolo Bonzini --- migration-tcp.c | 2 ++ migration-unix.c | 2 ++ savevm.c | 1 + 3 file modificati, 5 inserzioni(+) diff --git a/migration-tcp.c b/migration-tcp.c index bb27ce8..1279cc9 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -103,6 +103,8 @@ static void tcp_accept_incoming_migration(void *opaque) process_incoming_migration(f); qemu_fclose(f); + return; + out: closesocket(c); } diff --git a/migration-unix.c b/migration-unix.c index 9b5521e..96ea71b 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -103,6 +103,8 @@ static void unix_accept_incoming_migration(void *opaque) process_incoming_migration(f); qemu_fclose(f); + return; + out: close(c); } diff --git a/savevm.c b/savevm.c index 0ab1ad4..cdad3ad 100644 --- a/savevm.c +++ b/savevm.c @@ -213,6 +213,7 @@ static int socket_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size) static int socket_close(void *opaque) { QEMUFileSocket *s = opaque; + closesocket(s->fd); g_free(s); return 0; }