From efab4718f4203132244758fbc76b8b0676b9d85d Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 23 Feb 2011 11:52:12 +0100 Subject: migration: Don't use callback on file defining it Signed-off-by: Juan Quintela --- migration-tcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'migration-tcp.c') diff --git a/migration-tcp.c b/migration-tcp.c index f6b228820..bd3aa3a4a 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -58,7 +58,7 @@ static void tcp_wait_for_connect(void *opaque) DPRINTF("connect completed\n"); do { ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, (void *) &val, &valsize); - } while (ret == -1 && (s->get_error(s)) == EINTR); + } while (ret == -1 && (socket_error()) == EINTR); if (ret < 0) { migrate_fd_error(s); @@ -98,7 +98,7 @@ int tcp_start_outgoing_migration(MigrationState *s, const char *host_port) do { ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)); if (ret == -1) - ret = -(s->get_error(s)); + ret = -(socket_error()); if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); -- cgit v1.2.3