diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | migration-tcp.c | 4 | ||||
| -rw-r--r-- | vl.c | 5 |
3 files changed, 5 insertions, 6 deletions
@@ -953,7 +953,7 @@ fi if test "$mingw32" = "yes" ; then if test -z "$prefix" ; then - prefix="/c/Program Files/Qemu" + prefix="c:\\\\Program Files\\\\Qemu" fi mansuffix="" datasuffix="" diff --git a/migration-tcp.c b/migration-tcp.c index df8080fe7d..a011a53099 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -84,7 +84,7 @@ static ssize_t fd_put_buffer(void *opaque, const void *data, size_t size) ssize_t ret; do { - ret = write(s->fd, data, size); + ret = send(s->fd, data, size, 0); } while (ret == -1 && errno == EINTR); if (ret == -1) @@ -262,7 +262,7 @@ MigrationState *tcp_start_outgoing_migration(const char *host_port, return NULL; } - fcntl(s->fd, F_SETFL, O_NONBLOCK); + socket_set_nonblock(s->fd); if (s->detach == 1) { dprintf("detaching from monitor\n"); @@ -6224,9 +6224,8 @@ void qemu_announce_self(void) len = announce_self_create(buf, nd_table[i].macaddr); vlan = nd_table[i].vlan; for(vc = vlan->first_client; vc != NULL; vc = vc->next) { - if (vc->fd_read == tap_receive) /* send only if tap */ - for (j=0; j < SELF_ANNOUNCE_ROUNDS; j++) - vc->fd_read(vc->opaque, buf, len); + for (j=0; j < SELF_ANNOUNCE_ROUNDS; j++) + vc->fd_read(vc->opaque, buf, len); } } } |