aboutsummaryrefslogtreecommitdiff
path: root/migration-unix.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-08-07 10:49:13 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2012-11-02 18:35:07 +0100
commita6ef29096b89640acaa5edc3a74c2e3efbfa306f (patch)
treeaeaf3e7daa962005614e385ff92f2803e6984a3d /migration-unix.c
parentd263a20bcfc94a59c87176df6c2d29d65a7e4e6a (diff)
downloadqemu-arm-a6ef29096b89640acaa5edc3a74c2e3efbfa306f.tar.gz
migration: clean up server sockets and handlers before invoking process_incoming_migration
A first step towards making a common "suffix" for all migration protocols, and moving it to process_incoming_migration. Reviewed-by: Orit Wasserman <owasserm@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'migration-unix.c')
-rw-r--r--migration-unix.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/migration-unix.c b/migration-unix.c
index ed3db3a39a..5dc49cdf0f 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)