From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF6fc-00081F-5s for qemu-devel@nongnu.org; Fri, 21 Sep 2012 13:05:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF6fa-000080-UR for qemu-devel@nongnu.org; Fri, 21 Sep 2012 13:05:40 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:43020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF6fa-0008KE-NW for qemu-devel@nongnu.org; Fri, 21 Sep 2012 13:05:38 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so8110795pbb.4 for ; Fri, 21 Sep 2012 10:05:38 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 21 Sep 2012 19:05:02 +0200 Message-Id: <1348247106-27936-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1348247106-27936-1-git-send-email-pbonzini@redhat.com> References: <1348247106-27936-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 5/9] 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: qemu-devel@nongnu.org Cc: quintela@redhat.com 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 7ad98d9..62ef593 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 ac891c3..3436e84 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -115,12 +115,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); @@ -133,9 +135,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) -- 1.7.12