diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-10-24 14:11:41 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-10-24 14:11:41 +0000 |
| commit | 17e909738da65d315d462839a05628580b96f8c1 (patch) | |
| tree | 987e715e2dde2bb80b895b5e67f76b50f7b75fd3 /migration-tcp.c | |
| parent | 00b229ac6ad1d4aaac8928fbcf4406ec25092f8f (diff) | |
| download | qemu-17e909738da65d315d462839a05628580b96f8c1.tar.gz qemu-17e909738da65d315d462839a05628580b96f8c1.tar.bz2 qemu-17e909738da65d315d462839a05628580b96f8c1.zip | |
Fix windows build after migration changes
The live migration code broke the windows build. As part of this
change, I've switched the BIOS path to C:\Program Files\Qemu instead of
/c/Program Files/Qemu. The later is only valid when launching from MSYS
but the former is always valid.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5524 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'migration-tcp.c')
| -rw-r--r-- | migration-tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
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"); |