aboutsummaryrefslogtreecommitdiff
path: root/migration-unix.c
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2011-02-23 11:52:12 +0100
committerJuan Quintela <quintela@redhat.com>2011-10-20 13:23:54 +0200
commitefab4718f4203132244758fbc76b8b0676b9d85d (patch)
tree5693d45fb186c9601ae5a7662afb0f0e2440748a /migration-unix.c
parent7dc688ed71ff7b8509d4bf8bdc4c4cb6c25a9917 (diff)
downloadqemu-arm-efab4718f4203132244758fbc76b8b0676b9d85d.tar.gz
migration: Don't use callback on file defining it
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration-unix.c')
-rw-r--r--migration-unix.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/migration-unix.c b/migration-unix.c
index bd8d40fe78..ca6685101a 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -57,7 +57,7 @@ static void unix_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 && errno == EINTR);
if (ret < 0) {
migrate_fd_error(s);
@@ -96,7 +96,7 @@ int unix_start_outgoing_migration(MigrationState *s, const char *path)
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 @@ static void unix_accept_incoming_migration(void *opaque)
do {
c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);
- } while (c == -1 && socket_error() == EINTR);
+ } while (c == -1 && errno == EINTR);
DPRINTF("accepted migration\n");