[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/12] migration: clean up server sockets and handle
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 05/12] migration: clean up server sockets and handlers before invoking process_incoming_migration |
Date: |
Fri, 2 Nov 2012 18:50:58 +0100 |
A first step towards making a common "suffix" for all migration protocols,
and moving it to process_incoming_migration.
Reviewed-by: Orit Wasserman <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 452bf07..014c60f 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -87,8 +87,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 b47b222..a4cd83f 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -92,8 +92,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 46f6ac5..96a832c 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -88,12 +88,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);
@@ -106,9 +108,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);
}
void tcp_start_incoming_migration(const char *host_port, Error **errp)
diff --git a/migration-unix.c b/migration-unix.c
index ed3db3a..5dc49cd 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -88,12 +88,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);
@@ -106,9 +108,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);
}
void unix_start_incoming_migration(const char *path, Error **errp)
--
1.7.12.1
- [Qemu-devel] [PULL 00/12] Incoming migration coroutine, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 03/12] migration: add qemu_get_fd, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 01/12] migration: unify stdio-based QEMUFile operations, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 02/12] migration: consolidate QEMUFile methods in a single QEMUFileOps struct, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 04/12] migration: replace qemu_stdio_fd with qemu_get_fd, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 05/12] migration: clean up server sockets and handlers before invoking process_incoming_migration,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 06/12] migration: use migrate_fd_close in migrate_fd_cleanup, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 07/12] migration: use closesocket, not close, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 08/12] migration: xxx_close will only be called once, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 09/12] migration: close socket QEMUFile from socket_close, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 12/12] migration: move process_incoming_migration to a coroutine, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 10/12] migration: move qemu_fclose to process_incoming_migration, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 11/12] migration: handle EAGAIN while reading QEMUFile, Paolo Bonzini, 2012/11/02
- Re: [Qemu-devel] [PULL 00/12] Incoming migration coroutine, Anthony Liguori, 2012/11/02