commit efab4718f4203132244758fbc76b8b0676b9d85d
author Juan Quintela <quintela@redhat.com> Wed Feb 23 11:52:12 2011 +0100
committer Juan Quintela <quintela@redhat.com> Thu Oct 20 13:23:54 2011 +0200
tree 5693d45fb186c9601ae5a7662afb0f0e2440748a
parent 7dc688ed71ff7b8509d4bf8bdc4c4cb6c25a9917

migration: Don't use callback on file defining it

Signed-off-by: Juan Quintela <quintela@redhat.com>

migration-unix.c

diff --git a/migration-unix.c b/migration-unix.c
index bd8d40f..ca66851 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -57,7 +57,7 @@
     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 && errno == EINTR);
 
     if (ret < 0) {
         migrate_fd_error(s);
@@ -96,7 +96,7 @@
     do {
         ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr));
         if (ret == -1)
-	    ret = -(s->get_error(s));
+            ret = -errno;
 
         if (ret == -EINPROGRESS || ret == -EWOULDBLOCK)
 	    qemu_set_fd_handler2(s->fd, NULL, NULL, unix_wait_for_connect, s);
@@ -129,7 +129,7 @@
 
     do {
         c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);
-    } while (c == -1 && socket_error() == EINTR);
+    } while (c == -1 && errno == EINTR);
 
     DPRINTF("accepted migration\n");