From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSPHX-0007Tf-2C for qemu-devel@nongnu.org; Sun, 28 Oct 2012 05:35:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSPHV-0000Gl-QZ for qemu-devel@nongnu.org; Sun, 28 Oct 2012 05:35:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSPHV-0000Ff-Bf for qemu-devel@nongnu.org; Sun, 28 Oct 2012 05:35:45 -0400 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 q9S9Zhdv024000 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 28 Oct 2012 05:35:44 -0400 Message-ID: <508CFC6D.2080905@redhat.com> Date: Sun, 28 Oct 2012 11:35:41 +0200 From: Orit Wasserman MIME-Version: 1.0 References: <1350555758-29988-1-git-send-email-pbonzini@redhat.com> <1350555758-29988-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1350555758-29988-6-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 05/12] migration: clean up server sockets and handlers before invoking process_incoming_migration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org, quintela@redhat.com On 10/18/2012 12:22 PM, Paolo Bonzini wrote: > A first step towards making a common "suffix" for all migration protocols, > and moving it to process_incoming_migration. > > Signed-off-by: Paolo Bonzini > --- > migration-exec.c | 2 +- > migration-fd.c | 2 +- > migration-tcp.c | 7 +++---- > migration-unix.c | 7 +++---- > 4 file modificati, 8 inserzioni(+), 10 rimozioni(-) > > diff --git a/migration-exec.c b/migration-exec.c > index f81e390..0964dbb 100644 > --- a/migration-exec.c > +++ b/migration-exec.c > @@ -97,8 +97,8 @@ static void exec_accept_incoming_migration(void *opaque) > { > QEMUFile *f = opaque; > > - process_incoming_migration(f); > qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL); > + process_incoming_migration(f); > qemu_fclose(f); > } > > diff --git a/migration-fd.c b/migration-fd.c > index 43cc730..bb91e0a 100644 > --- a/migration-fd.c > +++ b/migration-fd.c > @@ -103,8 +103,8 @@ static void fd_accept_incoming_migration(void *opaque) > { > QEMUFile *f = opaque; > > - process_incoming_migration(f); > qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL); > + process_incoming_migration(f); > qemu_fclose(f); > } > > diff --git a/migration-tcp.c b/migration-tcp.c > index a15c2b8..1bd8481 100644 > --- a/migration-tcp.c > +++ b/migration-tcp.c > @@ -96,12 +96,14 @@ static void tcp_accept_incoming_migration(void *opaque) > do { > c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen); > } while (c == -1 && socket_error() == EINTR); > + qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL); > + close(s); > > DPRINTF("accepted migration\n"); > > if (c == -1) { > fprintf(stderr, "could not accept migration connection\n"); > - goto out2; > + goto out; > } > > f = qemu_fopen_socket(c); > @@ -114,9 +116,6 @@ static void tcp_accept_incoming_migration(void *opaque) > qemu_fclose(f); > out: > close(c); > -out2: > - qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL); > - close(s); > } > > int tcp_start_incoming_migration(const char *host_port, Error **errp) > diff --git a/migration-unix.c b/migration-unix.c > index 169de88..a407af2 100644 > --- a/migration-unix.c > +++ b/migration-unix.c > @@ -129,12 +129,14 @@ static void unix_accept_incoming_migration(void *opaque) > do { > c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen); > } while (c == -1 && errno == EINTR); > + qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL); > + close(s); > > DPRINTF("accepted migration\n"); > > if (c == -1) { > fprintf(stderr, "could not accept migration connection\n"); > - goto out2; > + goto out; > } > > f = qemu_fopen_socket(c); > @@ -147,9 +149,6 @@ static void unix_accept_incoming_migration(void *opaque) > qemu_fclose(f); > out: > close(c); > -out2: > - qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL); > - close(s); > } > > int unix_start_incoming_migration(const char *path) > Reviewed-by: Orit Wasserman